summaryrefslogtreecommitdiff
path: root/SpriteMaps.cpp
diff options
context:
space:
mode:
authorJapa2010-05-24 08:05:37 +0000
committerJapa2010-05-24 08:05:37 +0000
commit20e5c41cef6b20d70354650a20cf2926fe60ec40 (patch)
tree3243427f1ba8267c9353369826927af149b00afe /SpriteMaps.cpp
parentc45570cac63bc1adcc554dedede41fd967412b78 (diff)
downloadstonesense-20e5c41cef6b20d70354650a20cf2926fe60ec40.tar.gz
stonesense-20e5c41cef6b20d70354650a20cf2926fe60ec40.tar.bz2
stonesense-20e5c41cef6b20d70354650a20cf2926fe60ec40.tar.xz
blah
Diffstat (limited to 'SpriteMaps.cpp')
-rw-r--r--SpriteMaps.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp
index 769b1cd..7f67c07 100644
--- a/SpriteMaps.cpp
+++ b/SpriteMaps.cpp
@@ -49,6 +49,12 @@ t_SpriteWithOffset GetTerrainSpriteMap(int in, t_matglossPair material, vector<T
return terrain->defaultSprite[0];
else return terrain->defaultSprite[tempform];
}
+ if(material.index == -1)
+ {
+ if(terrainMat->defaultSprite[tempform].sheetIndex == UNCONFIGURED_INDEX)
+ return terrainMat->defaultSprite[0];
+ else return terrainMat->defaultSprite[tempform];
+ }
// return subtype, type default or terrain default as available
// do map lookup
map<int,t_SpriteWithOffset>::iterator it = terrainMat->overridingMaterials[tempform].find(material.index);