X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=50513fe6e24bddb6881005882cd0adfe3740b0f5;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=42dbd46a83736164bb5aa0b805796b18ad8bc10f;hpb=656d8440b1ca6afe0b55650fba3b8ca4b01c9511;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index 42dbd46a..50513fe6 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -307,12 +307,6 @@ void VID_Init (void)
 	if (SDL_Init(SDL_INIT_VIDEO) < 0)
 		Sys_Error ("Failed to init video: %s\n", SDL_GetError());
 	vid_isfullscreen = false;
-
-	SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
-	// init keyboard
-	SDL_EnableUNICODE( SDL_ENABLE );
-	// enable key repeat since everyone expects it
-	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 }
 
 // set the icon (we dont use SDL here since it would be too much a PITA)
@@ -365,9 +359,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 		We cant switch from one OpenGL video mode to another.
 		Thus we first switch to some stupid 2D mode and then back to OpenGL.
 	*/
-#ifndef MACOSX
 	SDL_SetVideoMode( 0, 0, 0, 0 );
-#endif
 
 	// SDL usually knows best
 	drivername = NULL;
@@ -382,17 +374,15 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 		return false;
 	}
 
-	qglGetString = GL_GetProcAddress("glGetString");
-
-	// Knghtbrd: should do platform-specific extension string function here
-
-	if (qglGetString == NULL)
+	if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
 	{
 		VID_Shutdown();
 		Con_Print("Required OpenGL function glGetString not found\n");
 		return false;
 	}
 
+	// Knghtbrd: should do platform-specific extension string function here
+
 	vid_isfullscreen = false;
 	if (fullscreen) {
 		flags |= SDL_FULLSCREEN;
@@ -424,12 +414,20 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 		VID_Shutdown();
 		return false;
 	}
+
+	// set window title
 	VID_SetCaption();
+	// set up an event filter to ask confirmation on close button in WIN32
+	SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
+	// init keyboard
+	SDL_EnableUNICODE( SDL_ENABLE );
+	// enable key repeat since everyone expects it
+	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
-	gl_renderer = qglGetString(GL_RENDERER);
-	gl_vendor = qglGetString(GL_VENDOR);
-	gl_version = qglGetString(GL_VERSION);
-	gl_extensions = qglGetString(GL_EXTENSIONS);
+	gl_renderer = (const char *)qglGetString(GL_RENDERER);
+	gl_vendor = (const char *)qglGetString(GL_VENDOR);
+	gl_version = (const char *)qglGetString(GL_VERSION);
+	gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
 	gl_platform = "SDL";
 	// Knghtbrd: should assign platform-specific extensions here
 	//TODO: maybe ;)
@@ -460,13 +458,6 @@ int VID_GetGamma (unsigned short *ramps)
 	return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512);
 }
 
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
-{
-	*x = *y = 0;
-	*width = screen->w;
-	*height = screen->h;
-}
-
 void VID_Finish (void)
 {
 	Uint8 appstate;