summaryrefslogtreecommitdiff
path: root/MapLoading.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 /MapLoading.cpp
parentd219e323689a7ea5d387346b906241f2e999df1e (diff)
downloadstonesense-7c346109c5b370a226a46585cfa2e461b0d100d0.tar.gz
stonesense-7c346109c5b370a226a46585cfa2e461b0d100d0.tar.bz2
stonesense-7c346109c5b370a226a46585cfa2e461b0d100d0.tar.xz
Break everything forever.
Diffstat (limited to 'MapLoading.cpp')
-rw-r--r--MapLoading.cpp31
1 files changed, 24 insertions, 7 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp
index 1ec925d..168a228 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -21,13 +21,13 @@ segParams parms;
using namespace DFHack::Simple;
inline bool IDisWall(int in){
- //if not a custom type, do a lookup in dfHack's interface
- return isWallTerrain( in );
+ //if not a custom type, do a lookup in dfHack's interface
+ return isWallTerrain( (tiletype::tiletype) in );
}
inline bool IDisFloor(int in){
- //if not a custom type, do a lookup in dfHack's interface
- return isFloorTerrain( in );;
+ //if not a custom type, do a lookup in dfHack's interface
+ return isFloorTerrain( (tiletype::tiletype) in );;
}
//big look up table
@@ -940,9 +940,26 @@ void beautify_Segment(WorldSegment * segment)
if(dir2) if(dir2->creaturePresent) b->obscuringCreature = 1;
if(dir8) if(dir8->creaturePresent) b->obscuringCreature = 1;
- if(dir1) if(dir1->building.info.type != BUILDINGTYPE_NA && dir1->building.info.type != BUILDINGTYPE_BLACKBOX && dir1->building.info.type != contentLoader->civzoneNum && dir1->building.info.type != contentLoader->stockpileNum) b->obscuringBuilding = 1;
- if(dir2) if(dir2->building.info.type != BUILDINGTYPE_NA && dir2->building.info.type != BUILDINGTYPE_BLACKBOX && dir2->building.info.type != contentLoader->civzoneNum && dir2->building.info.type != contentLoader->stockpileNum) b->obscuringBuilding = 1;
- if(dir8) if(dir8->building.info.type != BUILDINGTYPE_NA && dir8->building.info.type != BUILDINGTYPE_BLACKBOX && dir8->building.info.type != contentLoader->civzoneNum && dir8->building.info.type != contentLoader->stockpileNum) b->obscuringBuilding = 1;
+ if(dir1)
+ if(dir1->building.info.type != BUILDINGTYPE_NA
+ && dir1->building.info.type != BUILDINGTYPE_BLACKBOX
+ && dir1->building.info.type != df::enums::building_type::Civzone
+ && dir1->building.info.type != df::enums::building_type::Stockpile
+ )
+ b->obscuringBuilding = 1;
+ if(dir2)
+ if(dir2->building.info.type != BUILDINGTYPE_NA
+ && dir2->building.info.type != BUILDINGTYPE_BLACKBOX
+ && dir2->building.info.type != df::enums::building_type::Civzone
+ && dir2->building.info.type != df::enums::building_type::Stockpile
+ )
+ b->obscuringBuilding = 1;
+ if(dir8)
+ if(dir8->building.info.type != BUILDINGTYPE_NA
+ && dir8->building.info.type != BUILDINGTYPE_BLACKBOX
+ && dir8->building.info.type != df::enums::building_type::Civzone
+ && dir8->building.info.type != df::enums::building_type::Stockpile
+ ) b->obscuringBuilding = 1;
if( b->floorType > 0 )
{