diff options
| author | Petr Mrázek | 2012-03-23 22:57:12 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-03-23 22:57:12 +0100 |
| commit | 7525c003089367823183eaf5093a90271a5eb9b4 (patch) | |
| tree | 55c8ecaa6732630e3cfe0163844cafaea8425679 /ContentLoader.cpp | |
| parent | 719dbc048a55ba1def2ce21e9cd29e33dbe833ce (diff) | |
| parent | 5322279ee165c09a6a514e865a7527079d950199 (diff) | |
| download | stonesense-7525c003089367823183eaf5093a90271a5eb9b4.tar.gz stonesense-7525c003089367823183eaf5093a90271a5eb9b4.tar.bz2 stonesense-7525c003089367823183eaf5093a90271a5eb9b4.tar.xz | |
Merge https://github.com/JapaMala/stonesense
Conflicts:
MapLoading.cpp
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 8a2f344..8997f75 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)
|
