mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r3479) -Fix: fixed warnings on 64bit platforms (anyway, most 64bit platforms) 

(tnx to qball and DarkVater for testing)
release/0.4.5
truelight 2006-01-29 20:32:30 +00:00
parent ddfe8f608f
commit f7603ba3ac
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
settings.c
View File

@ -491,7 +491,7 @@ static void make_manyofmany(char *buf, const char *many, uint32 x)
static const void *string_to_val(const SettingDesc *desc, const char *str) static const void *string_to_val(const SettingDesc *desc, const char *str)
{ {
uint32 val; unsigned long val;
char *end; char *end;
switch(desc->flags & 0xF) { switch(desc->flags & 0xF) {
@ -500,14 +500,14 @@ static const void *string_to_val(const SettingDesc *desc, const char *str)
if (*end != 0) ShowInfoF("ini: trailing characters at end of setting '%s'", desc->name); if (*end != 0) ShowInfoF("ini: trailing characters at end of setting '%s'", desc->name);
return (void*)val; return (void*)val;
case SDT_ONEOFMANY: { case SDT_ONEOFMANY: {
int r = lookup_oneofmany((const char*)desc->b, str, -1); long r = lookup_oneofmany((const char*)desc->b, str, -1);
if (r != -1) return (void*)r; if (r != -1) return (void*)r;
ShowInfoF("ini: invalid value '%s' for '%s'", str, desc->name); ShowInfoF("ini: invalid value '%s' for '%s'", str, desc->name);
return 0; return 0;
} }
case SDT_MANYOFMANY: { case SDT_MANYOFMANY: {
uint32 r = lookup_manyofmany(desc->b, str); unsigned long r = lookup_manyofmany(desc->b, str);
if (r != (uint32)-1) return (void*)r; if (r != (unsigned long)-1) return (void*)r;
ShowInfoF("ini: invalid value '%s' for '%s'", str, desc->name); ShowInfoF("ini: invalid value '%s' for '%s'", str, desc->name);
return 0; return 0;
} }
@ -567,15 +567,15 @@ static void load_setting_desc(IniFile *ini, const SettingDesc *desc, const void
switch(desc->flags >> 4 & 7) { switch(desc->flags >> 4 & 7) {
case SDT_INT8 >> 4: case SDT_INT8 >> 4:
case SDT_UINT8 >> 4: case SDT_UINT8 >> 4:
*(byte*)ptr = (byte)(uint)p; *(byte*)ptr = (byte)(unsigned long)p;
break; break;
case SDT_INT16 >> 4: case SDT_INT16 >> 4:
case SDT_UINT16 >> 4: case SDT_UINT16 >> 4:
*(uint16*)ptr = (uint16)(uint)p; *(uint16*)ptr = (uint16)(unsigned long)p;
break; break;
case SDT_INT32 >> 4: case SDT_INT32 >> 4:
case SDT_UINT32 >> 4: case SDT_UINT32 >> 4:
*(uint32*)ptr = (uint32)p; *(uint32*)ptr = (uint32)(unsigned long)p;
break; break;
default: default:
NOT_REACHED(); NOT_REACHED();
@ -648,17 +648,17 @@ static void save_setting_desc(IniFile *ini, const SettingDesc *desc, const void
switch(desc->flags >> 4 & 7) { switch(desc->flags >> 4 & 7) {
case SDT_INT8 >> 4: case SDT_INT8 >> 4:
case SDT_UINT8 >> 4: case SDT_UINT8 >> 4:
if (*(byte*)ptr == (byte)(uint)p) if (*(byte*)ptr == (byte)(unsigned long)p)
continue; continue;
break; break;
case SDT_INT16 >> 4: case SDT_INT16 >> 4:
case SDT_UINT16 >> 4: case SDT_UINT16 >> 4:
if (*(uint16*)ptr == (uint16)(uint)p) if (*(uint16*)ptr == (uint16)(unsigned long)p)
continue; continue;
break; break;
case SDT_INT32 >> 4: case SDT_INT32 >> 4:
case SDT_UINT32 >> 4: case SDT_UINT32 >> 4:
if (*(uint32*)ptr == (uint32)p) if (*(uint32*)ptr == (uint32)(unsigned long)p)
continue; continue;
break; break;
default: default: