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 /ContentLoader.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 'ContentLoader.cpp')
| -rw-r--r-- | ContentLoader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp index 6a57118..9d4197e 100644 --- a/ContentLoader.cpp +++ b/ContentLoader.cpp @@ -503,15 +503,15 @@ const char *lookupBuildingSubtype(int main_type, int i) switch (main_type)
{
case building_type::Furnace:
- return ENUM_KEY_STR(furnace_type,(furnace_type::furnace_type)i).c_str();
+ return enum_item_key_str((df::furnace_type)i);
case building_type::Construction:
- return ENUM_KEY_STR(construction_type,(construction_type::construction_type)i).c_str();
+ return enum_item_key_str((df::construction_type)i);
case building_type::SiegeEngine:
- return ENUM_KEY_STR(siegeengine_type,(siegeengine_type::siegeengine_type)i).c_str();
+ return enum_item_key_str((df::siegeengine_type)i);
case building_type::Shop:
- return ENUM_KEY_STR(shop_type,(shop_type::shop_type)i).c_str();
+ return enum_item_key_str((df::shop_type)i);
case building_type::Workshop:
- return ENUM_KEY_STR(workshop_type,(workshop_type::workshop_type)i).c_str();
+ return enum_item_key_str((df::workshop_type)i);
default:
return "NA";
}
|
