|
|
@ -605,7 +605,7 @@ bool Job::isSuitableItem(df::job_item *item, df::item_type itype, int isubtype)
|
|
|
|
ItemTypeInfo iinfo(itype, isubtype);
|
|
|
|
ItemTypeInfo iinfo(itype, isubtype);
|
|
|
|
MaterialInfo minfo(item);
|
|
|
|
MaterialInfo minfo(item);
|
|
|
|
|
|
|
|
|
|
|
|
return iinfo.isValid() && iinfo.matches(*item, &minfo, true, itype);
|
|
|
|
return iinfo.isValid() && iinfo.matches(*item, &minfo, false, itype);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool Job::isSuitableMaterial(
|
|
|
|
bool Job::isSuitableMaterial(
|
|
|
@ -619,7 +619,7 @@ bool Job::isSuitableMaterial(
|
|
|
|
ItemTypeInfo iinfo(item);
|
|
|
|
ItemTypeInfo iinfo(item);
|
|
|
|
MaterialInfo minfo(mat_type, mat_index);
|
|
|
|
MaterialInfo minfo(mat_type, mat_index);
|
|
|
|
|
|
|
|
|
|
|
|
return minfo.isValid() && iinfo.matches(*item, &minfo, true, itype);
|
|
|
|
return minfo.isValid() && iinfo.matches(*item, &minfo, false, itype);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::string Job::getName(df::job *job)
|
|
|
|
std::string Job::getName(df::job *job)
|
|
|
|