summaryrefslogtreecommitdiff
path: root/SpriteColors.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-07-22 00:45:54 +0000
committerPetr Mrázek2011-07-22 00:45:54 +0000
commitbf89e3ad6b98442dca909e327b80c5e292db6092 (patch)
tree27f28ac93518f26fd099bf07340e9d7fe9f11f1c /SpriteColors.cpp
parent650c5593bfd90afc93720b06fe74ee4ec7abf73e (diff)
downloadstonesense-bf89e3ad6b98442dca909e327b80c5e292db6092.tar.gz
stonesense-bf89e3ad6b98442dca909e327b80c5e292db6092.tar.bz2
stonesense-bf89e3ad6b98442dca909e327b80c5e292db6092.tar.xz
Update stonesense for current dfhack, make sure it's buildable as a plugin.
Diffstat (limited to 'SpriteColors.cpp')
-rw-r--r--SpriteColors.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/SpriteColors.cpp b/SpriteColors.cpp
index e600c18..99453f8 100644
--- a/SpriteColors.cpp
+++ b/SpriteColors.cpp
@@ -72,16 +72,16 @@ ALLEGRO_COLOR getSpriteColor(t_SpriteWithOffset &sprite, t_creature* creature)
{
for(unsigned int j = 0; j<b->creature->nbcolors ; j++)
{
- if(strcmp(contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].part, sprite.bodyPart) == 0)
+ t_creaturecaste & caste = contentLoader.Mats->raceEx[creature->race].castes[creature->caste];
+ std::vector<t_colormodifier> & colormods =caste.ColorModifier;
+ if(colormods[j].part == sprite.bodyPart)
{
- uint32_t cr_color = contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].colorlist[creature->color[j]];
+ uint32_t cr_color = colormods[j].colorlist[creature->color[j]];
if(cr_color < contentLoader.Mats->color.size())
{
- if(contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].startdate > 0)
+ if(colormods[j].startdate > 0)
{
-
- if((contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].startdate <= dayofLife) &&
- (contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].enddate > dayofLife))
+ if((colormods[j].startdate <= dayofLife) && (colormods[j].enddate > dayofLife))
{
output = al_map_rgb_f(
contentLoader.Mats->color[cr_color].red,