MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update getplants to use new plant_raw.material_defs layout 

a9f219baf9 applied to #1564
develop
lethosor 2020-08-06 00:53:06 -04:00
parent d3fc691858
commit 02c0a6c8f6
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/getplants.cpp
Unescape Escape View File

@ -264,7 +264,7 @@ bool picked(const df::plant *plant, int32_t growth_subtype) {
bool designate(const df::plant *plant, bool farming) { bool designate(const df::plant *plant, bool farming) {
df::plant_raw *plant_raw = world->raws.plants.all[plant->material]; df::plant_raw *plant_raw = world->raws.plants.all[plant->material];
const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant_raw->material_defs.type_basic_mat, plant_raw->material_defs.idx_basic_mat); const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant_raw->material_defs.type[plant_material_def::basic_mat], plant_raw->material_defs.idx[plant_material_def::basic_mat]);
if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) || if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED)) basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
@ -309,8 +309,8 @@ bool designate(const df::plant *plant, bool farming) {
{ {
for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++) for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
{ {
if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type_seed && if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type[plant_material_def::seed] &&
growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx_seed) growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx[plant_material_def::seed])
{ {
seedSource = true; seedSource = true;
break; break;