vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile errors on win32, warnings elsewhere

This commit is contained in:
Ronald Kinard 2014-11-13 22:58:08 -06:00
parent 2feda0b560
commit 3eafca0dc1
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sdl/i_system.c
View File

@ -304,7 +304,7 @@ UINT8 keyboard_started = false;
static void signal_handler(INT32 num) static void signal_handler(INT32 num)
{ {
//static char msg[] = "oh no! back to reality!\r\n"; //static char msg[] = "oh no! back to reality!\r\n";
char * sigmsg; const char * sigmsg;
char sigdef[32]; char sigdef[32];
D_QuitNetGame(); // Fix server freezes D_QuitNetGame(); // Fix server freezes

6
src/sdl/i_video.c
View File

@ -174,7 +174,6 @@ static void Impl_SetWindowIcon(void);
static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
{ {
static SDL_bool wasfullscreen = SDL_FALSE; static SDL_bool wasfullscreen = SDL_FALSE;
static SDL_bool glfallbackresolution = SDL_FALSE;
Uint32 rmask; Uint32 rmask;
Uint32 gmask; Uint32 gmask;
Uint32 bmask; Uint32 bmask;
@ -195,7 +194,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
else if (!fullscreen && wasfullscreen) else if (!fullscreen && wasfullscreen)
{ {
wasfullscreen = SDL_FALSE; wasfullscreen = SDL_FALSE;
glfallbackresolution = SDL_FALSE;
SDL_SetWindowFullscreen(window, 0); SDL_SetWindowFullscreen(window, 0);
SDL_SetWindowSize(window, width, height); SDL_SetWindowSize(window, width, height);
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(1), SDL_WINDOWPOS_CENTERED_DISPLAY(1)); SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(1), SDL_WINDOWPOS_CENTERED_DISPLAY(1));
@ -743,8 +741,8 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
} }
else else
{ {
event.data2 = (int)round((evt.xrel) * ((float)wwidth / (float)realwidth)); event.data2 = (INT32)round((evt.xrel) * ((float)wwidth / (float)realwidth));
event.data3 = (int)round(-evt.yrel * ((float)wheight / (float)realheight)); event.data3 = (INT32)round(-evt.yrel * ((float)wheight / (float)realheight));
} }
event.type = ev_mouse; event.type = ev_mouse;

4
src/win32/win_dll.c
View File

@ -123,7 +123,7 @@ static loadfunc_t hwdFuncTable[] = {
{"DrawIntermissionBG@0",&hwdriver.pfnDrawIntermissionBG}, {"DrawIntermissionBG@0",&hwdriver.pfnDrawIntermissionBG},
{"MakeScreenTexture@0", &hwdriver.pfnMakeScreenTexture}, {"MakeScreenTexture@0", &hwdriver.pfnMakeScreenTexture},
{"MakeScreenFinalTexture@0", &hwdriver.pfnMakeScreenFinalTexture}, {"MakeScreenFinalTexture@0", &hwdriver.pfnMakeScreenFinalTexture},
{"DrawScreenFinalTexture@8", &hwdriver.pfnDrawScreenFinalTexture} {"DrawScreenFinalTexture@8", &hwdriver.pfnDrawScreenFinalTexture},
#else #else
{"Init", &hwdriver.pfnInit}, {"Init", &hwdriver.pfnInit},
{"Shutdown", &hwdriver.pfnShutdown}, {"Shutdown", &hwdriver.pfnShutdown},
@ -153,7 +153,7 @@ static loadfunc_t hwdFuncTable[] = {
{"DrawIntermissionBG", &hwdriver.pfnDrawIntermissionBG}, {"DrawIntermissionBG", &hwdriver.pfnDrawIntermissionBG},
{"MakeScreenTexture", &hwdriver.pfnMakeScreenTexture}, {"MakeScreenTexture", &hwdriver.pfnMakeScreenTexture},
{"MakeScreenFinalTexture", &hwdriver.pfnMakeScreenFinalTexture}, {"MakeScreenFinalTexture", &hwdriver.pfnMakeScreenFinalTexture},
{"DrawScreenFinalTexture", &hwdriver.pfnDrawScreenFinalTexture} {"DrawScreenFinalTexture", &hwdriver.pfnDrawScreenFinalTexture},
#endif #endif
{NULL,NULL} {NULL,NULL}
}; };