Migrate to new gameinfo APIs

Author: a1batross

BaseMenu.cpp

@@ -1164,7 +1164,11 @@ void UI_Init( void )
 	uiStatic.lowmemory = (int)EngFuncs::GetCvarFloat( "host_lowmemorymode" );
 
 	// setup game info
-	EngFuncs::GetGameInfo( &gMenu.m_gameinfo );
+	gameinfo2_t *gi = EngFuncs::GetGameInfo();
+	if( !gi )
+		Host_Error( "pfnGetGameInfo returned NULL!\n" );
+
+	gMenu.m_gameinfo = *gi;
 
 	uiStatic.renderPicbuttonText = gMenu.m_gameinfo.flags & GFL_RENDER_PICBUTTON_TEXT;
 

BaseMenu.h

@@ -330,7 +330,7 @@ class CMenu
 {
 public:
 	// Game information
-	GAMEINFO		m_gameinfo;
+	gameinfo2_t m_gameinfo;
 };
 
 typedef struct

Primitive.h

@@ -35,12 +35,6 @@ inline bool isrange( T min, T value, T max )
 #define FBitSet( iBitVector, bit )	((iBitVector) & (bit))
 
 // engine constants
-enum
-{
-	GAME_NORMAL = 0,
-	GAME_SINGLEPLAYER_ONLY,
-	GAME_MULTIPLAYER_ONLY
-};
 
 enum
 {

Utils.cpp

@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -279,7 +279,7 @@ const char *Info_ValueForKey( const char *s, const char *key )
 }
 
 
-/* 
+/*
 ===================
 Key_GetKey
 ===================
@@ -554,6 +554,80 @@ bool UI::Names::CheckIsNameValid(const char *name)
 	return true;
 }
 
+char *Q_pretifymem( float value, int digitsafterdecimal )
+{
+	static char	output[8][32];
+	static int	current;
+	const float onekb = 1024.0f;
+	const float onemb = onekb * onekb;
+	const char *suffix;
+	char		*out = output[current];
+	char		val[32], *i, *o, *dot;
+	int		pos;
+
+	current = ( current + 1 ) & ( 8 - 1 );
+
+	// first figure out which bin to use
+	if( value > onemb )
+	{
+		value /= onemb;
+		suffix = " Mb";
+	}
+	else if( value > onekb )
+	{
+		value /= onekb;
+		suffix = " Kb";
+	}
+	else
+	{
+		suffix = " bytes";
+	}
+
+	// clamp to >= 0
+	digitsafterdecimal = Q_max( digitsafterdecimal, 0 );
+
+	// if it's basically integral, don't do any decimals
+	if( fabs( value - (int)value ) < 0.00001f )
+	{
+		snprintf( val, sizeof( val ), "%i%s", (int)value, suffix );
+	}
+	else
+	{
+		char fmt[32];
+
+		// otherwise, create a format string for the decimals
+		snprintf( fmt, sizeof( fmt ), "%%.%if%s", digitsafterdecimal, suffix );
+		snprintf( val, sizeof( val ), fmt, (double)value );
+	}
+
+	// copy from in to out
+	i = val;
+	o = out;
+
+	// search for decimal or if it was integral, find the space after the raw number
+	dot = strchr( i, '.' );
+	if( !dot ) dot = strchr( i, ' ' );
+
+	pos = dot - i;	// compute position of dot
+	pos -= 3;		// don't put a comma if it's <= 3 long
+
+	while( *i )
+	{
+		// if pos is still valid then insert a comma every third digit, except if we would be
+		// putting one in the first spot
+		if( pos >= 0 && !( pos % 3 ))
+		{
+			// never in first spot
+			if( o != out ) *o++ = ',';
+		}
+
+		pos--;		// count down comma position
+		*o++ = *i++;	// copy rest of data as normal
+	}
+	*o = 0; // terminate
+
+	return out;
+}
 
 void Com_EscapeCommand( char *newCommand, const char *oldCommand, int len )
 {

Utils.h

@@ -126,7 +126,7 @@ inline unsigned int PackAlpha( const unsigned int ulRGB, const unsigned int ulAl
 
 inline unsigned int UnpackAlpha( const unsigned int ulRGBA )
 {
-	return ((ulRGBA & 0xFF000000) >> 24);	
+	return ((ulRGBA & 0xFF000000) >> 24);
 }
 
 inline float InterpVal( const float from, const float to, const float frac )
@@ -410,4 +410,7 @@ int Con_UtfProcessChar(int in );
 int Con_UtfMoveLeft( const char *str, int pos );
 int Con_UtfMoveRight( const char *str, int pos, int length );
 
+char *Q_pretifymem( float value, int digitsafterdecimal );
+#define Q_memprint( val ) Q_pretifymem( val, 2 )
+
 #endif//UTILS_H

enginecallback_menu.h

@@ -381,14 +381,14 @@ class EngFuncs
 	}
 
 	// collect info from engine
-	static inline int	GetGameInfo( GAMEINFO *pgameinfo )
+	static inline gameinfo2_t *GetGameInfo( void )
 	{
-		return engfuncs.pfnGetGameInfo( pgameinfo );
+		return textfuncs.pfnGetGameInfo( GAMEINFO_VERSION );
 	}
 
-	static inline GAMEINFO **GetGamesList( int *numGames ) // collect info about all mods
+	static inline gameinfo2_t *GetModInfo( int i ) // collect info about all mods
 	{
-		return  engfuncs.pfnGetGamesList( numGames );
+		return textfuncs.pfnGetModInfo( GAMEINFO_VERSION, i );
 	}
 
 	static inline char **GetFilesList( const char *pattern, int *numFiles, int gamedironly ) // find in files
@@ -506,7 +506,7 @@ class EngFuncs
 	{
 		return textfuncs.pfnGetRenderers( num, sz1, s1, sz2, s2 ) != 0;
 	}
-	
+
 	static inline double DoubleTime()
 	{
 		return textfuncs.pfnDoubleTime();

menus/CustomGame.cpp

@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -46,6 +46,7 @@ struct mod_t
 	char name[32];
 	char ver[32];
 	char size[32];
+	uint64_t bytes;
 
 	int TypeCmp( const mod_t &other ) const
 	{
@@ -57,6 +58,13 @@ struct mod_t
 		return stricmp( name, other.name );
 	}
 
+	int SizeCmp( const mod_t &other ) const
+	{
+		if( bytes > other.bytes ) return 1;
+		else if( bytes < other.bytes ) return -1;
+		return 0;
+	}
+
 #define GENERATE_COMPAR_FN( method ) \
 	static int method ## Ascend( const void *a, const void *b ) \
 	{\
@@ -69,6 +77,7 @@ struct mod_t
 
 	GENERATE_COMPAR_FN( TypeCmp )
 	GENERATE_COMPAR_FN( NameCmp )
+	GENERATE_COMPAR_FN( SizeCmp )
 #undef GENERATE_COMPAR_FN
 };
 
@@ -160,35 +169,40 @@ CMenuModListModel::Update
 */
 void CMenuModListModel::Update( void )
 {
-	int	numGames, i;
-	GAMEINFO	**games;
+	int i;
 
-	games = EngFuncs::GetGamesList( &numGames );
-
-	for( i = 0; i < numGames; i++ )
+	for( i = 0; ; i++ )
 	{
-		Q_strncpy( mods[i].dir, games[i]->gamefolder, sizeof( mods[i].dir ));
-		Q_strncpy( mods[i].webSite, games[i]->game_url, sizeof( mods[i].webSite ));
-		Q_strncpy( mods[i].type, games[i]->type, sizeof( mods[i].type ));
-		Q_strncpy( mods[i].ver, games[i]->version, sizeof( mods[i].ver ));
+		gameinfo2_t *gi = EngFuncs::GetModInfo( i );
 
-		if( ColorStrlen( games[i]->title ) > sizeof( mods[i].name ) - 1 ) // NAME_LENGTH
+		if( !gi )
+			break;
+
+		Q_strncpy( mods[i].dir, gi->gamefolder, sizeof( mods[i].dir ));
+		Q_strncpy( mods[i].webSite, gi->game_url, sizeof( mods[i].webSite ));
+		Q_strncpy( mods[i].type, gi->type, sizeof( mods[i].type ));
+		Q_strncpy( mods[i].ver, gi->version, sizeof( mods[i].ver ));
+
+		if( ColorStrlen( gi->title ) > sizeof( mods[i].name ) - 1 ) // NAME_LENGTH
 		{
-			Q_strncpy( mods[i].name, games[i]->title, sizeof( mods[i].name ) - 4 );
-			// I am lazy to put strncat here :(
-			mods[i].name[28] = mods[i].name[29] = mods[i].name[30] = '.';
-			mods[i].name[31] = 0;
+			size_t s = sizeof( mods[i].name ) - 4;
+
+			Q_strncpy( mods[i].name, gi->title, s );
+
+			mods[i].name[s] = mods[i].name[s+1] = mods[i].name[s+2] = '.';
+			mods[i].name[s+3] = 0;
 		}
-		else Q_strncpy( mods[i].name, games[i]->title, sizeof( mods[i].name ));
+		else Q_strncpy( mods[i].name, gi->title, sizeof( mods[i].name ));
 
-		if( games[i]->size[0] && atoi( games[i]->size ) != 0 )
-			Q_strncpy( mods[i].size, games[i]->size, sizeof( mods[i].size ));
+		mods[i].bytes = gi->size;
+		if( gi->size > 0 )
+			Q_strncpy( mods[i].size, Q_memprint( gi->size ), sizeof( mods[i].size ));
 		else Q_strncpy( mods[i].size, "0.0 Mb", sizeof( mods[i].size ));
 	}
 
-	m_iNumItems = numGames;
+	m_iNumItems = i;
 
-	if( numGames )
+	if( i != 0 )
 	{
 		if( m_iSortingColumn != -1 )
 			Sort( m_iSortingColumn, m_bAscend );
@@ -206,20 +220,20 @@ bool CMenuModListModel::Sort(int column, bool ascend)
 	switch( column )
 	{
 		case COLUMN_TYPE:
-			qsort( mods, m_iNumItems, sizeof(mod_t),
+			qsort( mods, m_iNumItems, sizeof( mod_t ),
 				ascend ? mod_t::TypeCmpAscend : mod_t::TypeCmpDescend );
-		return true;
+			return true;
 		case COLUMN_NAME:
-			qsort( mods, m_iNumItems, sizeof(mod_t),
+			qsort( mods, m_iNumItems, sizeof( mod_t ),
 				ascend ? mod_t::NameCmpAscend : mod_t::NameCmpDescend );
-		return true;
-		case COLUMN_VER:
-		return false;
+			return true;
 		case COLUMN_SIZE:
-		return false;
+			qsort( mods, m_iNumItems, sizeof( mod_t ),
+				ascend ? mod_t::SizeCmpAscend : mod_t::SizeCmpDescend );
+			return true;
 	}
 
-    return false;
+	return false;
 }
 
 /*
@@ -260,7 +274,7 @@ void CMenuCustomGame::_Init( void )
 		if( !stricmp( modListModel.mods[i].dir, gMenu.m_gameinfo.gamefolder ) )
 		{
 			modList.SetCurrentIndex( i );
-			if( modList.onChanged ) 
+			if( modList.onChanged )
 				modList.onChanged( &modList );
 			break;
 		}