summaryrefslogtreecommitdiff
path: root/SpriteObjects.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-02-27 20:04:19 +0100
committerPetr Mrázek2012-02-27 20:04:19 +0100
commit44107ca9d4f9c33ce9564acb48ca954b5f473524 (patch)
tree1ece6d17f7f703dab7735537a3e7a21cbae17596 /SpriteObjects.cpp
parentca35c82579d1e3e0ce227ccdaeb71c2a6dbf1cb9 (diff)
downloadstonesense-44107ca9d4f9c33ce9564acb48ca954b5f473524.tar.gz
stonesense-44107ca9d4f9c33ce9564acb48ca954b5f473524.tar.bz2
stonesense-44107ca9d4f9c33ce9564acb48ca954b5f473524.tar.xz
DF colors tweak.
Diffstat (limited to 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 6e5bdaa..464e2f1 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -899,17 +899,17 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
case ShadeVein:
return lookupMaterialColor(b->veinMaterial.type, b->veinMaterial.index);
case ShadeMatFore:
- return getDfColor(lookupMaterialFore(b->material.type, b->material.index), lookupMaterialBright(b->material.type, b->material.index));
+ return config.colors.getDfColor(lookupMaterialFore(b->material.type, b->material.index), lookupMaterialBright(b->material.type, b->material.index));
case ShadeMatBack:
- return getDfColor(lookupMaterialBack(b->material.type, b->material.index));
+ return config.colors.getDfColor(lookupMaterialBack(b->material.type, b->material.index));
case ShadeLayerFore:
- return getDfColor(lookupMaterialFore(b->layerMaterial.type, b->layerMaterial.index), lookupMaterialBright(b->layerMaterial.type, b->layerMaterial.index));
+ return config.colors.getDfColor(lookupMaterialFore(b->layerMaterial.type, b->layerMaterial.index), lookupMaterialBright(b->layerMaterial.type, b->layerMaterial.index));
case ShadeLayerBack:
- return getDfColor(lookupMaterialBack(b->layerMaterial.type, b->layerMaterial.index));
+ return config.colors.getDfColor(lookupMaterialBack(b->layerMaterial.type, b->layerMaterial.index));
case ShadeVeinFore:
- return getDfColor(lookupMaterialFore(b->veinMaterial.type, b->veinMaterial.index), lookupMaterialBright(b->veinMaterial.type, b->veinMaterial.index));
+ return config.colors.getDfColor(lookupMaterialFore(b->veinMaterial.type, b->veinMaterial.index), lookupMaterialBright(b->veinMaterial.type, b->veinMaterial.index));
case ShadeVeinBack:
- return getDfColor(lookupMaterialBack(b->veinMaterial.type, b->veinMaterial.index));
+ return config.colors.getDfColor(lookupMaterialBack(b->veinMaterial.type, b->veinMaterial.index));
case ShadeBodyPart:
if(b->creaturePresent)
{
@@ -956,7 +956,7 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
case ShadeJob:
if(b->creaturePresent)
{
- return getDfColor(getJobColor(b->creature->profession));
+ return config.colors.getDfColor(getJobColor(b->creature->profession));
}
else return al_map_rgb(255,255,255);
case ShadeBlood: