diff options
| author | Alexander Gavrilov | 2012-03-17 13:09:22 +0400 |
|---|---|---|
| committer | Petr Mrázek | 2012-03-18 12:47:01 +0100 |
| commit | 719dbc048a55ba1def2ce21e9cd29e33dbe833ce (patch) | |
| tree | 7ba4f05e3e2beb41600d50f9a2fa20910da96887 /SpriteObjects.cpp | |
| parent | fa17ba5de0a003c135150516cd9c80205ac3f9f1 (diff) | |
| download | stonesense-719dbc048a55ba1def2ce21e9cd29e33dbe833ce.tar.gz stonesense-719dbc048a55ba1def2ce21e9cd29e33dbe833ce.tar.bz2 stonesense-719dbc048a55ba1def2ce21e9cd29e33dbe833ce.tar.xz | |
Fix ENUM_KEY_STR breakage.
Diffstat (limited to 'SpriteObjects.cpp')
| -rw-r--r-- | SpriteObjects.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp index 9c1bed0..963fb63 100644 --- a/SpriteObjects.cpp +++ b/SpriteObjects.cpp @@ -494,10 +494,11 @@ void c_sprite::set_by_xml(TiXmlElement *elemSprite) {
itemtype = INVALID_INDEX;
}
- else for(int index=ENUM_FIRST_ITEM(item_type); index <= ENUM_LAST_ITEM(item_type); index++)
+ else
{
- if(strcmp(equiptypestr, ENUM_KEY_STR(item_type, (item_type::item_type)index)) == 0)
- itemtype = index;
+ df::item_type index;
+ if (find_enum_item(&index, equiptypestr))
+ itemtype = (int)index;
}
const char* equipsindexstr = elemSprite->Attribute("equipment_name");
|
