summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaldfir2012-03-24 03:40:30 -0700
committerCaldfir2012-03-24 03:40:30 -0700
commit310c5df1e4495e455fc189086012f24014f1a01b (patch)
tree3d8e29f013fc40b11c60c0c3cd5dfcca0d63a2f8
parente11b313f03db1d59353373cb1e1a4c303bdd11f9 (diff)
downloadstonesense-310c5df1e4495e455fc189086012f24014f1a01b.tar.gz
stonesense-310c5df1e4495e455fc189086012f24014f1a01b.tar.bz2
stonesense-310c5df1e4495e455fc189086012f24014f1a01b.tar.xz
Switched on the new profession indicator.
-rw-r--r--GUI.cpp6
-rw-r--r--GUI.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/GUI.cpp b/GUI.cpp
index 83fd333..517d010 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, (df::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, (df::building_type)b->building.info.type).c_str(),
b->building.info.type,
subTypeName,
b->building.info.subtype,
diff --git a/GUI.h b/GUI.h
index add378f..e531c4b 100644
--- a/GUI.h
+++ b/GUI.h
@@ -49,6 +49,7 @@ extern ALLEGRO_BITMAP* IMGObjectSheet;
extern ALLEGRO_BITMAP* IMGCreatureSheet;
extern ALLEGRO_BITMAP* IMGRampSheet;
extern ALLEGRO_BITMAP* IMGStatusSheet;
+extern ALLEGRO_BITMAP* IMGJobSheet;
extern ALLEGRO_BITMAP* IMGBloodSheet;
extern ALLEGRO_BITMAP* IMGEngFloorSheet;
extern ALLEGRO_BITMAP* IMGEngLeftSheet;