X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=a00029bfc6658c8988b5903c49eb1a51a6194750;hb=63993d928ff59adb9ceaef3f0287422dd571f852;hp=a76fd37e9132ca4e7f3fdcfc4e61570b7bbcfbaf;hpb=75e62b875311c24a5ff0ad5584221140b8a5e528;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index a76fd37e..a00029bf 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -342,14 +342,14 @@ static int Sys_EventFilter( SDL_Event *event )
 
 #ifdef SDL_R_RESTART
 static qboolean sdl_needs_restart;
-static void sdl_start()
+static void sdl_start(void)
 {
 }
-static void sdl_shutdown()
+static void sdl_shutdown(void)
 {
 	sdl_needs_restart = false;
 }
-static void sdl_newmap()
+static void sdl_newmap(void)
 {
 }
 #endif
@@ -388,7 +388,7 @@ void Sys_SendKeyEvents( void )
 				break;
 			case SDL_KEYDOWN:
 			case SDL_KEYUP:
-				Key_Event( MapKey( event.key.keysym.sym ), (char)event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
+				Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
 				break;
 			case SDL_ACTIVEEVENT:
 				if( event.active.state & SDL_APPACTIVE )
@@ -431,7 +431,7 @@ void Sys_SendKeyEvents( void )
 		}
 
 	// enable/disable sound on focus gain/loss
-	if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer))
+	if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer)
 	{
 		if (!sound_active)
 		{
@@ -503,7 +503,7 @@ void VID_Init (void)
 #ifdef WIN32
 #include "resource.h"
 #include <SDL_syswm.h>
-static void VID_SetCaption()
+static void VID_SetCaption(void)
 {
     SDL_SysWMinfo	info;
 	HICON			icon;
@@ -530,7 +530,7 @@ static void VID_SetCaption()
 #endif
 	SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
-static void VID_SetIcon()
+static void VID_SetIcon(void)
 {
 }
 #else
@@ -538,7 +538,7 @@ static void VID_SetIcon()
 #include "darkplaces.xpm"
 #include "nexuiz.xpm"
 static SDL_Surface *icon = NULL;
-static void VID_SetIcon()
+static void VID_SetIcon(void)
 {
 	/*
 	 * Somewhat restricted XPM reader. Only supports XPMs saved by GIMP 2.4 at
@@ -640,13 +640,13 @@ static void VID_SetIcon()
 }
 
 
-static void VID_SetCaption()
+static void VID_SetCaption(void)
 {
 	SDL_WM_SetCaption( gamename, NULL );
 }
 #endif
 
-static void VID_OutputVersion()
+static void VID_OutputVersion(void)
 {
 	const SDL_version *version;
 	version = SDL_Linked_Version();
@@ -656,15 +656,15 @@ static void VID_OutputVersion()
 					version->major, version->minor, version->patch );
 }
 
-int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
+qboolean VID_InitMode(viddef_mode_t *mode)
 {
 	int i;
 	static int notfirstvideomode = false;
 	int flags = SDL_OPENGL;
 	const char *drivername;
 
-	win_half_width = *width>>1;
-	win_half_height = *height>>1;
+	win_half_width = mode->width>>1;
+	win_half_height = mode->height>>1;
 
 	if(vid_resizable.integer)
 		flags |= SDL_RESIZABLE;
@@ -703,14 +703,14 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
 	// Knghtbrd: should do platform-specific extension string function here
 
 	vid_isfullscreen = false;
-	if (fullscreen) {
+	if (mode->fullscreen) {
 		flags |= SDL_FULLSCREEN;
 		vid_isfullscreen = true;
 	}
 	//flags |= SDL_HWSURFACE;
 
 	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
-	if (bpp >= 32)
+	if (mode->bitsperpixel >= 32)
 	{
 		SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8);
 		SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8);
@@ -726,26 +726,26 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
 		SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
 		SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
 	}
-	if (stereobuffer)
+	if (mode->stereobuffer)
 		SDL_GL_SetAttribute (SDL_GL_STEREO, 1);
 	if (vid_vsync.integer)
 		SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
 	else
 		SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 0);
-	if (samples > 1)
+	if (mode->samples > 1)
 	{
 		SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
-		SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, samples);
+		SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, mode->samples);
 	}
 
-	video_bpp = bpp;
+	video_bpp = mode->bitsperpixel;
 	video_flags = flags;
 	VID_SetIcon();
-	screen = SDL_SetVideoMode(*width, *height, bpp, flags);
+	screen = SDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, flags);
 
 	if (screen == NULL)
 	{
-		Con_Printf("Failed to set video mode to %ix%i: %s\n", *width, *height, SDL_GetError());
+		Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError());
 		VID_Shutdown();
 		return false;
 	}
@@ -761,7 +761,6 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
 
 	gl_platform = "SDL";
 	gl_platformextensions = "";
-	gl_videosyncavailable = true;
 
 	GL_Init();
 
@@ -830,7 +829,7 @@ void VID_Finish (void)
 
 	VID_UpdateGamma(false, 256);
 
-	if (r_render.integer && !vid_hidden)
+	if (!vid_hidden)
 	{
 		CHECKGLERROR
 		if (r_speeds.integer == 2 || gl_finish.integer)