summaryrefslogtreecommitdiff
path: root/Block.h
diff options
context:
space:
mode:
authorJapa Illo2012-02-17 23:54:41 +0530
committerJapa Illo2012-02-17 23:54:41 +0530
commitd219e323689a7ea5d387346b906241f2e999df1e (patch)
tree3db58b33bb9d168aacd8bdad0a702592abf55802 /Block.h
parentaa921e71bd1a551ced19d29051439e88d2330975 (diff)
downloadstonesense-d219e323689a7ea5d387346b906241f2e999df1e.tar.gz
stonesense-d219e323689a7ea5d387346b906241f2e999df1e.tar.bz2
stonesense-d219e323689a7ea5d387346b906241f2e999df1e.tar.xz
Did some work on making stonesense compatible again.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'Block.h')
-rw-r--r--Block.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/Block.h b/Block.h
index b484a1d..f6fed52 100644
--- a/Block.h
+++ b/Block.h
@@ -3,6 +3,7 @@
#include "common.h"
#include "SpriteObjects.h"
+#include "TileTypes.h"
class WorldSegment;
@@ -19,10 +20,11 @@ public:
uint32_t x, y, z;
int drawx, drawy, drawz;
- int floorType;
- int wallType;
- int stairType;
- int tileType;
+ df::tiletype_shape_basic tileShapeBasic;
+ df::tiletype_shape tileShape;
+ df::tiletype_special tileSpecial;
+ df::tiletype_material tileMaterial;
+ df::tiletype tileType;
DFHack::t_matglossPair material;
DFHack::t_matglossPair layerMaterial;
DFHack::t_matglossPair veinMaterial;
@@ -105,7 +107,7 @@ public:
} building;
bool IsVisible(){
- return (floorType || wallType) != 0;
+ return (tileShapeBasic==df::enums::tiletype_shape_basic::Floor || tileShapeBasic==df::enums::tiletype_shape_basic::Wall) != 0;
}
void Draw();
void Drawcreaturetext();