diff options
| author | Japa Illo | 2012-03-26 23:19:43 +0200 |
|---|---|---|
| committer | Japa Illo | 2012-03-26 23:19:43 +0200 |
| commit | 07ddc8c13e0bb38cde77937803e9320e2b26f2d9 (patch) | |
| tree | cd2af61c7780ce69ae20c62112e28808384a053f /SpriteObjects.cpp | |
| parent | 4d146bbbba642b08465d8ee275612f29bfbbe7ed (diff) | |
| parent | f854810fb76a6c83a9ccd3a50f526963b5c85b90 (diff) | |
| download | stonesense-07ddc8c13e0bb38cde77937803e9320e2b26f2d9.tar.gz stonesense-07ddc8c13e0bb38cde77937803e9320e2b26f2d9.tar.bz2 stonesense-07ddc8c13e0bb38cde77937803e9320e2b26f2d9.tar.xz | |
Merge branch 'master' of git://github.com/peterix/stonesense
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 ff5af5e..794ab1b 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).c_str()) == 0)
- itemtype = index;
+ df::item_type index;
+ if (find_enum_item(&index, equiptypestr))
+ itemtype = (int)index;
}
const char* equipsindexstr = elemSprite->Attribute("equipment_name");
|
