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

undo unnecessary edits

develop
myk002 2020-11-12 22:49:06 -08:00
parent 10616a387f
commit fa126af1fd
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/modules/Materials.cpp
Unescape Escape View File

@ -75,8 +75,7 @@ bool MaterialInfo::decode(df::item *item)
if (!item) if (!item)
return decode(-1); return decode(-1);
else else
return decode(item->getActualMaterial(), return decode(item->getActualMaterial(), item->getActualMaterialIndex());
item->getActualMaterialIndex());
} }
bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx) bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx)
@ -518,6 +517,7 @@ void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &ma
TEST(magma_safe, material->heat.melting_point > 12000); TEST(magma_safe, material->heat.melting_point > 12000);
TEST(deep_material, FLAG(inorganic, inorganic_flags::SPECIAL)); TEST(deep_material, FLAG(inorganic, inorganic_flags::SPECIAL));
TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index))); TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)));
TEST(plant, plant); TEST(plant, plant);
TEST(silk, MAT_FLAG(SILK)); TEST(silk, MAT_FLAG(SILK));
TEST(leather, MAT_FLAG(LEATHER)); TEST(leather, MAT_FLAG(LEATHER));