diff --git a/engine/client/ref_common.c b/engine/client/ref_common.c index fbe73e2d..e87152ba 100644 --- a/engine/client/ref_common.c +++ b/engine/client/ref_common.c @@ -6,7 +6,13 @@ #include "vid_common.h" struct ref_state_s ref; -ref_globals_t refState; + +ref_globals_t refState = +{ + // just have something valid until video subsystem is finished initializing + .width = 640, + .height = 480, +}; static const char* r_skyBoxSuffix[SKYBOX_MAX_SIDES] = { "rt", "bk", "lf", "ft", "up", "dn" }; diff --git a/engine/client/vid_common.c b/engine/client/vid_common.c index b94f88f3..16baf012 100644 --- a/engine/client/vid_common.c +++ b/engine/client/vid_common.c @@ -34,19 +34,6 @@ CVAR_DEFINE( window_ypos, "_window_ypos", "-1", FCVAR_RENDERINFO, "window positi glwstate_t glw_state; -/* -================= -VID_InitDefaultResolution -================= -*/ -void VID_InitDefaultResolution( void ) -{ - // we need to have something valid here - // until video subsystem initialized - refState.width = 640; - refState.height = 480; -} - /* ================= R_SaveVideoMode diff --git a/engine/common/common.h b/engine/common/common.h index 02c72621..964ea93b 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -824,7 +824,6 @@ uint LZSS_GetActualSize( const byte *source, size_t input_len ); byte *LZSS_Compress( byte *pInput, int inputLength, uint *pOutputSize ); uint LZSS_Decompress( const byte *pInput, byte *pOutput, size_t input_len, size_t output_len ); void GL_FreeImage( const char *name ); -void VID_InitDefaultResolution( void ); void VID_Init( void ); void UI_SetActiveMenu( qboolean fActive ); void UI_ShowConnectionWarning( void ); diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c index b3d894a6..4f982620 100644 --- a/engine/common/dedicated.c +++ b/engine/common/dedicated.c @@ -88,11 +88,6 @@ void Host_InputFrame( void ) { } -void VID_InitDefaultResolution( void ) -{ - -} - void Con_Init( void ) { diff --git a/engine/common/host.c b/engine/common/host.c index f778cccc..bf6cdf0e 100644 --- a/engine/common/host.c +++ b/engine/common/host.c @@ -1074,9 +1074,6 @@ static void Host_InitCommon( int argc, char **argv, const char *progname, qboole // NOTE: this message couldn't be passed into game console but it doesn't matter // Con_Reportf( "Sys_LoadLibrary: Loading xash.dll - ok\n" ); - // get default screen res - VID_InitDefaultResolution(); - // init host state machine COM_InitHostState();