Remove IsXashFWGS checks, we do not support original engine anymore, since it's development has stopped

Author: a1batross

BaseMenu.cpp

@@ -84,11 +84,6 @@ const unsigned int g_iColorTable[8] =
 0xFFFFFFFF, // white
 };
 
-bool UI_IsXashFWGS( void )
-{
-	return g_bIsForkedEngine;
-}
-
 CMenuEntry::CMenuEntry(const char *cmd, void (*pfnPrecache)(), void (*pfnShow)(), void (*pfnShutdown)() ) :
 	m_szCommand( cmd ),
 	m_pfnPrecache( pfnPrecache ),
@@ -1066,13 +1061,10 @@ void UI_OpenUpdatePage( bool engine, bool preferstore )
 
 	if( engine || !gMenu.m_gameinfo.update_url[0] )
 	{
-		if( UI_IsXashFWGS() )
-		{
-			if( preferstore )
-				updateUrl = PLATFORM_UPDATE_PAGE;
-			else
-				updateUrl = GENERIC_UPDATE_PAGE;
-		}
+		if( preferstore )
+			updateUrl = PLATFORM_UPDATE_PAGE;
+		else
+			updateUrl = GENERIC_UPDATE_PAGE;
 	}
 	else
 	{

BaseMenu.h

@@ -134,7 +134,6 @@ typedef struct
 
 extern float	cursorDY;			// use for touch scroll
 extern bool g_bCursorDown;
-extern bool g_bIsForkedEngine;
 extern uiStatic_t		uiStatic;
 
 #define DLG_X ((uiStatic.width - 640) / 2 - 192) // Dialogs are 640px in width
@@ -163,8 +162,6 @@ extern unsigned int	uiColorBlack;
 
 // TODO: Move it under namespace?
 
-bool UI_IsXashFWGS( void );
-
 void UI_ScaleCoords( int *x, int *y, int *w, int *h );
 void UI_ScaleCoords( int &x, int &y, int &w, int &h );
 void UI_ScaleCoords( int &x, int &y );
@@ -316,9 +313,6 @@ void UI_InputDevices_Menu( void );
 
 void UI_OpenUpdatePage(bool engine , bool preferstore);
 
-// time
-double Sys_DoubleTime( void );
-
 //
 //-----------------------------------------------------
 //

Utils.cpp

@@ -445,86 +445,71 @@ Converting to single-byte not necessary anymore, as UI uses custom font render w
 */
 int Con_UtfProcessChar( int in )
 {
-	if( UI_IsXashFWGS() )
+	static int m = -1, k = 0; //multibyte state
+	static int uc = 0; //unicode char
+
+	if( !in )
 	{
-		static int m = -1, k = 0; //multibyte state
-		static int uc = 0; //unicode char
+		m = -1;
+		k = 0;
+		uc = 0;
+		return 0;
+	}
 
-		if( !in )
+	// Get character length
+	if(m == -1)
+	{
+		uc = 0;
+		if( in >= 0xF8 )
 		{
-			m = -1;
-			k = 0;
-			uc = 0;
 			return 0;
 		}
-
-		// Get character length
-		if(m == -1)
+		else if( in >= 0xF0 )
 		{
-			uc = 0;
-			if( in >= 0xF8 )
-			{
-				return 0;
-			}
-			else if( in >= 0xF0 )
-			{
-				uc = in & 0x07;
-				m = 3;
-			}
-			else if( in >= 0xE0 )
-			{
-				uc = in & 0x0F;
-				m = 2;
-			}
-			else if( in >= 0xC0 )
-			{
-				uc = in & 0x1F;
-				m = 1;
-			}
-			else if( in <= 0x7F )
-			{
-				return in; // ascii
-			}
-			// return 0 if we need more chars to decode one
-			k = 0;
-			return 0;
+			uc = in & 0x07;
+			m = 3;
 		}
-		// get more chars
-		else if( k <= m )
+		else if( in >= 0xE0 )
 		{
-			uc <<= 6;
-			uc += in & 0x3F;
-			k++;
+			uc = in & 0x0F;
+			m = 2;
 		}
-		if( in > 0xBF || m < 0 )
+		else if( in >= 0xC0 )
 		{
-			m = -1;
-			return 0;
+			uc = in & 0x1F;
+			m = 1;
 		}
-		if( k == m )
+		else if( in <= 0x7F )
 		{
-			k = m = -1;
-
-			return uc;
-
-			// not implemented yet
-			// return '?';
+			return in; // ascii
 		}
+		// return 0 if we need more chars to decode one
+		k = 0;
 		return 0;
 	}
-	else
+	// get more chars
+	else if( k <= m )
 	{
-		if( in >= 0x80 && in <= 0xBF )
-		{
-			return table_cp1251[in - 0x80];
-		}
-		else if( in >= 0xC0 && in <= 0xFF )
-		{
-			return in - 0xC0 + 0x410;
-		}
+		uc <<= 6;
+		uc += in & 0x3F;
+		k++;
+	}
+	if( in > 0xBF || m < 0 )
+	{
+		m = -1;
+		return 0;
+	}
+
+	if( k == m )
+	{
+		k = m = -1;
 
-		return in;
+		return uc;
+
+		// not implemented yet
+		// return '?';
 	}
+	return 0;
 }
 
 /*
@@ -637,42 +622,3 @@ void Com_EscapeCommand( char *newCommand, const char *oldCommand, int len )
 
 	*newCommand++ = 0;
 }
-
-/*
-================
-Sys_DoubleTime
-================
-*/
-double Sys_DoubleTime( void )
-{
-	if( UI_IsXashFWGS())
-	{
-		return EngFuncs::DoubleTime();
-	}
-
-#if defined _WIN32
-	static LARGE_INTEGER g_PerformanceFrequency;
-	static LARGE_INTEGER g_ClockStart;
-	LARGE_INTEGER CurrentTime;
-
-	if( !g_PerformanceFrequency.QuadPart )
-	{
-		QueryPerformanceFrequency( &g_PerformanceFrequency );
-		QueryPerformanceCounter( &g_ClockStart );
-	}
-
-	QueryPerformanceCounter( &CurrentTime );
-	return (double)( CurrentTime.QuadPart - g_ClockStart.QuadPart ) / (double)( g_PerformanceFrequency.QuadPart );
-#elif defined __DOS__
-	// fallback when no time api
-	return gpGlobals->time + 0.01;
-#elif defined __APPLE__
-	struct timeval tv;
-	gettimeofday(&tv, NULL);
-	return (double) tv.tv_sec + (double) tv.tv_usec/1000000.0;
-#else
-	struct timespec ts;
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return (double) ts.tv_sec + (double) ts.tv_nsec/1000000000.0;
-#endif
-}

font/FontManager.cpp

@@ -498,7 +498,7 @@ HFont CFontBuilder::Create()
 	font = new CBitmapFont();
 #endif
 
-	double starttime = Sys_DoubleTime();
+	double starttime = EngFuncs::DoubleTime();
 
 	if( !font->Create( m_szName, m_iTall, m_iWeight, m_iBlur, m_fBrighten, m_iOutlineSize, m_iScanlineOffset, m_fScanlineScale, m_iFlags ) )
 	{
@@ -517,7 +517,7 @@ HFont CFontBuilder::Create()
 
 	g_FontMgr->UploadTextureForFont( font );
 
-	double endtime = Sys_DoubleTime();
+	double endtime = EngFuncs::DoubleTime();
 
 	Con_DPrintf( "Rendering %s(%i, %i) took %f seconds\n", font->GetName(), m_iTall, m_iWeight, endtime - starttime );
 

menus/Configuration.cpp

@@ -62,13 +62,10 @@ void CMenuOptions::_Init( void )
 		PC_AUDIO, UI_Audio_Menu, QMF_NOTIFY );
 	AddButton( L( "GameUI_Video" ), L( "Change screen size, video mode and gamma" ),
 		PC_VIDEO, UI_Video_Menu, QMF_NOTIFY );
-	if( UI_IsXashFWGS() )
-	{
-		AddButton( L( "Touch" ), L( "Change touch settings and buttons" ),
-			PC_TOUCH, UI_Touch_Menu, QMF_NOTIFY );
-		AddButton( L( "GameUI_Joystick" ), L( "Change gamepad axis and button settings" ),
-			PC_GAMEPAD, UI_GamePad_Menu, QMF_NOTIFY );
-	}
+	AddButton( L( "Touch" ), L( "Change touch settings and buttons" ),
+		PC_TOUCH, UI_Touch_Menu, QMF_NOTIFY );
+	AddButton( L( "GameUI_Joystick" ), L( "Change gamepad axis and button settings" ),
+		PC_GAMEPAD, UI_GamePad_Menu, QMF_NOTIFY );
 	AddButton( L( "Update" ), L( "Check for updates" ),
 		PC_UPDATE, msgBox.MakeOpenEvent(), QMF_NOTIFY );
 	AddButton( L( "Done" ), L( "Go back to the Main menu" ),

menus/ServerBrowser.cpp

@@ -186,7 +186,7 @@ class CMenuServerBrowser: public CMenuFramework
 	void JoinGame( void );
 	void ResetPing( void )
 	{
-		gameListModel.serversRefreshTime = Sys_DoubleTime();
+		gameListModel.serversRefreshTime = EngFuncs::DoubleTime();
 	}
 
 	void AddServerToList( netadr_t adr, const char *info );
@@ -339,7 +339,7 @@ void CMenuGameListModel::AddServerToList(netadr_t adr, const char *info)
 	server_t server;
 
 	server.adr = adr;
-	server.ping = Sys_DoubleTime() - serversRefreshTime;
+	server.ping = EngFuncs::DoubleTime() - serversRefreshTime;
 	server.ping = bound( 0, server.ping, 9.999f );
 	Q_strncpy( server.info, info, sizeof( server.info ));
 

menus/VideoModes.cpp

@@ -191,14 +191,7 @@ void CMenuVidModes::SetMode( int mode )
 	// vid_setmode is a new command, which does not depends on 
 	// static resolution list but instead uses dynamic resolution
 	// list provided by video backend
-	if( UI_IsXashFWGS( ) )
-	{
-		snprintf( cmd, sizeof( cmd ), "vid_setmode %i\n", mode );
-	}
-	else
-	{
-		snprintf( cmd, sizeof( cmd ), "vid_mode %i\n", mode );
-	}
+	snprintf( cmd, sizeof( cmd ), "vid_setmode %i\n", mode );
 
 	EngFuncs::ClientCmd( TRUE, cmd );
 }
@@ -270,14 +263,7 @@ void CMenuVidModes::RevertChanges()
 		fullscreenChanged = true;
 	}
 
-	if( UI_IsXashFWGS( ) )
-	{
-		SetMode( prevModeX, prevModeY );
-	}
-	else
-	{
-		SetMode( prevMode );
-	}
+	SetMode( prevModeX, prevModeY );
 
 	// otherwise, we better to set window size at first, then switch TO fullscreen
 	if( !fullscreenChanged )

menus/VideoOptions.cpp

@@ -197,11 +197,8 @@ void CMenuVidOptions::_Init( void )
 	AddItem( screenSize );
 	AddItem( gammaIntensity );
 	AddItem( glareReduction );
-	if( UI_IsXashFWGS() )
-	{
-		AddItem( bump );
-		AddItem( vbo );
-	}
+	AddItem( bump );
+	AddItem( vbo );
 	AddItem( fastSky );
 	AddItem( testImage );
 	screenSize.LinkCvar( "viewsize" );

udll_int.cpp

@@ -22,7 +22,6 @@ ui_enginefuncs_t EngFuncs::engfuncs;
 ui_extendedfuncs_t EngFuncs::textfuncs;
 ui_globalvars_t	*gpGlobals;
 CMenu gMenu;
-bool g_bIsForkedEngine;
 
 static UI_FUNCTIONS gFunctionTable = 
 {
@@ -61,11 +60,6 @@ extern "C" EXPORT int GetMenuAPI(UI_FUNCTIONS *pFunctionTable, ui_enginefuncs_t*
 
 	gpGlobals = pGlobals;
 
-	// can be hijacked, but please, don't do it
-	const char *version = EngFuncs::GetCvarString( "host_ver" );
-
-	g_bIsForkedEngine = version && version[0];
-
 	return TRUE;
 }