diff options
| author | Jonas Ask | 2009-11-09 23:53:44 +0000 |
|---|---|---|
| committer | Jonas Ask | 2009-11-09 23:53:44 +0000 |
| commit | 8e398f4bc4ad2ff2cced52a0b9209d1a9a667c78 (patch) | |
| tree | 4ed2f0872a1bf564e564d0781b99d7efe08a13cb /SpriteMaps.cpp | |
| parent | 1a241f258acecb37160394425bb5861123919cb5 (diff) | |
| download | stonesense-8e398f4bc4ad2ff2cced52a0b9209d1a9a667c78.tar.gz stonesense-8e398f4bc4ad2ff2cced52a0b9209d1a9a667c78.tar.bz2 stonesense-8e398f4bc4ad2ff2cced52a0b9209d1a9a667c78.tar.xz | |
Fixed tiny crash-bug where hidden blocks would show up anyway, having invalid material indexes
Diffstat (limited to 'SpriteMaps.cpp')
| -rw-r--r-- | SpriteMaps.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp index 4b74e42..4243a99 100644 --- a/SpriteMaps.cpp +++ b/SpriteMaps.cpp @@ -7,18 +7,22 @@ int getFloorSpriteWithDefault( int defaultSprite, int materialIndex ){
//do a LOOKUP. not a search!
- uint32_t spriteIndex = groundTypes[materialIndex].floorSheetIndex;
- if(spriteIndex != INVALID_INDEX)
- return spriteIndex;
+ if( materialIndex != INVALID_INDEX ){
+ uint32_t spriteIndex = groundTypes[materialIndex].floorSheetIndex;
+ if(spriteIndex != INVALID_INDEX)
+ return spriteIndex;
+ }
return defaultSprite;
}
int getWallSpriteWithDefault( int defaultSprite, int materialIndex ){
//do a LOOKUP. not a search!
- uint32_t spriteIndex = groundTypes[materialIndex].wallSheetIndex;
- if(spriteIndex != INVALID_INDEX)
- return spriteIndex;
+ if( materialIndex != INVALID_INDEX ){
+ uint32_t spriteIndex = groundTypes[materialIndex].wallSheetIndex;
+ if(spriteIndex != INVALID_INDEX)
+ return spriteIndex;
+ }
return defaultSprite;
}
|
