summaryrefslogtreecommitdiff
path: root/library/modules
diff options
context:
space:
mode:
authorQuietust2012-09-13 14:30:44 -0500
committerQuietust2012-09-13 14:30:44 -0500
commit1d8c9a6a5feadfc03707677588031bf85631a7c6 (patch)
tree6a492801a2ff0f487ab046014d32bbe8517405fd /library/modules
parentcae01250ff5bc3df14677371459ef3b8b6451a08 (diff)
parent24b93ea61fd1cb6ad69c2e3beab182f5f60646c7 (diff)
downloaddfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.gz
dfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.bz2
dfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.xz
Merge https://github.com/danaris/dfhack
Diffstat (limited to 'library/modules')
-rw-r--r--library/modules/Job.cpp2
-rw-r--r--library/modules/Units.cpp2
-rw-r--r--library/modules/kitchen.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index 54b4eb27..b74a4b73 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 28c34b02..01b7b50f 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -1311,7 +1311,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];
}