(svn r16635) -Fix: a couple of MSVC 64 bits warnings

This commit is contained in:
rubidium 2009-06-23 20:29:59 +00:00
parent 22cf8d8480
commit bfe20321e7

View File

@ -440,7 +440,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, (size_t)p); break; Write_ValidateSetting(ptr, sd, (int32)(size_t)p); break;
case SDT_STRING: case SDT_STRING:
switch (GetVarMemType(sld->conv)) { switch (GetVarMemType(sld->conv)) {
@ -1520,7 +1520,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, (size_t)sd->desc.def); Write_ValidateSetting(var, sd, (int32)(size_t)sd->desc.def);
} }
} }