summaryrefslogtreecommitdiff
path: root/SpriteMaps.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-02-19 18:02:52 +0530
committerJapa Illo2012-02-19 18:02:52 +0530
commit8f1887c90e249b83e70d950891df037e95fb6a02 (patch)
tree0270271bff03eb31596e8ae8545e497c60a360f8 /SpriteMaps.cpp
parent7c346109c5b370a226a46585cfa2e461b0d100d0 (diff)
downloadstonesense-8f1887c90e249b83e70d950891df037e95fb6a02.tar.gz
stonesense-8f1887c90e249b83e70d950891df037e95fb6a02.tar.bz2
stonesense-8f1887c90e249b83e70d950891df037e95fb6a02.tar.xz
got rid of floorType, wallType, etc, for good.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'SpriteMaps.cpp')
-rw-r--r--SpriteMaps.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp
index 5e91aa1..737b5e3 100644
--- a/SpriteMaps.cpp
+++ b/SpriteMaps.cpp
@@ -6,8 +6,6 @@
#include "BlockTree.h"
#include "TileTypes.h"
-using df::enums::item_type::item_type;
-
c_sprite * GetTerrainSpriteMap(int in, t_matglossPair material, vector<TerrainConfiguration*>& configTable, uint16_t form)
{
int tempform;
@@ -97,8 +95,8 @@ c_block_tree * GetTreeVegetation( df::tiletype_shape shape, df::tiletype_special
bool grown=true;
switch(shape)
{
- case TREE:
- if(special == DEAD)
+ case tiletype_shape::TREE:
+ if(special == tiletype_special::DEAD)
{
base_sprite = SPRITEOBJECT_TREE_DEAD;
graphicSet = &(contentLoader->treeConfigs);
@@ -110,8 +108,8 @@ c_block_tree * GetTreeVegetation( df::tiletype_shape shape, df::tiletype_special
graphicSet = &(contentLoader->treeConfigs);
}
break;
- case SAPLING:
- if(special == DEAD)
+ case tiletype_shape::SAPLING:
+ if(special == tiletype_special::DEAD)
{
base_sprite = SPRITEOBJECT_SAPLING_DEAD;
live = false;
@@ -125,8 +123,8 @@ c_block_tree * GetTreeVegetation( df::tiletype_shape shape, df::tiletype_special
graphicSet = &(contentLoader->treeConfigs);
}
break;
- case SHRUB:
- if(special == DEAD)
+ case tiletype_shape::SHRUB:
+ if(special == tiletype_special::DEAD)
{
base_sprite = SPRITEOBJECT_SHRUB_DEAD;
live = false;