summaryrefslogtreecommitdiff
path: root/SpriteObjects.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 /SpriteObjects.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 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 8001920..a8ed767 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -10,7 +10,8 @@
unsigned char get_water_direction( Block *b )
{
- int tiletype = b->floorType;
+ //Fixme: add the new river ramps, possibly change to a switch statement
+ int tiletype = b->tileType;
if(tiletype == 0) return 0;
if(tiletype == 365) return 2;
if(tiletype == 366) return 6;
@@ -662,17 +663,17 @@ void c_sprite::draw_world_offset(int x, int y, int z, Block * b, int tileoffset,
(
(grass_growth == GRASS_GROWTH_NORMAL) &&
(
- (tileTypeTable[b->tileType].material == GRASS) ||
- (tileTypeTable[b->tileType].material == GRASS2)
+ (b->tileMaterial == tiletype_material::GRASS_DARK) ||
+ (b->tileMaterial == tiletype_material::GRASS_LIGHT)
)
) ||
(
(grass_growth == GRASS_GROWTH_DRY) &&
- (tileTypeTable[b->tileType].material == GRASS_DRY)
+ (b->tileMaterial == tiletype_material::GRASS_DRY)
) ||
(
(grass_growth == GRASS_GROWTH_DEAD) &&
- (tileTypeTable[b->tileType].material == GRASS_DEAD)
+ (b->tileMaterial == tiletype_material::GRASS_DEAD)
)
)
)