summaryrefslogtreecommitdiff
path: root/src/mapblock.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-01-25 09:53:21 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-01-25 09:53:21 +0200
commitd3a6a12baea7317f6765ae7541cbc453f83d7928 (patch)
tree3d81655e70479a83aa7315acc586feeba8180bb0 /src/mapblock.cpp
parentde3fdba568cf0b05e8fe0ec7fb11552416474093 (diff)
downloadminetest-d3a6a12baea7317f6765ae7541cbc453f83d7928.tar.gz
minetest-d3a6a12baea7317f6765ae7541cbc453f83d7928.tar.bz2
minetest-d3a6a12baea7317f6765ae7541cbc453f83d7928.zip
removed alternative name "pressure" from param2
Diffstat (limited to 'src/mapblock.cpp')
-rw-r--r--src/mapblock.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 620c29fdd..3eb65b4da 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -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];
}
}
}