summaryrefslogtreecommitdiff
path: root/SpriteObjects.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2010-08-31 04:51:10 +0000
committerPetr Mrázek2010-08-31 04:51:10 +0000
commit0db450e5380942e418e6ca668a226536ee1bab3b (patch)
treeb36fe55151f9f0c945dadb92f3e9c26bd78f2432 /SpriteObjects.cpp
parent068b449bee9708f8ad3961b7ca90bbbed896c42c (diff)
downloadstonesense-0db450e5380942e418e6ca668a226536ee1bab3b.tar.gz
stonesense-0db450e5380942e418e6ca668a226536ee1bab3b.tar.bz2
stonesense-0db450e5380942e418e6ca668a226536ee1bab3b.tar.xz
Update linux DFHack stuff
Diffstat (limited to 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 7fdedd5..24d5732 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -531,8 +531,8 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
{
if(contentLoader.Mats->raceEx.at(b->creature->race).castes.at(b->creature->caste).ColorModifier.at(j).colorlist.size() > b->creature->color[j])
{
- uint32_t cr_color = contentLoader.Mats->raceEx.at(b->creature->race).castes.at(b->creature->caste).ColorModifier.at(j).colorlist.at(b->creature->color[j]);
- if(cr_color < contentLoader.Mats->color.size())
+ uint32_t cr_color = contentLoader.Mats->raceEx.at(b->creature->race).castes.at(b->creature->caste).ColorModifier.at(j).colorlist.at(b->creature->color[j]);
+ if(cr_color < contentLoader.Mats->color.size())
{
if(contentLoader.Mats->raceEx[b->creature->race].castes[b->creature->caste].ColorModifier[j].startdate > 0)
{
@@ -540,16 +540,16 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
if((contentLoader.Mats->raceEx[b->creature->race].castes[b->creature->caste].ColorModifier[j].startdate <= dayofLife) &&
(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,
+ return al_map_rgb_f(
+ contentLoader.Mats->color[cr_color].r,
+ contentLoader.Mats->color[cr_color].v,
contentLoader.Mats->color[cr_color].b);;
}
}
else
- return al_map_rgb_f(
- contentLoader.Mats->color[cr_color].r,
- contentLoader.Mats->color[cr_color].v,
+ return al_map_rgb_f(
+ contentLoader.Mats->color[cr_color].r,
+ contentLoader.Mats->color[cr_color].v,
contentLoader.Mats->color[cr_color].b);
}
}