summaryrefslogtreecommitdiff
path: root/GUI.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-02-19 20:49:23 +0530
committerJapa Illo2012-02-19 20:49:23 +0530
commit515f077352077c6a4059c06af9269346bff8d948 (patch)
tree965c5b2f7d391dd4a69a452ba8ca373352de72c9 /GUI.cpp
parent952e5d78ab6160be0e13446b0beabef301542848 (diff)
downloadstonesense-515f077352077c6a4059c06af9269346bff8d948.tar.gz
stonesense-515f077352077c6a4059c06af9269346bff8d948.tar.bz2
stonesense-515f077352077c6a4059c06af9269346bff8d948.tar.xz
Fixed all the building xml files.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'GUI.cpp')
-rw-r--r--GUI.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/GUI.cpp b/GUI.cpp
index 2198060..20b51c0 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -387,12 +387,12 @@ void drawDebugCursorAndInfo(){
ttype=b->tileType;
tform="wall";
}
- else if (b->tileShapeBasic==tiletype_shape_basic::Ramp > 0)
+ else if (b->tileShapeBasic==tiletype_shape_basic::Ramp)
{
ttype=b->tileType;
tform="ramp";
}
- else if (b->tileShapeBasic==tiletype_shape_basic::Stair > 0)
+ else if (b->tileShapeBasic==tiletype_shape_basic::Stair)
{
ttype=b->tileType;
tform="stair";
@@ -452,26 +452,26 @@ void drawDebugCursorAndInfo(){
if(b->building.sprites.size() != 0)
draw_textf_border(font, al_map_rgb(255,255,255), 2, al_get_bitmap_height(al_get_target_bitmap())-20-(i--*al_get_font_line_height(font)), 0,
"%i extra sprites.", b->building.sprites.size());
-/*
+
// FIXME: classidstrings is no more
//building
if(b->building.info.type != BUILDINGTYPE_NA && b->building.info.type != BUILDINGTYPE_BLACKBOX && b->building.info.type != BUILDINGTYPE_TREE){
const char* matName = lookupMaterialTypeName(b->building.info.material.type);
const char* subMatName = lookupMaterialName(b->building.info.material.type,b->building.info.material.index);
draw_textf_border(font, al_map_rgb(255,255,255), 2, al_get_bitmap_height(al_get_target_bitmap())-20-(i--*al_get_font_line_height(font)), 0,
- "Building: %s(%i) Material: %s%s%s (%d,%d)",
- contentLoader->classIdStrings.at(b->building.info.type).c_str(),
+ "Building: gametype = %s(%i) Material: %s%s%s (%d,%d)",
+ ENUM_KEY_STR(building_type, (building_type::building_type)b->building.info.type),
b->building.info.type,
matName?matName:"Unknown",subMatName?"/":"",subMatName?subMatName:"",
b->building.info.material.type,b->building.info.material.index);
- if(b->building.custom_building_type != -1)
- {
- draw_textf_border(font, al_map_rgb(255,255,255), 2, al_get_bitmap_height(al_get_target_bitmap())-20-(i--*al_get_font_line_height(font)), 0,
- "Custom workshop type %s (%d)", contentLoader->custom_workshop_types[b->building.custom_building_type].c_str(),b->building.custom_building_type);
- }
+ //if(b->building.custom_building_type != -1)
+ //{
+ // draw_textf_border(font, al_map_rgb(255,255,255), 2, al_get_bitmap_height(al_get_target_bitmap())-20-(i--*al_get_font_line_height(font)), 0,
+ // "Custom workshop type %s (%d)", contentLoader->custom_workshop_types[b->building.custom_building_type].c_str(),b->building.custom_building_type);
+ //}
}
-*/
+
//creatures
if(b->creature != null){
if(!config.skipCreatureTypes)