summaryrefslogtreecommitdiff
path: root/SpriteObjects.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-05-18 21:47:01 +0000
committerPetr Mrázek2011-05-18 21:47:01 +0000
commit053e3dafbb59c27d8464aded9d1942ac7d7c35b8 (patch)
treec79444207b3b03a1fe307c57ee8ddb7d6a5d5f38 /SpriteObjects.cpp
parent244db2cf0b316c58f52fe530a397455b9088c833 (diff)
downloadstonesense-053e3dafbb59c27d8464aded9d1942ac7d7c35b8.tar.gz
stonesense-053e3dafbb59c27d8464aded9d1942ac7d7c35b8.tar.bz2
stonesense-053e3dafbb59c27d8464aded9d1942ac7d7c35b8.tar.xz
Fix for current dfhack (0.5.14). linux side only.
Diffstat (limited to 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index ddd38a5..521cee5 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -619,15 +619,15 @@ void c_sprite::draw_world_offset(int x, int y, int z, Block * b, int tileoffset,
(grass_growth == GRASS_GROWTH_ANY) ||
(
(grass_growth == GRASS_GROWTH_NORMAL) &&
- ((tileTypeTable[b->tileType].m == GRASS) || (tileTypeTable[b->tileType].m == GRASS2))
+ ((tileTypeTable[b->tileType].material == GRASS) || (tileTypeTable[b->tileType].material == GRASS2))
) ||
(
(grass_growth == GRASS_GROWTH_DRY) &&
- (tileTypeTable[b->tileType].m == GRASS_DRY)
+ (tileTypeTable[b->tileType].material == GRASS_DRY)
) ||
(
(grass_growth == GRASS_GROWTH_DEAD) &&
- (tileTypeTable[b->tileType].m == GRASS_DEAD)
+ (tileTypeTable[b->tileType].material == GRASS_DEAD)
)
)
)
@@ -813,16 +813,16 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
(contentLoader.Mats->raceEx[b->creature->race].castes[b->creature->caste].ColorModifier[j].enddate > dayofLife))
{
return al_map_rgb_f(
- contentLoader.Mats->color[cr_color].r,
- contentLoader.Mats->color[cr_color].v,
- contentLoader.Mats->color[cr_color].b);;
+ contentLoader.Mats->color[cr_color].red,
+ contentLoader.Mats->color[cr_color].green,
+ contentLoader.Mats->color[cr_color].blue);;
}
}
else
return al_map_rgb_f(
- contentLoader.Mats->color[cr_color].r,
- contentLoader.Mats->color[cr_color].v,
- contentLoader.Mats->color[cr_color].b);
+ contentLoader.Mats->color[cr_color].red,
+ contentLoader.Mats->color[cr_color].green,
+ contentLoader.Mats->color[cr_color].blue);
}
}
}