summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-05-27 00:46:17 +0000
committeryexo <yexo@openttd.org>2009-05-27 00:46:17 +0000
commitb16c9ae6ef4c9760f898af740c9282456d52de79 (patch)
tree8e0fe7de99780b7849ca429db108d05f162d811e
parent5991c5195ca4140bcaa4e5683a148038d8cf926d (diff)
downloadopenttd-b16c9ae6ef4c9760f898af740c9282456d52de79.tar.xz
(svn r16447) -Fix [FS#2922] (r16444): compiling on x86-64 failed
-rw-r--r--src/settings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index af99588e7..c842ff5fa 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -439,7 +439,7 @@ static void ini_load_settings(IniFile *ini, const SettingDesc *sd, const char *g
case SDT_NUMX:
case SDT_ONEOFMANY:
case SDT_MANYOFMANY:
- Write_ValidateSetting(ptr, sd, (unsigned long)p); break;
+ Write_ValidateSetting(ptr, sd, (size_t)p); break;
case SDT_STRING:
switch (GetVarMemType(sld->conv)) {
@@ -1516,7 +1516,7 @@ void SetDefaultCompanySettings(CompanyID cid)
const SettingDesc *sd;
for (sd = _company_settings; sd->save.cmd != SL_END; sd++) {
void *var = GetVariableAddress(&c->settings, &sd->save);
- Write_ValidateSetting(var, sd, (int32)sd->desc.def);
+ Write_ValidateSetting(var, sd, (size_t)sd->desc.def);
}
}