stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile errors on win32, warnings elsewhere

Browse source
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 char msg[] = "oh no! back to reality!\r\n";
char * sigmsg;
const char * sigmsg;
char sigdef[32];
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 SDL_bool wasfullscreen = SDL_FALSE;
static SDL_bool glfallbackresolution = SDL_FALSE;
Uint32 rmask;
Uint32 gmask;
Uint32 bmask;
@ -195,7 +194,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
else if (!fullscreen && wasfullscreen)
{
wasfullscreen = SDL_FALSE;
glfallbackresolution = SDL_FALSE;
SDL_SetWindowFullscreen(window, 0);
SDL_SetWindowSize(window, width, height);
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
{
event.data2 = (int)round((evt.xrel) * ((float)wwidth / (float)realwidth));
event.data3 = (int)round(-evt.yrel * ((float)wheight / (float)realheight));
event.data2 = (INT32)round((evt.xrel) * ((float)wwidth / (float)realwidth));
event.data3 = (INT32)round(-evt.yrel * ((float)wheight / (float)realheight));
}
event.type = ev_mouse;

4
src/win32/win_dll.c
View file

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