Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r246) -Fix: 64bit machine warnings for sdl.c (Tron)

Browse Source
This commit is contained in:
darkvater 2004-09-14 15:25:28 +00:00
parent 4757c0bf8c
commit 586fdf7254
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdl.c
View File

@ -234,14 +234,15 @@ static void GetVideoModes(void) {
modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0)); modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0));
_all_modes = (int)modes == -1; if(modes == NULL)
if(!modes) {
error("sdl: no modes available"); error("sdl: no modes available");
} else if((int) modes == -1) {
_all_modes = (modes == (void*)-1);
if (_all_modes) {
// all modes available, put some default ones here // all modes available, put some default ones here
memcpy(_resolutions, default_resolutions, sizeof(default_resolutions)); memcpy(_resolutions, default_resolutions, sizeof(default_resolutions));
_num_resolutions = sizeof(default_resolutions) / (sizeof(uint16)*2); _num_resolutions = lengthof(default_resolutions);
} else { } else {
int n = 0; int n = 0;
for(i = 0; modes[i]; i++) { for(i = 0; modes[i]; i++) {
@ -257,12 +258,12 @@ static void GetVideoModes(void) {
if (j == n) { if (j == n) {
_resolutions[n][0] = w; _resolutions[n][0] = w;
_resolutions[n][1] = h; _resolutions[n][1] = h;
if (++n == sizeof(_resolutions) / (sizeof(uint16)*2)) break; if (++n == lengthof(_resolutions)) break;
} }
} }
} }
_num_resolutions = n; _num_resolutions = n;
qsort(_resolutions, n, sizeof(uint16)*2, compare_res); qsort(_resolutions, n, sizeof(_resolutions[0]), compare_res);
} }
} }