summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-10-21 16:58:15 +0000
committerrubidium <rubidium@openttd.org>2014-10-21 16:58:15 +0000
commitd1429cd936330ca2b3fb0da6a3de799f51fb0907 (patch)
tree582d6084c33ac51e0d835d81893520c14eeeeb6d
parentb1216055db4af47574f8f302eebbbfe6c8a46c90 (diff)
downloadopenttd-d1429cd936330ca2b3fb0da6a3de799f51fb0907.tar.xz
(svn r27026) -Fix: some (older-ish) GCC compiler warnings
-rw-r--r--src/script/api/script_company.cpp4
-rw-r--r--src/settings_gui.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp
index a5fecf8ea..a1f40c5e1 100644
--- a/src/script/api/script_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -230,8 +230,8 @@
{
EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY);
EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END);
- EnforcePrecondition(false, delta >= INT32_MIN);
- EnforcePrecondition(false, delta <= INT32_MAX);
+ EnforcePrecondition(false, (int64)delta >= INT32_MIN);
+ EnforcePrecondition(false, (int64)delta <= INT32_MAX);
company = ResolveCompanyID(company);
EnforcePrecondition(false, company != COMPANY_INVALID);
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 5bfcb04ce..f1af4804e 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -290,7 +290,7 @@ struct GameOptionsWindow : Window {
list = new DropDownList();
*selected_index = ZOOM_LVL_OUT_4X - _gui_zoom;
const StringID *items = _gui_zoom_dropdown;
- for (uint i = 0; *items != INVALID_STRING_ID; items++, i++) {
+ for (int i = 0; *items != INVALID_STRING_ID; items++, i++) {
*list->Append() = new DropDownListStringItem(*items, i, _settings_client.gui.zoom_min > ZOOM_LVL_OUT_4X - i);
}
break;