summaryrefslogtreecommitdiff
path: root/src/mapnode.h
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/mapnode.h
parentde3fdba568cf0b05e8fe0ec7fb11552416474093 (diff)
downloadminetest-d3a6a12baea7317f6765ae7541cbc453f83d7928.tar.gz
minetest-d3a6a12baea7317f6765ae7541cbc453f83d7928.tar.bz2
minetest-d3a6a12baea7317f6765ae7541cbc453f83d7928.zip
removed alternative name "pressure" from param2
Diffstat (limited to 'src/mapnode.h')
-rw-r--r--src/mapnode.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/mapnode.h b/src/mapnode.h
index 286edcc2b..69a5a08cd 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -374,11 +374,6 @@ struct MapNode
union
{
u8 param2;
-
- /*
- Pressure for liquids
- */
- u8 pressure;
/*
Direction for torches and other stuff.
@@ -392,18 +387,18 @@ struct MapNode
*this = n;
}
- MapNode(u8 data=CONTENT_AIR, u8 a_param=0, u8 a_pressure=0)
+ MapNode(u8 data=CONTENT_AIR, u8 a_param=0, u8 a_param2=0)
{
d = data;
param = a_param;
- pressure = a_pressure;
+ param2 = a_param2;
}
bool operator==(const MapNode &other)
{
return (d == other.d
&& param == other.param
- && pressure == other.pressure);
+ && param2 == other.param2);
}
bool light_propagates()
@@ -557,7 +552,7 @@ struct MapNode
{
dest[0] = d;
dest[1] = param;
- dest[2] = pressure;
+ dest[2] = param2;
}
}
void deSerialize(u8 *source, u8 version)
@@ -587,7 +582,7 @@ struct MapNode
{
d = source[0];
param = source[1];
- pressure = source[2];
+ param2 = source[2];
}
}
};