diff options
| author | Petr Mrázek | 2012-09-28 21:55:16 +0200 |
|---|---|---|
| committer | Petr Mrázek | 2012-09-28 21:55:16 +0200 |
| commit | 75df766263b23182820a1e07b330e64f87d5c9b7 (patch) | |
| tree | 207fecb657035d8b068dba244910878739438dac | |
| parent | 24cd34c39b9b2e115a3d496ef4b4b0280813f21f (diff) | |
| parent | bd585355a8ad2e24df5c95ec8ed4b792955a0d66 (diff) | |
| download | stonesense-75df766263b23182820a1e07b330e64f87d5c9b7.tar.gz stonesense-75df766263b23182820a1e07b330e64f87d5c9b7.tar.bz2 stonesense-75df766263b23182820a1e07b330e64f87d5c9b7.tar.xz | |
Merge https://github.com/angavrilov/stonesenseorigin/master
| -rw-r--r-- | MapLoading.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp index 6957aa3..0db0e55 100644 --- a/MapLoading.cpp +++ b/MapLoading.cpp @@ -601,15 +601,15 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C { df::flow_info * eff = *iter; assert(eff != NULL);
- Block* b = segment.getBlock( eff->x, eff->y, eff->z);
+ Block* b = segment.getBlock( eff->pos.x, eff->pos.y, eff->pos.z);
if(!b)
{
- if(segment.CoordinateInsideSegment(eff->x, eff->y, eff->z))
+ if(segment.CoordinateInsideSegment(eff->pos.x, eff->pos.y, eff->pos.z))
{
b = new Block(&segment);
- b->x=eff->x;
- b->y=eff->y;
- b->z=eff->z;
+ b->x=eff->pos.x;
+ b->y=eff->pos.y;
+ b->z=eff->pos.z;
segment.addBlock(b);
}
else
|
