summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--depends/protobuf/CMakeLists.txt6
-rw-r--r--library/RemoteClient.cpp2
-rw-r--r--library/RemoteServer.cpp2
-rw-r--r--library/RemoteTools.cpp2
-rw-r--r--library/include/DataDefs.h2
-rw-r--r--library/include/RemoteTools.h2
-rw-r--r--library/modules/Job.cpp2
-rw-r--r--library/modules/Units.cpp2
-rw-r--r--library/modules/kitchen.cpp2
-rw-r--r--plugins/autolabor.cpp6
-rw-r--r--plugins/cleaners.cpp4
-rw-r--r--plugins/cleanowned.cpp14
-rw-r--r--plugins/jobutils.cpp2
-rw-r--r--plugins/prospector.cpp2
-rw-r--r--plugins/tiletypes.cpp2
-rw-r--r--plugins/workflow.cpp2
-rw-r--r--plugins/zone.cpp4
17 files changed, 29 insertions, 29 deletions
diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index 570c77b1..8cd5febc 100644
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -7,10 +7,10 @@ IF(CMAKE_COMPILER_IS_GNUCC)
STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
LIST(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
LIST(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
- IF(GCC_MAJOR LESS 4 OR (GCC_MAJOR EQUAL 4 AND GCC_MINOR LESS 2))
+ #IF(GCC_MAJOR LESS 4 OR (GCC_MAJOR EQUAL 4 AND GCC_MINOR LESS 2))
#GCC is too old
- SET(STL_HASH_OLD_GCC 1)
- ENDIF()
+ # SET(STL_HASH_OLD_GCC 1)
+ #ENDIF()
#SET(CMAKE_CXX_FLAGS "-std=c++0x")
SET(HAVE_HASH_MAP 0)
diff --git a/library/RemoteClient.cpp b/library/RemoteClient.cpp
index 4d30988c..09861ad5 100644
--- a/library/RemoteClient.cpp
+++ b/library/RemoteClient.cpp
@@ -394,7 +394,7 @@ command_result RemoteFunctionBase::execute(color_ostream &out,
//out.print("Received %d:%d\n", header.id, header.size);
- if (header.id == RPC_REPLY_FAIL)
+ if ((DFHack::DFHackReplyCode)header.id == RPC_REPLY_FAIL)
return header.size == CR_OK ? CR_FAILURE : command_result(header.size);
if (header.size < 0 || header.size > RPCMessageHeader::MAX_MESSAGE_SIZE)
diff --git a/library/RemoteServer.cpp b/library/RemoteServer.cpp
index 53428f2b..06a9f859 100644
--- a/library/RemoteServer.cpp
+++ b/library/RemoteServer.cpp
@@ -250,7 +250,7 @@ void ServerConnection::threadFn()
break;
}
- if (header.id == RPC_REQUEST_QUIT)
+ if ((DFHack::DFHackReplyCode)header.id == RPC_REQUEST_QUIT)
break;
if (header.size < 0 || header.size > RPCMessageHeader::MAX_MESSAGE_SIZE)
diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp
index 95c495e9..b371d60f 100644
--- a/library/RemoteTools.cpp
+++ b/library/RemoteTools.cpp
@@ -287,7 +287,7 @@ void DFHack::describeUnit(BasicUnitInfo *info, df::unit *unit,
if (mask && mask->profession())
{
- if (unit->profession >= 0)
+ if (unit->profession >= (df::profession)0)
info->set_profession(unit->profession);
if (!unit->custom_profession.empty())
info->set_custom_profession(unit->custom_profession);
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 1d485156..7f4d94c8 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -506,7 +506,7 @@ namespace DFHack {
template<class T>
inline const char *enum_item_raw_key(T val) {
typedef df::enum_traits<T> traits;
- return traits::is_valid(val) ? traits::key_table[val - traits::first_item_value] : NULL;
+ return traits::is_valid(val) ? traits::key_table[(short)val - traits::first_item_value] : NULL;
}
/**
diff --git a/library/include/RemoteTools.h b/library/include/RemoteTools.h
index 65884bad..e87e8026 100644
--- a/library/include/RemoteTools.h
+++ b/library/include/RemoteTools.h
@@ -88,7 +88,7 @@ namespace DFHack
{
typedef df::enum_traits<T> traits;
int base = traits::first_item;
- int size = traits::last_item - base + 1;
+ int size = (int)traits::last_item - base + 1;
describeEnum(pf, base, size, traits::key_table);
}
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];
}
diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp
index de1a1aef..5536335c 100644
--- a/plugins/autolabor.cpp
+++ b/plugins/autolabor.cpp
@@ -732,9 +732,9 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
if (df::enums::building_type::Workshop == type)
{
auto subType = build->getSubtype();
- if (df::enums::workshop_type::Butchers == subType)
+ if ((short)df::enums::workshop_type::Butchers == subType)
has_butchers = true;
- if (df::enums::workshop_type::Fishery == subType)
+ if ((short)df::enums::workshop_type::Fishery == subType)
has_fishery = true;
}
else if (df::enums::building_type::TradeDepot == type)
@@ -863,7 +863,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
{
// 7 / 0x7 = Newly arrived migrant, will not work yet
// 17 / 0x11 = On break
- if ((*p)->id == 0x07 || (*p)->id == 0x11)
+ if ((*p)->id == (df::misc_trait_type)0x07 || (*p)->id == (df::misc_trait_type)0x11)
is_on_break = true;
}
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp
index 30befab2..fb436a6d 100644
--- a/plugins/cleaners.cpp
+++ b/plugins/cleaners.cpp
@@ -50,12 +50,12 @@ command_result cleanmap (color_ostream &out, bool snow, bool mud)
// filter snow
if(!snow
&& spatter->mat_type == builtin_mats::WATER
- && spatter->mat_state == matter_state::Powder)
+ && spatter->mat_state == (short)matter_state::Powder)
continue;
// filter mud
if(!mud
&& spatter->mat_type == builtin_mats::MUD
- && spatter->mat_state == matter_state::Solid)
+ && spatter->mat_state == (short)matter_state::Solid)
continue;
delete evt;
diff --git a/plugins/cleanowned.cpp b/plugins/cleanowned.cpp
index c1521b8d..a9d461d2 100644
--- a/plugins/cleanowned.cpp
+++ b/plugins/cleanowned.cpp
@@ -117,13 +117,13 @@ command_result df_cleanowned (color_ostream &out, vector <string> & parameters)
else if (item->flags.bits.on_ground)
{
int32_t type = item->getType();
- if(type == item_type::MEAT ||
- type == item_type::FISH ||
- type == item_type::VERMIN ||
- type == item_type::PET ||
- type == item_type::PLANT ||
- type == item_type::CHEESE ||
- type == item_type::FOOD
+ if((df::enums::item_type::item_type)type == item_type::MEAT ||
+ (df::enums::item_type::item_type)type == item_type::FISH ||
+ (df::enums::item_type::item_type)type == item_type::VERMIN ||
+ (df::enums::item_type::item_type)type == item_type::PET ||
+ (df::enums::item_type::item_type)type == item_type::PLANT ||
+ (df::enums::item_type::item_type)type == item_type::CHEESE ||
+ (df::enums::item_type::item_type)type == item_type::FOOD
)
{
confiscate = true;
diff --git a/plugins/jobutils.cpp b/plugins/jobutils.cpp
index 24ad4170..dbfe26b9 100644
--- a/plugins/jobutils.cpp
+++ b/plugins/jobutils.cpp
@@ -372,7 +372,7 @@ static command_result job_cmd(color_ostream &out, vector <string> & parameters)
out << "Job item updated." << endl;
- if (item->item_type < 0 && minfo.isValid())
+ if (item->item_type < (df::item_type)0 && minfo.isValid())
out.printerr("WARNING: Due to a probable bug, creature & plant material subtype\n"
" is ignored unless the item type is also specified.\n");
diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index e2f1e953..91abd544 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -293,7 +293,7 @@ static command_result embark_prospector(color_ostream &out, df::viewscreen_choos
int level_cnt = layer->top_height - layer->bottom_height + 1;
int layer_size = 48*48*cnt*level_cnt;
- int sums[ENUM_LAST_ITEM(inclusion_type)+1] = { 0 };
+ int sums[(int)ENUM_LAST_ITEM(inclusion_type)+1] = { 0 };
for (unsigned j = 0; j < layer->vein_mat.size(); j++)
if (is_valid_enum_item<df::inclusion_type>(layer->vein_type[j]))
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index 190bda7c..6af94f2e 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -767,7 +767,7 @@ command_result executePaintJob(color_ostream &out)
}
// Remove liquid from walls, etc
- if (type != -1 && !DFHack::FlowPassable(type))
+ if (type != (df::tiletype)-1 && !DFHack::FlowPassable(type))
{
des.bits.flow_size = 0;
//des.bits.liquid_type = DFHack::liquid_water;
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index dbf54607..9e0e4529 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -808,7 +808,7 @@ static void compute_custom_job(ProtectedJob *pj, df::job *job)
using namespace df::enums::reaction_product_item_flags;
VIRTUAL_CAST_VAR(prod, df::reaction_product_itemst, r->products[i]);
- if (!prod || (prod->item_type < 0 && !prod->flags.is_set(CRAFTS)))
+ if (!prod || (prod->item_type < (df::item_type)0 && !prod->flags.is_set(CRAFTS)))
continue;
MaterialInfo mat(prod);
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index ce610128..b5e45f5c 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -792,7 +792,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
bool isActivityZone(df::building * building)
{
if( building->getType() == building_type::Civzone
- && building->getSubtype() == civzone_type::ActivityZone)
+ && building->getSubtype() == (short)civzone_type::ActivityZone)
return true;
else
return false;
@@ -1603,7 +1603,7 @@ void zoneInfo(color_ostream & out, df::building* building, bool verbose)
if(building->getType()!= building_type::Civzone)
return;
- if(building->getSubtype() != civzone_type::ActivityZone)
+ if(building->getSubtype() != (short)civzone_type::ActivityZone)
return;
string name;