summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJapa Illo2012-03-23 23:07:00 +0100
committerJapa Illo2012-03-23 23:07:00 +0100
commit9e7bff5c321b3da4cf73546ede00095351ee1b43 (patch)
treec625cd10bb01ed89522ef57c62f5dbadcc69bee8
parentf7a9e36fd2364f2dbbb204e05e40279fe671b107 (diff)
downloadstonesense-9e7bff5c321b3da4cf73546ede00095351ee1b43.tar.gz
stonesense-9e7bff5c321b3da4cf73546ede00095351ee1b43.tar.bz2
stonesense-9e7bff5c321b3da4cf73546ede00095351ee1b43.tar.xz
Various fixes.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
-rw-r--r--Block.cpp2
-rw-r--r--BlockCondition.cpp2
-rw-r--r--ContentLoader.cpp10
-rw-r--r--GUI.cpp6
-rw-r--r--SpriteObjects.cpp2
5 files changed, 11 insertions, 11 deletions
diff --git a/Block.cpp b/Block.cpp
index ec3b2a1..dd79208 100644
--- a/Block.cpp
+++ b/Block.cpp
@@ -634,7 +634,7 @@ void createEffectSprites()
sprite_water = CreateSpriteFromSheet( 181, IMGObjectSheet);
sprite_water2 = CreateSpriteFromSheet( 182, IMGObjectSheet);
sprite_blood = CreateSpriteFromSheet( 183, IMGObjectSheet);
- sprite_dust = CreateSpriteFromSheet( 184, IMGObjectSheet);
+ sprite_dust = CreateSpriteFromSheet( 182, IMGObjectSheet);
sprite_magma = CreateSpriteFromSheet( 185, IMGObjectSheet);
sprite_smoke = CreateSpriteFromSheet( 186, IMGObjectSheet);
sprite_dragonfire = load_bitmap_withWarning("stonesense/Effect_flames.png");
diff --git a/BlockCondition.cpp b/BlockCondition.cpp
index 022b32b..918108f 100644
--- a/BlockCondition.cpp
+++ b/BlockCondition.cpp
@@ -34,7 +34,7 @@ int getBuildingFromString(const char* strType)
{
FOR_ENUM_ITEMS(building_type,i)
{
- if (strcmp(strType,ENUM_KEY_STR(building_type,i)) == 0)
+ if (strcmp(strType,ENUM_KEY_STR(building_type,i).c_str()) == 0)
{
return i;
}
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index f143930..48e84f1 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -493,15 +493,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);
+ return ENUM_KEY_STR(furnace_type,(furnace_type::furnace_type)i).c_str();
case building_type::Construction:
- return ENUM_KEY_STR(construction_type,(construction_type::construction_type)i);
+ return ENUM_KEY_STR(construction_type,(construction_type::construction_type)i).c_str();
case building_type::SiegeEngine:
- return ENUM_KEY_STR(siegeengine_type,(siegeengine_type::siegeengine_type)i);
+ return ENUM_KEY_STR(siegeengine_type,(siegeengine_type::siegeengine_type)i).c_str();
case building_type::Shop:
- return ENUM_KEY_STR(shop_type,(shop_type::shop_type)i);
+ return ENUM_KEY_STR(shop_type,(shop_type::shop_type)i).c_str();
case building_type::Workshop:
- return ENUM_KEY_STR(workshop_type,(workshop_type::workshop_type)i);
+ return ENUM_KEY_STR(workshop_type,(workshop_type::workshop_type)i).c_str();
default:
return "NA";
}
diff --git a/GUI.cpp b/GUI.cpp
index 83fd333..22e31c4 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -478,7 +478,7 @@ void drawDebugCursorAndInfo(WorldSegment * segment)
draw_textf_border(font, al_map_rgb(255,255,255), 2, (i++*al_get_font_line_height(font)), 0,
"%s - %s%s%s%s%s",
mat.getToken().c_str(),
- ENUM_KEY_STR(item_type, Actual_building->contained_items[index]->item->getType()),
+ ENUM_KEY_STR(item_type, Actual_building->contained_items[index]->item->getType()).c_str(),
(Actual_building->contained_items[index]->item->getSubtype()>=0)?"/":"",
(Actual_building->contained_items[index]->item->getSubtype()>=0)?get_item_subtype(Actual_building->contained_items[index]->item->getType(),Actual_building->contained_items[index]->item->getSubtype()):"",
Actual_building->contained_items[index]->item->getStackSize()>1?stacknum:"",
@@ -504,7 +504,7 @@ void drawDebugCursorAndInfo(WorldSegment * segment)
if(b->inv->item[item_type_idex].empty())
continue;
draw_textf_border(font, al_map_rgb(255,255,255), 2, (i++*al_get_font_line_height(font)), 0,
- "%s:", ENUM_KEY_STR(item_type, (item_type::item_type)item_type_idex));
+ "%s:", ENUM_KEY_STR(item_type, (item_type::item_type)item_type_idex).c_str());
for(int ind = 0; ind < b->inv->item[item_type_idex].size(); ind++)
{
if(b->inv->item[item_type_idex][ind].empty())
@@ -631,7 +631,7 @@ void drawDebugCursorAndInfo(WorldSegment * segment)
const char* subTypeName = lookupBuildingSubtype(b->building.info.type, b->building.info.subtype);
draw_textf_border(font, al_map_rgb(255,255,255), 2, (i++*al_get_font_line_height(font)), 0,
"Building: game_type = %s(%i) game_subtype = %s(%i) Material: %s%s%s (%d,%d)",
- ENUM_KEY_STR(building_type, (building_type::building_type)b->building.info.type),
+ ENUM_KEY_STR(building_type, (building_type::building_type)b->building.info.type).c_str(),
b->building.info.type,
subTypeName,
b->building.info.subtype,
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 9c1bed0..28a6ce5 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -496,7 +496,7 @@ void c_sprite::set_by_xml(TiXmlElement *elemSprite)
}
else for(int index=ENUM_FIRST_ITEM(item_type); index <= ENUM_LAST_ITEM(item_type); index++)
{
- if(strcmp(equiptypestr, ENUM_KEY_STR(item_type, (item_type::item_type)index)) == 0)
+ if(strcmp(equiptypestr, ENUM_KEY_STR(item_type, (item_type::item_type)index).c_str()) == 0)
itemtype = index;
}