diff options
| author | Japa | 2012-08-24 23:50:10 +0530 |
|---|---|---|
| committer | Japa | 2012-08-24 23:50:10 +0530 |
| commit | ca40092182c8cc937d3985d8f3e01c3855082c91 (patch) | |
| tree | 27932226ecec9a97cbe0da14050d2c207d4adc7c /MapLoading.cpp | |
| parent | 5d4f06d785f8a9933679fe3caa12c18215e9674d (diff) | |
| parent | 9410fbcb1759e41481808d495ec442cbda87fac8 (diff) | |
| download | stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.gz stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.bz2 stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.xz | |
Merge branch 'master' of https://github.com/JapaMala/stonesense
Conflicts:
MapLoading.cpp
resources/buildings/Craftsdwarfs.xml
Diffstat (limited to 'MapLoading.cpp')
| -rw-r--r-- | MapLoading.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp index b1c8fe5..6957aa3 100644 --- a/MapLoading.cpp +++ b/MapLoading.cpp @@ -8,8 +8,9 @@ #include "Creatures.h"
#include "ContentLoader.h"
#include "Occlusion_Test.h"
-#include <df/plant.h>
#include <df/flow_info.h>
+#include <df/plant.h> +#include <df/flow_info.h> #include "df/item_constructed.h"
#include "df/itemimprovement.h"
#include "df/itemimprovement_threadst.h"
@@ -597,8 +598,8 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C //add effects
for(auto iter = trueBlock->flows.begin(); iter != trueBlock->flows.end(); iter++)
- {
- df::flow_info * eff = *iter;
+ { + df::flow_info * eff = *iter; assert(eff != NULL);
Block* b = segment.getBlock( eff->x, eff->y, eff->z);
if(!b)
|
