diff options
| author | Timothy Collett | 2012-09-10 09:19:21 -0400 |
|---|---|---|
| committer | Timothy Collett | 2012-09-10 09:19:21 -0400 |
| commit | 274d6038adce5797b58cee78a330eb5d639bf59e (patch) | |
| tree | a80b541fe5352594f5e2d82da50f0d38ddbfedfe /library/modules | |
| parent | 270351f510db516811117ab746a563560102c14b (diff) | |
| download | dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.gz dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.bz2 dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.xz | |
Merge further changes (???)
Diffstat (limited to 'library/modules')
| -rw-r--r-- | library/modules/Job.cpp | 2 | ||||
| -rw-r--r-- | library/modules/Units.cpp | 2 | ||||
| -rw-r--r-- | library/modules/kitchen.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp index 1207c97b..a5e73bf1 100644 --- a/library/modules/Job.cpp +++ b/library/modules/Job.cpp @@ -181,7 +181,7 @@ void DFHack::Job::printItemDetails(color_ostream &out, df::job_item *item, int i out << " reaction class: " << item->reaction_class << endl; if (!item->has_material_reaction_product.empty()) out << " reaction product: " << item->has_material_reaction_product << endl; - if (item->has_tool_use >= 0) + if (item->has_tool_use >= (df::tool_uses)0) out << " tool use: " << ENUM_KEY_STR(tool_uses, item->has_tool_use) << endl; } diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index ee383cc0..308700fb 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -838,7 +838,7 @@ std::string DFHack::Units::getCasteProfessionName(int race, int casteid, df::pro { std::string prof, race_prefix; - if (pid < 0 || !is_valid_enum_item(pid)) + if (pid < (df::profession)0 || !is_valid_enum_item(pid)) return ""; bool use_race_prefix = (race >= 0 && race != df::global::ui->race_id); diff --git a/library/modules/kitchen.cpp b/library/modules/kitchen.cpp index 4300d63d..aa235780 100644 --- a/library/modules/kitchen.cpp +++ b/library/modules/kitchen.cpp @@ -114,7 +114,7 @@ void Kitchen::fillWatchMap(std::map<t_materialIndex, unsigned int>& watchMap) watchMap.clear(); for(std::size_t i = 0; i < size(); ++i) { - if(ui->kitchen.item_subtypes[i] == limitType && ui->kitchen.item_subtypes[i] == limitSubtype && ui->kitchen.exc_types[i] == limitExclusion) + if(ui->kitchen.item_subtypes[i] == (short)limitType && ui->kitchen.item_subtypes[i] == (short)limitSubtype && ui->kitchen.exc_types[i] == limitExclusion) { watchMap[ui->kitchen.mat_indices[i]] = (unsigned int) ui->kitchen.mat_types[i]; } |
