summaryrefslogtreecommitdiff
path: root/SpriteMaps.cpp
diff options
context:
space:
mode:
authorJapa2011-01-22 05:05:13 +0000
committerJapa2011-01-22 05:05:13 +0000
commit3e627f73cdbf1073f56bfc2aee5def4f3ba2678f (patch)
treeb30bc7eefef25cc61d73ae14b2a26eff00d08683 /SpriteMaps.cpp
parentb17f42822cd3d0766e32f46dea58e36102f8a23e (diff)
downloadstonesense-3e627f73cdbf1073f56bfc2aee5def4f3ba2678f.tar.gz
stonesense-3e627f73cdbf1073f56bfc2aee5def4f3ba2678f.tar.bz2
stonesense-3e627f73cdbf1073f56bfc2aee5def4f3ba2678f.tar.xz
Got meself some wide and tall trees working
Diffstat (limited to 'SpriteMaps.cpp')
-rw-r--r--SpriteMaps.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp
index 0fd016e..de4f2db 100644
--- a/SpriteMaps.cpp
+++ b/SpriteMaps.cpp
@@ -3,6 +3,7 @@
#include "GroundMaterialConfiguration.h"
#include "ContentLoader.h"
#include "GUI.h"
+#include "BlockTree.h"
c_sprite * GetTerrainSpriteMap(int in, t_matglossPair material, vector<TerrainConfiguration*>& configTable, uint16_t form)
{
@@ -84,9 +85,9 @@ c_sprite * GetBlockSpriteMap(int in, t_matglossPair material, uint16_t form){
return GetTerrainSpriteMap(in, material, contentLoader.terrainBlockConfigs, form);
}
-c_sprite * GetSpriteVegetation( TileClass type, int index)
+c_block_tree * GetTreeVegetation( TileClass type, int index)
{
- static c_sprite * defaultSprite = new c_sprite;
+ static c_block_tree * defaultTree = new c_block_tree;
int base_sprite = SPRITEOBJECT_BLUEPRINT;
vector<VegetationConfiguration>* graphicSet;
bool live=true;
@@ -123,16 +124,16 @@ c_sprite * GetSpriteVegetation( TileClass type, int index)
graphicSet = &(contentLoader.shrubConfigs);
break;
default:
- defaultSprite->set_sheetindex(SPRITEOBJECT_BLANK);
- return defaultSprite;
+ defaultTree->set_sheetindex(SPRITEOBJECT_BLANK);
+ return defaultTree;
}
- c_sprite * configuredSprite = getVegetationSprite(*graphicSet,index,live,grown);
- if (configuredSprite->get_sheetindex() == -1)
+ c_block_tree * configuredTree = getVegetationTree(*graphicSet,index,live,grown);
+ if (configuredTree->get_sheetindex() == -1)
{
- configuredSprite->set_fileindex(-1); // should be set already, but...
- configuredSprite->set_sheetindex(base_sprite);
+ configuredTree->set_fileindex(-1); // should be set already, but...
+ configuredTree->set_sheetindex(base_sprite);
}
- return configuredSprite;
+ return configuredTree;
}