summaryrefslogtreecommitdiff
path: root/BlockTree.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-02-19 18:02:52 +0530
committerJapa Illo2012-02-19 18:02:52 +0530
commit8f1887c90e249b83e70d950891df037e95fb6a02 (patch)
tree0270271bff03eb31596e8ae8545e497c60a360f8 /BlockTree.cpp
parent7c346109c5b370a226a46585cfa2e461b0d100d0 (diff)
downloadstonesense-8f1887c90e249b83e70d950891df037e95fb6a02.tar.gz
stonesense-8f1887c90e249b83e70d950891df037e95fb6a02.tar.bz2
stonesense-8f1887c90e249b83e70d950891df037e95fb6a02.tar.xz
got rid of floorType, wallType, etc, for good.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'BlockTree.cpp')
-rw-r--r--BlockTree.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/BlockTree.cpp b/BlockTree.cpp
index 67cbe7a..de75c42 100644
--- a/BlockTree.cpp
+++ b/BlockTree.cpp
@@ -208,14 +208,14 @@ void c_block_tree_branch::insert_sprites(WorldSegment *w, int x, int y, int z, B
for(int i = 0; i < southward_growth.size(); i++)
{
Block * b = w->getBlock(x, y + i + 1, z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
southward_growth[i].insert_sprites(w, x, y + i + 1, z, parent);
}
for(int i = 0; i < northward_growth.size(); i++)
{
Block * b = w->getBlock(x, y - i - 1, z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
northward_growth[i].insert_sprites(w, x, y - i - 1, z, parent);
}
@@ -224,14 +224,14 @@ void c_block_tree_branch::insert_sprites(WorldSegment *w, int x, int y, int z, B
for(int i = 0; i < southward_growth.size(); i++)
{
Block * b = w->getBlock(x + i + 1, y , z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
southward_growth[i].insert_sprites(w, x + i + 1, y , z, parent);
}
for(int i = 0; i < northward_growth.size(); i++)
{
Block * b = w->getBlock(x - i - 1, y , z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
northward_growth[i].insert_sprites(w, x - i - 1, y , z, parent);
}
@@ -240,14 +240,14 @@ void c_block_tree_branch::insert_sprites(WorldSegment *w, int x, int y, int z, B
for(int i = 0; i < southward_growth.size(); i++)
{
Block * b = w->getBlock(x, y - i - 1, z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
southward_growth[i].insert_sprites(w, x, y - i - 1, z, parent);
}
for(int i = 0; i < northward_growth.size(); i++)
{
Block * b = w->getBlock(x, y + i + 1, z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
northward_growth[i].insert_sprites(w, x, y + i + 1, z, parent);
}
@@ -256,14 +256,14 @@ void c_block_tree_branch::insert_sprites(WorldSegment *w, int x, int y, int z, B
for(int i = 0; i < southward_growth.size(); i++)
{
Block * b = w->getBlock(x - i - 1, y , z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
southward_growth[i].insert_sprites(w, x - i - 1, y , z, parent);
}
for(int i = 0; i < northward_growth.size(); i++)
{
Block * b = w->getBlock(x + i + 1, y , z);
- if(b && (b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall || b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair))
+ if(b && (b->tileShapeBasic==tiletype_shape_basic::Wall || b->tileShapeBasic==tiletype_shape_basic::Stair))
break;
northward_growth[i].insert_sprites(w, x + i + 1, y , z, parent);
}
@@ -313,9 +313,9 @@ void c_block_tree::insert_sprites(WorldSegment *w, int x, int y, int z, Block *
{
Block * b = w->getBlock(x, y, z + i + 1);
if((b && (
- b->tileShapeBasic==df::enums::tiletype_shape_basic::Floor ||
- b->tileShapeBasic==df::enums::tiletype_shape_basic::Wall ||
- b->tileShapeBasic==df::enums::tiletype_shape_basic::Stair)) ||
+ b->tileShapeBasic==tiletype_shape_basic::Floor ||
+ b->tileShapeBasic==tiletype_shape_basic::Wall ||
+ b->tileShapeBasic==tiletype_shape_basic::Stair)) ||
((z + i + 1) > w->z + w->sizez)
)
break;