summaryrefslogtreecommitdiff
path: root/SpriteMaps.cpp
diff options
context:
space:
mode:
authorJonas Ask2009-11-27 16:17:49 +0000
committerJonas Ask2009-11-27 16:17:49 +0000
commit86248d1d3dfdacdab2c4aa7781fa2c048200cccb (patch)
treea0a93ef767d9de3a633d2132e6815a1aa280f199 /SpriteMaps.cpp
parentb53e1de02057623713dc74e1ea72416f8f1be879 (diff)
downloadstonesense-86248d1d3dfdacdab2c4aa7781fa2c048200cccb.tar.gz
stonesense-86248d1d3dfdacdab2c4aa7781fa2c048200cccb.tar.bz2
stonesense-86248d1d3dfdacdab2c4aa7781fa2c048200cccb.tar.xz
Added what used to be GroundMaterials to the ContentLoader.
Diffstat (limited to 'SpriteMaps.cpp')
-rw-r--r--SpriteMaps.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp
index 754e5ed..5f1addc 100644
--- a/SpriteMaps.cpp
+++ b/SpriteMaps.cpp
@@ -1,6 +1,7 @@
#include "common.h"
#include "SpriteMaps.h"
#include "GroundMaterialConfiguration.h"
+#include "ContentLoader.h"
@@ -28,9 +29,9 @@ int getWallSpriteWithDefault( int defaultSprite, int materialIndex ){
int GetWallSpriteMap(int in, int matIndex, bool getFillerFloor)
{
- if( in >= (int)groundTypes.size() )
+ if( in >= (int)contentLoader.groundConfigs.size() )
return (!getFillerFloor ? SPRITEOBJECT_WALL_NA : SPRITEFLOOR_NA);
- GroundMaterialConfiguration* wall = groundTypes[ in ];
+ GroundMaterialConfiguration* wall = contentLoader.groundConfigs[ in ];
if(wall == NULL)
return (!getFillerFloor ? SPRITEOBJECT_WALL_NA : SPRITEFLOOR_NA);
int numMat = (int)wall->overridingMaterials.size();
@@ -261,9 +262,9 @@ int GetWallSpriteMap(int in, int matIndex, bool getFillerFloor)
}
int GetFloorSpriteMap(int in, int matIndex){
//TODO: groundTypes.size can be cahced
- if( in >= (int)groundTypes.size() )
+ if( in >= (int)contentLoader.groundConfigs.size() )
return SPRITEFLOOR_NA;
- GroundMaterialConfiguration* floor = groundTypes[ in ];
+ GroundMaterialConfiguration* floor = contentLoader.groundConfigs[ in ];
if(floor == NULL)
return SPRITEFLOOR_NA;