gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16447) -Fix [FS#2922] (r16444): compiling on x86-64 failed

Browse Source
This commit is contained in:
yexo 2009-05-27 00:46:17 +00:00
parent 5991c5195c
commit b16c9ae6ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings.cpp
View File

@ -439,7 +439,7 @@ static void ini_load_settings(IniFile *ini, const SettingDesc *sd, const char *g
case SDT_NUMX: case SDT_NUMX:
case SDT_ONEOFMANY: case SDT_ONEOFMANY:
case SDT_MANYOFMANY: case SDT_MANYOFMANY:
Write_ValidateSetting(ptr, sd, (unsigned long)p); break; Write_ValidateSetting(ptr, sd, (size_t)p); break;
case SDT_STRING: case SDT_STRING:
switch (GetVarMemType(sld->conv)) { switch (GetVarMemType(sld->conv)) {
@ -1516,7 +1516,7 @@ void SetDefaultCompanySettings(CompanyID cid)
const SettingDesc *sd; const SettingDesc *sd;
for (sd = _company_settings; sd->save.cmd != SL_END; sd++) { for (sd = _company_settings; sd->save.cmd != SL_END; sd++) {
void *var = GetVariableAddress(&c->settings, &sd->save); void *var = GetVariableAddress(&c->settings, &sd->save);
Write_ValidateSetting(var, sd, (int32)sd->desc.def); Write_ValidateSetting(var, sd, (size_t)sd->desc.def);
} }
} }