summaryrefslogtreecommitdiff
path: root/CreatureConfiguration.cpp
diff options
context:
space:
mode:
authorJapa2010-05-19 06:50:40 +0000
committerJapa2010-05-19 06:50:40 +0000
commit73825f0e78fa1e97c77eb823a40368a66463b3fc (patch)
treebdf3709674daf1125939fc15e8a5165479fa83bb /CreatureConfiguration.cpp
parente54d2a9e6ba7bc8cd2121e0dd6b042cdca149e8d (diff)
downloadstonesense-73825f0e78fa1e97c77eb823a40368a66463b3fc.tar.gz
stonesense-73825f0e78fa1e97c77eb823a40368a66463b3fc.tar.bz2
stonesense-73825f0e78fa1e97c77eb823a40368a66463b3fc.tar.xz
Made elves properly colorable.
Diffstat (limited to 'CreatureConfiguration.cpp')
-rw-r--r--CreatureConfiguration.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/CreatureConfiguration.cpp b/CreatureConfiguration.cpp
index 00ab355..c357010 100644
--- a/CreatureConfiguration.cpp
+++ b/CreatureConfiguration.cpp
@@ -103,6 +103,7 @@ bool addSingleCreatureConfig( TiXmlElement* elemCreature, vector<vector<Creature
if (gameID == INVALID_INDEX)
return false;
const char* sheetIndexStr;
+ int defaultFile;
t_SpriteWithOffset sprite;
sprite.fileIndex=basefile;
sprite.x=0;
@@ -120,7 +121,7 @@ bool addSingleCreatureConfig( TiXmlElement* elemCreature, vector<vector<Creature
const char* filename = elemCreature->Attribute("file");
if (filename != NULL && filename[0] != 0)
{
- sprite.fileIndex = loadConfigImgFile((char*)filename,elemCreature);
+ sprite.fileIndex = defaultFile = loadConfigImgFile((char*)filename,elemCreature);
}
TiXmlElement* elemVariant = elemCreature->FirstChildElement("variant");
while( elemVariant ){
@@ -148,6 +149,7 @@ bool addSingleCreatureConfig( TiXmlElement* elemCreature, vector<vector<Creature
{
sprite.fileIndex = loadConfigImgFile((char*)filename,elemCreature);
}
+ else sprite.fileIndex = defaultFile;
const char* sexstr = elemVariant->Attribute("sex");
sheetIndexStr = elemVariant->Attribute("sheetIndex");
@@ -277,6 +279,7 @@ bool addSingleCreatureConfig( TiXmlElement* elemCreature, vector<vector<Creature
}
//create default config
+ sprite.fileIndex = defaultFile;
baseShadow;
sheetIndexStr = elemCreature->Attribute("sheetIndex");
sprite.animFrames = ALL_FRAMES;