summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-16 01:10:20 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:46 +0200
commit3318d0b4b865f648af9314bf649312f2fd24117c (patch)
treefc43cc89ec4dd66bbac86437bf35b240e2458eb5
parent81f1cc662f7c203f69757bab5ca85023967da638 (diff)
downloadminetest-3318d0b4b865f648af9314bf649312f2fd24117c.tar.gz
minetest-3318d0b4b865f648af9314bf649312f2fd24117c.tar.bz2
minetest-3318d0b4b865f648af9314bf649312f2fd24117c.zip
Remove content dependencies from mapblock.cpp
-rw-r--r--src/mapblock.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index dcafaae73..f7cbda74b 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -931,20 +931,10 @@ std::string analyze_block(MapBlock *block)
}
else
{
- // We'll just define the numbers here, don't want to include
- // content_mapnode.h
- const content_t content_water = 2;
- const content_t content_watersource = 9;
- const content_t content_tree = 0x801;
- const content_t content_leaves = 0x802;
- const content_t content_jungletree = 0x815;
-
bool full_ignore = true;
bool some_ignore = false;
bool full_air = true;
bool some_air = false;
- bool trees = false;
- bool water = false;
for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
@@ -960,12 +950,6 @@ std::string analyze_block(MapBlock *block)
some_air = true;
else
full_air = false;
- if(c == content_tree || c == content_jungletree
- || c == content_leaves)
- trees = true;
- if(c == content_water
- || c == content_watersource)
- water = true;
}
desc<<"content {";
@@ -981,11 +965,6 @@ std::string analyze_block(MapBlock *block)
ss<<"AIR (full), ";
else if(some_air)
ss<<"AIR, ";
-
- if(trees)
- ss<<"trees, ";
- if(water)
- ss<<"water, ";
if(ss.str().size()>=2)
desc<<ss.str().substr(0, ss.str().size()-2);