From 5e39cb54719612a886e8d93607e1a6d3ce5a9d1f Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 11 Feb 2004 04:06:27 +0000 Subject: [PATCH] remove DEFAULT_RANKING_NAME. Empty string means "no name", and the default name should always be empty. --- stepmania/src/GameConstantsAndTypes.h | 1 - stepmania/src/GameState.cpp | 3 ++- stepmania/src/ScreenNameEntry.cpp | 3 --- stepmania/src/ScreenNameEntryTraditional.cpp | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 691beb29e8..caa5a15fb5 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -254,7 +254,6 @@ enum RankingCategory }; #define FOREACH_RankingCategory( rc ) FOREACH_ENUM( RankingCategory, NUM_RANKING_CATEGORIES, rc ) -#define DEFAULT_RANKING_NAME CString("") const CString RANKING_TO_FILL_IN_MARKER[NUM_PLAYERS] = {"#P1#","#P2#"}; inline bool IsRankingToFillIn( CString sName ) { return !sName.empty() && sName[0]=='#'; } diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 83b2cc6118..17bc14b13f 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1324,8 +1324,9 @@ void GameState::StoreRankingName( PlayerNumber pn, CString name ) line.MakeUpper(); if( !line.empty() && name.Find(line) != -1 ) // name contains a bad word { - LOG->Trace( "name '%s' contains bad word and will be blanked", name.c_str() ); + LOG->Trace( "entered '%s' matches blacklisted item '%s'", name.c_str(), line.c_str() ); name = ""; + break; } } } diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index 3cc6f713b5..ce60034883 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -422,9 +422,6 @@ void ScreenNameEntry::MenuStart( PlayerNumber pn ) TrimRight( m_sSelectedName[pn], " " ); TrimLeft( m_sSelectedName[pn], " " ); - if( m_sSelectedName[pn] == "" ) - m_sSelectedName[pn] = DEFAULT_RANKING_NAME; - GAMESTATE->StoreRankingName( pn, m_sSelectedName[pn] ); // save last used ranking name diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 61bb4b1705..0c769aafe4 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -415,9 +415,6 @@ void ScreenNameEntryTraditional::Finish( PlayerNumber pn ) TrimRight( selection, " " ); TrimLeft( selection, " " ); - if( selection == "" ) - selection = DEFAULT_RANKING_NAME; - GAMESTATE->StoreRankingName( pn, selection ); // save last used ranking name