diff options
| author | Petr Mrázek | 2011-08-07 01:35:28 +0000 |
|---|---|---|
| committer | Petr Mrázek | 2011-08-07 01:35:28 +0000 |
| commit | 4064cf25797462fc6ac61f578b7e4b6bd31bf6b6 (patch) | |
| tree | 1a1744e66471edd1948b02bf4627e87693f1685a /SpriteMaps.cpp | |
| parent | d841ba0fee6e1f98e414c52dd07b44b981bc05fe (diff) | |
| download | stonesense-4064cf25797462fc6ac61f578b7e4b6bd31bf6b6.tar.gz stonesense-4064cf25797462fc6ac61f578b7e4b6bd31bf6b6.tar.bz2 stonesense-4064cf25797462fc6ac61f578b7e4b6bd31bf6b6.tar.xz | |
stonesense now doesn't crash while starting for the second time
Diffstat (limited to 'SpriteMaps.cpp')
| -rw-r--r-- | SpriteMaps.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp index 0bca31a..848d075 100644 --- a/SpriteMaps.cpp +++ b/SpriteMaps.cpp @@ -78,11 +78,11 @@ c_sprite * GetTerrainSpriteMap(int in, t_matglossPair material, vector<TerrainC }
c_sprite * GetFloorSpriteMap(int in, t_matglossPair material, uint16_t form){
- return GetTerrainSpriteMap(in, material, contentLoader.terrainFloorConfigs, form);
+ return GetTerrainSpriteMap(in, material, contentLoader->terrainFloorConfigs, form);
}
c_sprite * GetBlockSpriteMap(int in, t_matglossPair material, uint16_t form){
- return GetTerrainSpriteMap(in, material, contentLoader.terrainBlockConfigs, form);
+ return GetTerrainSpriteMap(in, material, contentLoader->terrainBlockConfigs, form);
}
c_block_tree * GetTreeVegetation( TileShape type, int index)
@@ -96,32 +96,32 @@ c_block_tree * GetTreeVegetation( TileShape type, int index) {
case TREE_DEAD:
base_sprite = SPRITEOBJECT_TREE_DEAD;
- graphicSet = &(contentLoader.treeConfigs);
+ graphicSet = &(contentLoader->treeConfigs);
live = false;
break;
case TREE_OK:
base_sprite = SPRITEOBJECT_TREE_OK;
- graphicSet = &(contentLoader.treeConfigs);
+ graphicSet = &(contentLoader->treeConfigs);
break;
case SAPLING_DEAD:
base_sprite = SPRITEOBJECT_SAPLING_DEAD;
live = false;
grown = false;
- graphicSet = &(contentLoader.treeConfigs);
+ graphicSet = &(contentLoader->treeConfigs);
break;
case SAPLING_OK:
base_sprite = SPRITEOBJECT_SAPLING_OK;
grown = false;
- graphicSet = &(contentLoader.treeConfigs);
+ graphicSet = &(contentLoader->treeConfigs);
break;
case SHRUB_DEAD:
base_sprite = SPRITEOBJECT_SHRUB_DEAD;
live = false;
- graphicSet = &(contentLoader.shrubConfigs);
+ graphicSet = &(contentLoader->shrubConfigs);
break;
case SHRUB_OK:
base_sprite = SPRITEOBJECT_SHRUB_OK;
- graphicSet = &(contentLoader.shrubConfigs);
+ graphicSet = &(contentLoader->shrubConfigs);
break;
default:
defaultTree->set_sheetindex(SPRITEOBJECT_BLANK);
|
