summaryrefslogtreecommitdiff
path: root/SpriteMaps.cpp
diff options
context:
space:
mode:
authorJapa2010-06-23 07:27:17 +0000
committerJapa2010-06-23 07:27:17 +0000
commitccf3c8c845742534f0cae1135835b4cd40fe1079 (patch)
tree4a014a6704166d4bf520012b192d4ff5776c4c73 /SpriteMaps.cpp
parentd1a624de4a674c5735e43fb1b543a7fa6410e0c3 (diff)
downloadstonesense-ccf3c8c845742534f0cae1135835b4cd40fe1079.tar.gz
stonesense-ccf3c8c845742534f0cae1135835b4cd40fe1079.tar.bz2
stonesense-ccf3c8c845742534f0cae1135835b4cd40fe1079.tar.xz
made the tree sprites object oriented
Diffstat (limited to 'SpriteMaps.cpp')
-rw-r--r--SpriteMaps.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/SpriteMaps.cpp b/SpriteMaps.cpp
index 7f67c07..f4621a3 100644
--- a/SpriteMaps.cpp
+++ b/SpriteMaps.cpp
@@ -86,7 +86,7 @@ t_SpriteWithOffset GetBlockSpriteMap(int in, t_matglossPair material, uint16_t f
return GetTerrainSpriteMap(in, material, contentLoader.terrainBlockConfigs, form);
}
-t_SpriteWithOffset GetSpriteVegetation( TileClass type, int index)
+c_sprite GetSpriteVegetation( TileClass type, int index)
{
int base_sprite = SPRITEOBJECT_BLUEPRINT;
vector<VegetationConfiguration>* graphicSet;
@@ -125,21 +125,15 @@ t_SpriteWithOffset GetSpriteVegetation( TileClass type, int index)
graphicSet = &(contentLoader.shrubConfigs);
break;
default:
- t_SpriteWithOffset defaultSprite =
- {SPRITEOBJECT_BLANK,
- 0,
- 0,
- -1,
- 0,
- ALL_FRAMES};
+ c_sprite defaultSprite;
return defaultSprite;
}
- t_SpriteWithOffset configuredSprite = getVegetationSprite(*graphicSet,index,live,grown);
- if (configuredSprite.sheetIndex == -1)
+ c_sprite configuredSprite = getVegetationSprite(*graphicSet,index,live,grown);
+ if (configuredSprite.get_sheetindex() == -1)
{
- configuredSprite.fileIndex = -1; // should be set already, but...
- configuredSprite.sheetIndex = base_sprite;
+ configuredSprite.set_fileindex(-1); // should be set already, but...
+ configuredSprite.set_sheetindex(base_sprite);
}
return configuredSprite;
}