aboutsummaryrefslogtreecommitdiffstats
path: root/code/sdl
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-08-08 21:35:33 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-08-08 21:35:33 +0000
commit29ed69737c5b5719649d1988217f6bbeb565de1a (patch)
tree69b785b5175748159803f01f9c0719d751edcefe /code/sdl
parentd4a09221a37805a2530a41b62f0a283f5ff7f654 (diff)
downloadioquake3-aero-29ed69737c5b5719649d1988217f6bbeb565de1a.tar.gz
ioquake3-aero-29ed69737c5b5719649d1988217f6bbeb565de1a.zip
* Add Sys_GLimpInit for platform specific GLimp initialisation
* Move Unix specific signal handlers to Sys_PlatformInit * (Windows only) Don't set the SDL video driver if SDL_VIDEODRIVER is already set externally * (Windows only) Use the "windib" SDL video driver if in_mouse is set to -1 git-svn-id: svn://svn.icculus.org/quake3/trunk@1440 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/sdl')
-rw-r--r--code/sdl/sdl_glimp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index cbe704a..3135ebb 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -416,7 +416,8 @@ static qboolean GLimp_StartDriverAndSetMode( int mode, qboolean fullscreen )
if (SDL_Init(SDL_INIT_VIDEO) == -1)
{
- ri.Printf( PRINT_ALL, "SDL_Init FAILED (%s)\n", SDL_GetError());
+ ri.Printf( PRINT_ALL, "SDL_Init( SDL_INIT_VIDEO ) FAILED (%s)\n",
+ SDL_GetError());
return qfalse;
}
@@ -642,6 +643,8 @@ void GLimp_Init( void )
r_allowSoftwareGL = ri.Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH );
+ Sys_GLimpInit( );
+
// create the window and set up the context
if( !GLimp_StartDriverAndSetMode( r_mode->integer, r_fullscreen->integer ) )
{
@@ -679,8 +682,6 @@ void GLimp_Init( void )
// This depends on SDL_INIT_VIDEO, hence having it here
IN_Init( );
-
- return;
}