diff options
| author | Petr Mrázek | 2012-04-16 20:19:07 +0200 |
|---|---|---|
| committer | Petr Mrázek | 2012-04-16 20:19:07 +0200 |
| commit | cddc64777b8368e15c1a820ccd1cf56e11267e52 (patch) | |
| tree | e9fa231f83911d4aa908fe363ef257178c2ffab0 /MapLoading.cpp | |
| parent | c50af342c27542c3b2c51ddd9099798339b7aa62 (diff) | |
| parent | 7eb549f64b99b146590eed97646bae1c13e4346d (diff) | |
| download | stonesense-cddc64777b8368e15c1a820ccd1cf56e11267e52.tar.gz stonesense-cddc64777b8368e15c1a820ccd1cf56e11267e52.tar.bz2 stonesense-cddc64777b8368e15c1a820ccd1cf56e11267e52.tar.xz | |
Merge https://github.com/Caldfir/stonesense
Diffstat (limited to 'MapLoading.cpp')
| -rw-r--r-- | MapLoading.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp index 1f94eb2..3852c4d 100644 --- a/MapLoading.cpp +++ b/MapLoading.cpp @@ -520,9 +520,8 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C if(!Improvement_Thread)
continue;
if (Improvement_Thread->dye.mat_type < 0) break;
- b->Item.matt.type = Improvement_Thread->dye.mat_type;
- b->Item.matt.index = Improvement_Thread->dye.mat_index;
- b->Item.dyed = 1;
+ b->Item.dyematt.type = Improvement_Thread->dye.mat_type;
+ b->Item.dyematt.index = Improvement_Thread->dye.mat_index;
}
}
else if (found_item->getType() == item_type::THREAD)
@@ -530,9 +529,8 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C auto Thread_Item = virtual_cast<df::item_threadst>(found_item);
if(!Thread_Item) break;
if (Thread_Item->dye_mat_type < 0) break;
- b->Item.matt.type = Thread_Item->dye_mat_type;
- b->Item.matt.index = Thread_Item->dye_mat_index;
- b->Item.dyed = 1;
+ b->Item.dyematt.type = Thread_Item->dye_mat_type;
+ b->Item.dyematt.index = Thread_Item->dye_mat_index;
}
}
}
|
