summaryrefslogtreecommitdiff
path: root/GameBuildings.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-02-19 10:43:12 +0100
committerPetr Mrázek2012-02-19 10:43:12 +0100
commit7c346109c5b370a226a46585cfa2e461b0d100d0 (patch)
tree2eeff170b0b7e8ca7f944955730ee92bdc2a7261 /GameBuildings.cpp
parentd219e323689a7ea5d387346b906241f2e999df1e (diff)
downloadstonesense-7c346109c5b370a226a46585cfa2e461b0d100d0.tar.gz
stonesense-7c346109c5b370a226a46585cfa2e461b0d100d0.tar.bz2
stonesense-7c346109c5b370a226a46585cfa2e461b0d100d0.tar.xz
Break everything forever.
Diffstat (limited to 'GameBuildings.cpp')
-rw-r--r--GameBuildings.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/GameBuildings.cpp b/GameBuildings.cpp
index 438b3bd..49f2f11 100644
--- a/GameBuildings.cpp
+++ b/GameBuildings.cpp
@@ -43,7 +43,7 @@ return eSimpleSingle;
bool blockHasBridge(Block* b){
if(!b) return 0;
- return b->building.info.type == BUILDINGTYPE_BRIDGE;
+ return b->building.info.type == df::enums::building_type::Bridge;
}
dirTypes findWallCloseTo(WorldSegment* segment, Block* b){
@@ -117,9 +117,9 @@ void MergeBuildingsToSegment(vector<Buildings::t_building>* buildings, WorldSegm
if( b ){
//handle special case where zones and stockpiles overlap buildings, and try to replace them
- if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == TranslateBuildingName("building_civzonest", contentLoader->classIdStrings ) )
+ if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == df::enums::building_type::Civzone )
continue;
- if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == TranslateBuildingName("building_stockpilest", contentLoader->classIdStrings ) )
+ if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == df::enums::building_type::Stockpile )
continue;
b->building.index = i;
b->building.info = tempbuilding;