summaryrefslogtreecommitdiff
path: root/GameBuildings.cpp
diff options
context:
space:
mode:
authorJapa2010-04-17 06:37:34 +0000
committerJapa2010-04-17 06:37:34 +0000
commit94ac8727c6119f909027dffc68bc77f2cf268a74 (patch)
tree5b6cf892edd3d0a105a7c9136775029e05ace55d /GameBuildings.cpp
parent41a76c7d2933c720ac629c69cb4ac42e4d29a5c0 (diff)
downloadstonesense-94ac8727c6119f909027dffc68bc77f2cf268a74.tar.gz
stonesense-94ac8727c6119f909027dffc68bc77f2cf268a74.tar.bz2
stonesense-94ac8727c6119f909027dffc68bc77f2cf268a74.tar.xz
worked more on getting custom buildings to work, also made placeholders for most of the materials. everything not set yet is not PINK! as a motivation to get it done.
Diffstat (limited to 'GameBuildings.cpp')
-rw-r--r--GameBuildings.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/GameBuildings.cpp b/GameBuildings.cpp
index bbce0d5..0721e0d 100644
--- a/GameBuildings.cpp
+++ b/GameBuildings.cpp
@@ -109,9 +109,9 @@ void MergeBuildingsToSegment(vector<t_building>* buildings, WorldSegment* segmen
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 == BUILDINGTYPE_ZONE )
+ if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == TranslateBuildingName("building_civzonest", contentLoader.classIdStrings ) )
continue;
- if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == BUILDINGTYPE_STOCKPILE )
+ if(b->building.info.type != BUILDINGTYPE_NA && tempbuilding.type == TranslateBuildingName("building_stockpilest", contentLoader.classIdStrings ) )
continue;
b->building.index = i;
b->building.info = tempbuilding;
@@ -178,10 +178,10 @@ bool BlockHasSuspendedBuilding(vector<t_building>* buildingList, Block* b){
if(b->x < building->x1 || b->x > building->x2) continue;
if(b->y < building->y1 || b->y > building->y2) continue;
- if(building->type == BUILDINGTYPE_BRIDGE){
+ if(building->type == TranslateBuildingName("building_bridgest", contentLoader.classIdStrings )){
return true;
}
- if(building->type == BUILDINGTYPE_ZONE)
+ if(building->type == TranslateBuildingName("building_civzonest", contentLoader.classIdStrings ))
return true;
}
return false;