oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

removed alternative name "pressure" from param2

Browse source
This commit is contained in:
Perttu Ahola 2011-01-25 09:53:21 +02:00
parent de3fdba568
commit d3a6a12bae
6 changed files with 41 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/mapblock.cpp
View file

@ -1504,13 +1504,13 @@ void MapBlock::serialize(std::ostream &os, u8 version)
if(version >= 10)
{
// Get and compress pressure
SharedBuffer<u8> pressuredata(nodecount);
// Get and compress param2
SharedBuffer<u8> param2data(nodecount);
for(u32 i=0; i<nodecount; i++)
{
pressuredata[i] = data[i].pressure;
param2data[i] = data[i].param2;
}
compress(pressuredata, os, version);
compress(param2data, os, version);
}
}
// All other versions (newest)
@ -1544,10 +1544,10 @@ void MapBlock::serialize(std::ostream &os, u8 version)
databuf[i+nodecount] = data[i].param;
}
// Get pressure
// Get param2
for(u32 i=0; i<nodecount; i++)
{
databuf[i+nodecount*2] = data[i].pressure;
databuf[i+nodecount*2] = data[i].param2;
}
/*
@ -1621,7 +1621,7 @@ void MapBlock::deSerialize(std::istream &is, u8 version)
if(version >= 10)
{
// Uncompress and set pressure data
// Uncompress and set param2 data
std::ostringstream os(std::ios_base::binary);
decompress(is, os, version);
std::string s = os.str();
@ -1630,7 +1630,7 @@ void MapBlock::deSerialize(std::istream &is, u8 version)
("MapBlock::deSerialize: invalid format");
for(u32 i=0; i<s.size(); i++)
{
data[i].pressure = s[i];
data[i].param2 = s[i];
}
}
}
@ -1662,10 +1662,10 @@ void MapBlock::deSerialize(std::istream &is, u8 version)
{
data[i].param = s[i+nodecount];
}
// Set pressure
// Set param2
for(u32 i=0; i<nodecount; i++)
{
data[i].pressure = s[i+nodecount*2];
data[i].param2 = s[i+nodecount*2];
}
}
}