summaryrefslogtreecommitdiff
path: root/SpriteColors.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 /SpriteColors.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 'SpriteColors.cpp')
-rw-r--r--SpriteColors.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/SpriteColors.cpp b/SpriteColors.cpp
index 3384094..e600c18 100644
--- a/SpriteColors.cpp
+++ b/SpriteColors.cpp
@@ -74,8 +74,8 @@ ALLEGRO_COLOR getSpriteColor(t_SpriteWithOffset &sprite, t_creature* creature)
{
if(strcmp(contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].part, sprite.bodyPart) == 0)
{
- uint32_t cr_color = contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[j].colorlist[creature->color[j]];
- if(cr_color < contentLoader.Mats->color.size())
+ uint32_t cr_color = contentLoader.Mats->raceEx[creature->race].castes[creature->caste].ColorModifier[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)
{
@@ -83,18 +83,18 @@ ALLEGRO_COLOR getSpriteColor(t_SpriteWithOffset &sprite, t_creature* creature)
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))
{
- output = al_map_rgb_f(
- contentLoader.Mats->color[cr_color].r,
- contentLoader.Mats->color[cr_color].v,
- contentLoader.Mats->color[cr_color].b);
+ output = al_map_rgb_f(
+ contentLoader.Mats->color[cr_color].red,
+ contentLoader.Mats->color[cr_color].green,
+ contentLoader.Mats->color[cr_color].blue);
return output;
}
}
else
- output = al_map_rgb_f(
- contentLoader.Mats->color[cr_color].r,
- contentLoader.Mats->color[cr_color].v,
- contentLoader.Mats->color[cr_color].b);
+ output = al_map_rgb_f(
+ contentLoader.Mats->color[cr_color].red,
+ contentLoader.Mats->color[cr_color].green,
+ contentLoader.Mats->color[cr_color].blue);
}
}
}