summaryrefslogtreecommitdiff
path: root/ContentLoader.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-02-27 01:32:50 +0530
committerJapa Illo2012-02-27 01:32:50 +0530
commit93cc5ad961a9067a1a407b52a0cc96dbef1f7cfb (patch)
tree21fe71bc60f0bf451504c10fae34562e8e4afee6 /ContentLoader.cpp
parentbf1094b4d195b24acecf947770346623d3a399b5 (diff)
downloadstonesense-93cc5ad961a9067a1a407b52a0cc96dbef1f7cfb.tar.gz
stonesense-93cc5ad961a9067a1a407b52a0cc96dbef1f7cfb.tar.bz2
stonesense-93cc5ad961a9067a1a407b52a0cc96dbef1f7cfb.tar.xz
Added ability to detect that the adventurer is covered in guts.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'ContentLoader.cpp')
-rw-r--r--ContentLoader.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index 6006a38..522ab5c 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -703,7 +703,14 @@ ALLEGRO_COLOR lookupMaterialColor(int matType,int matIndex)
{
if (matType >= contentLoader->colorConfigs.size())
{
- return al_map_rgb(255, 255, 255);
+ //if it's more than the size of our colorconfigs, then just make a guess based off what DF tells us.
+ MaterialInfo mat;
+ mat.decode(matType, matIndex);
+ ALLEGRO_COLOR out = al_map_rgb_f(
+ contentLoader->Mats->color[mat.material->state_color[0]].red,
+ contentLoader->Mats->color[mat.material->state_color[0]].green,
+ contentLoader->Mats->color[mat.material->state_color[0]].blue);
+ return out;
}
if (matIndex < 0)
{
@@ -717,7 +724,13 @@ ALLEGRO_COLOR lookupMaterialColor(int matType,int matIndex)
{
return contentLoader->colorConfigs.at(matType).colorMaterials.at(matIndex).color;
}
- else return al_map_rgb(255, 255, 255);
+ MaterialInfo mat;
+ mat.decode(matType, matIndex);
+ ALLEGRO_COLOR out = al_map_rgb_f(
+ contentLoader->Mats->color[mat.material->state_color[0]].red,
+ contentLoader->Mats->color[mat.material->state_color[0]].green,
+ contentLoader->Mats->color[mat.material->state_color[0]].blue);
+ return out;
}
ShadeBy getShadeType(const char* Input)