summaryrefslogtreecommitdiff
path: root/SpriteMaps.cpp
diff options
context:
space:
mode:
authorJonas Ask2009-11-16 21:45:49 +0000
committerJonas Ask2009-11-16 21:45:49 +0000
commit030551eb67a93940391a58e6ccb026aee9382793 (patch)
treebfc88414db55eb680cf5b4adb1e6d27c825fcb93 /SpriteMaps.cpp
parente5404c2cdb70b50fc84e345b921948fb6080d240 (diff)
downloadstonesense-030551eb67a93940391a58e6ccb026aee9382793.tar.gz
stonesense-030551eb67a93940391a58e6ccb026aee9382793.tar.bz2
stonesense-030551eb67a93940391a58e6ccb026aee9382793.tar.xz
Fixed incorrect sprite for default dwarf.
Moved definition of enumCreatureSex to commonTypes.h. Fixed screenshot function to be 32bit compatible.
Diffstat (limited to 'SpriteMaps.cpp')
-rw-r--r--SpriteMaps.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp
index 01fc291..b62312d 100644
--- a/SpriteMaps.cpp
+++ b/SpriteMaps.cpp
@@ -28,13 +28,13 @@ int getWallSpriteWithDefault( int defaultSprite, int materialIndex ){
int GetWallSpriteMap(int in, int matIndex, bool getFillerFloor)
{
- if( in >= groundTypes.size() )
+ if( in >= (int)groundTypes.size() )
return (!getFillerFloor ? SPRITEOBJECT_WALL_NA : SPRITEFLOOR_NA);
GroundMaterialConfiguration* wall = groundTypes[ in ];
if(wall == NULL)
return (!getFillerFloor ? SPRITEOBJECT_WALL_NA : SPRITEFLOOR_NA);
-
- for(int i=0; i<wall->overridingMaterials.size(); i++){
+ int numMat = (int)wall->overridingMaterials.size();
+ for(int i=0; i<numMat; i++){
if(wall->overridingMaterials[i].gameID == matIndex){
if(getFillerFloor == false)
return wall->overridingMaterials[i].spriteIndex;
@@ -260,13 +260,14 @@ int GetWallSpriteMap(int in, int matIndex, bool getFillerFloor)
}
int GetFloorSpriteMap(int in, int matIndex){
//TODO: groundTypes.size can be cahced
- if( in >= groundTypes.size() )
+ if( in >= (int)groundTypes.size() )
return SPRITEFLOOR_NA;
GroundMaterialConfiguration* floor = groundTypes[ in ];
if(floor == NULL)
return SPRITEFLOOR_NA;
- for(int i=0; i<floor->overridingMaterials.size(); i++){
+ int numMat = (int)floor->overridingMaterials.size();
+ for(int i=0; i<numMat; i++){
if(floor->overridingMaterials[i].gameID == matIndex){
return floor->overridingMaterials[i].spriteIndex;
}