summaryrefslogtreecommitdiff
path: root/ContentBuildingReader.cpp
diff options
context:
space:
mode:
authorKris Parker2009-11-28 15:39:01 +0000
committerKris Parker2009-11-28 15:39:01 +0000
commit4f7ccca329f67fa12c369ab1451fce9a024d97b9 (patch)
treee11e6df8dec213e7d81b19936e3a37e1786eaa83 /ContentBuildingReader.cpp
parent83f7c9923af0955b3d7d1ee7023fcae439fb00d2 (diff)
downloadstonesense-4f7ccca329f67fa12c369ab1451fce9a024d97b9.tar.gz
stonesense-4f7ccca329f67fa12c369ab1451fce9a024d97b9.tar.bz2
stonesense-4f7ccca329f67fa12c369ab1451fce9a024d97b9.tar.xz
removed magic numbers from frames
Diffstat (limited to 'ContentBuildingReader.cpp')
-rw-r--r--ContentBuildingReader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ContentBuildingReader.cpp b/ContentBuildingReader.cpp
index fda047a..e4c99fb 100644
--- a/ContentBuildingReader.cpp
+++ b/ContentBuildingReader.cpp
@@ -139,7 +139,7 @@ int parseConditionNode(ConditionalNode* node, TiXmlElement* elemCondition, bool
inline char getAnimFrames(const char* framestring)
{
if (framestring == NULL)
- return 1+2+4+8+16+32;
+ return ALL_FRAMES;
char aframes=0;
for (int i=0;i<6;i++)
{
@@ -211,7 +211,7 @@ inline bool readNode(SpriteNode* node, TiXmlElement* elemNode, TiXmlElement* ele
getAnimFrames(elemNode->Attribute("frames"));
sprite->sprite.animFrames = getAnimFrames(elemNode->Attribute("frames"));
if (sprite->sprite.animFrames == 0)
- sprite->sprite.animFrames = 1+2+4+8+16+32;
+ sprite->sprite.animFrames = ALL_FRAMES;
sprite->sprite.sheetIndex = (strSheetIndex != 0 ? atoi(strSheetIndex) : -1);
sprite->sprite.x = (strOffsetX != 0 ? atoi(strOffsetX) : 0);