diff options
| author | Japa Illo | 2012-03-17 15:29:27 +0100 |
|---|---|---|
| committer | Japa Illo | 2012-03-17 15:29:27 +0100 |
| commit | 5322279ee165c09a6a514e865a7527079d950199 (patch) | |
| tree | 36333db1eaacfe6512dd00b051dc11090ff6ac40 /ContentLoader.cpp | |
| parent | 6e2272dabb29c00f72d3230b69b78912a1339ceb (diff) | |
| download | stonesense-5322279ee165c09a6a514e865a7527079d950199.tar.gz stonesense-5322279ee165c09a6a514e865a7527079d950199.tar.bz2 stonesense-5322279ee165c09a6a514e865a7527079d950199.tar.xz | |
Added some safeties to the color selection. also put back our old dwarves.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'ContentLoader.cpp')
| -rw-r--r-- | ContentLoader.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp index 48ed0a0..f143930 100644 --- a/ContentLoader.cpp +++ b/ContentLoader.cpp @@ -747,11 +747,12 @@ ALLEGRO_COLOR lookupMaterialColor(int matType,int matIndex) {
//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);
- return al_map_rgb_f(
+ if(mat.decode(matType, matIndex))
+ return 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);
+ else return al_map_rgb(255,255,255);
}
if (matIndex < 0)
{
@@ -760,22 +761,24 @@ ALLEGRO_COLOR lookupMaterialColor(int matType,int matIndex) if (matIndex >= contentLoader->colorConfigs.at(matType).colorMaterials.size())
{
MaterialInfo mat;
- mat.decode(matType, matIndex);
- return al_map_rgb_f(
+ if(mat.decode(matType, matIndex))
+ return 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);
+ else return al_map_rgb(255,255,255);
}
if (contentLoader->colorConfigs.at(matType).colorMaterials.at(matIndex).colorSet)
{
return contentLoader->colorConfigs.at(matType).colorMaterials.at(matIndex).color;
}
MaterialInfo mat;
- mat.decode(matType, matIndex);
- return al_map_rgb_f(
+ if(mat.decode(matType, matIndex))
+ return 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);
+ else return al_map_rgb(255,255,255);
}
ShadeBy getShadeType(const char* Input)
|
