client: small cleanup

Author: Velaron

cl_dll/hud/scoreboard.cpp

@@ -321,24 +321,13 @@ int CHudScoreboard :: DrawTeams( float list_slot )
 		sprintf( numPlayers, "%d", team_info->players );
 
 		char fmtString[32];
-		strncpy( fmtString, Localize( team_info->players == 1 ? "#Cstrike_ScoreBoard_Player" : "#Cstrike_ScoreBoard_Players" ), sizeof( fmtString ) );
+		const char *fmtStringName = team_info->players == 1 ? "#Cstrike_ScoreBoard_Player" : "#Cstrike_ScoreBoard_Players";
+		strncpy( fmtString, Localize( fmtStringName ), sizeof( fmtString ) );
 
-		if ( !strcmp( fmtString, team_info->players == 1 ? "Cstrike_ScoreBoard_Player" : "Cstrike_ScoreBoard_Players" ) )
+		if ( !strcmp( fmtString, fmtStringName ) )
 			strncpy( fmtString, team_info->players == 1 ? "%s    -   %s player" : "%s    -   %s players", sizeof( fmtString ) );
 		else
-			for ( size_t i = 0; i < strlen( fmtString ) - 2; i++ )
-			{
-				if ( fmtString[i] == '%' && fmtString[i + 1] == 's' && isdigit( fmtString[i + 2] ) )
-				{
-					char *first = &fmtString[i + 2];
-					char *second = &fmtString[i + 3];
-
-					size_t len = strlen( second );
-
-					memmove( first, second, strlen( second ) );
-					first[len] = '\0';
-				}
-			}
+			Localize_StripIndices( fmtString );
 
 		GetTeamColor( r, g, b, team_info->teamnumber );
 		switch ( team_info->teamnumber )

cl_dll/include/vgui_parser.h

@@ -37,4 +37,6 @@ void Localize_Free( );
 
 const char* Localize( const char* string );
 void StripEndNewlineFromString( char *str );
+
+void Localize_StripIndices( char *s );
 #endif

cl_dll/text_message.cpp

@@ -206,23 +206,7 @@ int CHudTextMessage::MsgFunc_TextMsg( const char *pszName, int iSize, void *pbuf
 
 	// Remove numbers after %s.
 	// VALVEWHY?
-	if( strlen(msg_text) >= 3 )
-	{
-		for( size_t i = 0; i < strlen(msg_text) - 2; i++)
-		{
-			if( msg_text[i] == '%' && msg_text[i + 1] == 's' && isdigit(msg_text[i + 2]))
-			{
-				char *first = &msg_text[i + 2];
-				char *second = &msg_text[i + 3];
-
-				size_t len = strlen( second );
-
-				memmove( first, second, strlen( second ));
-				first[len] = '\0'; // one character has been removed and string moved, set null terminator
-			}
-		}
-	}
-
+	Localize_StripIndices( msg_text );
 
 	switch ( msg_dest )
 	{

cl_dll/vgui_parser.cpp

@@ -63,12 +63,13 @@ const char *Localize( const char *szStr )
 {
 	if( szStr )
 	{
-		if( *szStr == '#' )
-			szStr++;
-
 		char *str = strdup( szStr );
+		
 		StripEndNewlineFromString( str );
 
+		if( *str == '#' )
+			str++;
+
 		int i = hashed_cmds.Find( str );
 
 		free( str );
@@ -277,3 +278,23 @@ void Localize_Free( void )
 
 	hashed_cmds.Purge();
 }
+
+void Localize_StripIndices( char *s )
+{
+	if ( strlen( s ) >= 3 )
+	{
+		for ( size_t i = 0; i < strlen( s ) - 2; i++ )
+		{
+			if ( s[i] == '%' && s[i + 1] == 's' && isdigit( s[i + 2] ) )
+			{
+				char *first = &s[i + 2];
+				char *second = &s[i + 3];
+
+				size_t len = strlen( second );
+
+				memmove( first, second, strlen( second ) );
+				first[len] = '\0'; // one character has been removed and string moved, set null terminator
+			}
+		}
+	}
+}

game_shared/voice_status_hud.cpp

@@ -83,7 +83,7 @@ void CVoiceLabel::SetLocation( const char *location )
 	// const wchar_t *newLocation = vgui::localize()->Find( location );
 	const char *newLocation = Localize( location );
 
-	if ( strcmp( newLocation, location + 1 ) != 0 )
+	if ( strcmp( newLocation, location ) != 0 )
 	{
 		// localized version
 		if ( m_locationString && strcmp( newLocation, m_locationString ) )
@@ -161,7 +161,7 @@ void CVoiceLabel::RebuildLabelText()
 		{
 			// formatStr = localize()->Find( "#Voice_Location" );
 			formatStr = Localize( "#Voice_Location" );
-			if ( !strcmp( formatStr, "Voice_Location") )
+			if ( !strcmp( formatStr, "#Voice_Location") )
 				formatStr = "%ls/%ls   ";
 		}
 		// _snwprintf( buf, BufLen, formatStr, wsPlayer, m_locationString );