summaryrefslogtreecommitdiff
path: root/MapLoading.cpp
diff options
context:
space:
mode:
authorCaldfir2012-04-14 23:41:11 -0700
committerCaldfir2012-04-14 23:41:11 -0700
commit953e8d8cc010e65f45ad6fd7200b07fae9779089 (patch)
tree9c2f524ec573f60ebd8da8c8b749aafe465ff1cb /MapLoading.cpp
parentbf86bcf659c191cf42e071976186697f86588d52 (diff)
downloadstonesense-953e8d8cc010e65f45ad6fd7200b07fae9779089.tar.gz
stonesense-953e8d8cc010e65f45ad6fd7200b07fae9779089.tar.bz2
stonesense-953e8d8cc010e65f45ad6fd7200b07fae9779089.tar.xz
Attempt at getting dye blending to work.
Diffstat (limited to 'MapLoading.cpp')
-rw-r--r--MapLoading.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp
index 19ab329..0b60284 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -522,9 +522,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)
@@ -532,9 +531,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;
}
}
}