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

MaterialInfo: fix decoding for COAL subtypes

develop
jj 2013-11-05 00:31:32 +01:00
parent 9dc9a3f33a
commit 04dce1aa7f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,6 +190,13 @@ bool MaterialInfo::find(const std::vector<std::string> &items)
} }
else if (items.size() == 2) else if (items.size() == 2)
{ {
if (items[0] == "COAL" && findBuiltin(items[0])) {
if (items[1] == "COKE")
this->index = 0;
else if (items[1] == "CHARCOAL")
this->index = 1;
return true;
}
if (items[1] == "NONE" && findBuiltin(items[0])) if (items[1] == "NONE" && findBuiltin(items[0]))
return true; return true;
if (findPlant(items[0], items[1])) if (findPlant(items[0], items[1]))