mirror of https://github.com/OpenTTD/OpenTTD
(svn r27026) -Fix: some (older-ish) GCC compiler warnings
parent
b1216055db
commit
d1429cd936
|
@ -230,8 +230,8 @@
|
||||||
{
|
{
|
||||||
EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY);
|
EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY);
|
||||||
EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END);
|
EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END);
|
||||||
EnforcePrecondition(false, delta >= INT32_MIN);
|
EnforcePrecondition(false, (int64)delta >= INT32_MIN);
|
||||||
EnforcePrecondition(false, delta <= INT32_MAX);
|
EnforcePrecondition(false, (int64)delta <= INT32_MAX);
|
||||||
|
|
||||||
company = ResolveCompanyID(company);
|
company = ResolveCompanyID(company);
|
||||||
EnforcePrecondition(false, company != COMPANY_INVALID);
|
EnforcePrecondition(false, company != COMPANY_INVALID);
|
||||||
|
|
|
@ -290,7 +290,7 @@ struct GameOptionsWindow : Window {
|
||||||
list = new DropDownList();
|
list = new DropDownList();
|
||||||
*selected_index = ZOOM_LVL_OUT_4X - _gui_zoom;
|
*selected_index = ZOOM_LVL_OUT_4X - _gui_zoom;
|
||||||
const StringID *items = _gui_zoom_dropdown;
|
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);
|
*list->Append() = new DropDownListStringItem(*items, i, _settings_client.gui.zoom_min > ZOOM_LVL_OUT_4X - i);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue