actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

avoid global ThemeMetric<apActorCommands>; unneeded include

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-21 20:30:36 +00:00
parent 98240c49d4
commit 348f5ab34f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenNameEntryTraditional.cpp
+12 -9
View File
@@ -21,15 +21,12 @@
#include "Foreach.h" #include "Foreach.h"
#include "Style.h" #include "Style.h"
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#include "Command.h"
#include "InputEventPlus.h" #include "InputEventPlus.h"
#include "RageInput.h" #include "RageInput.h"
// //
// Defines specific to ScreenNameEntryTraditional // Defines specific to ScreenNameEntryTraditional
// //
static const ThemeMetric<apActorCommands> ALPHABET_INIT_COMMMAND ("ScreenNameEntryTraditional","AlphabetInitCommand"); // TODO: remove hard coded name
static const ThemeMetric<apActorCommands> OK_INIT_COMMMAND ("ScreenNameEntryTraditional","OKInitCommand"); // TODO: remove hard coded name
#define COMMAND_OPTIONAL( actor, command_name ) \ #define COMMAND_OPTIONAL( actor, command_name ) \
if( !(actor).GetName().empty() ) \ if( !(actor).GetName().empty() ) \
@@ -232,47 +229,53 @@ void ScreenNameEntryTraditional::Init()
/* Add letters to m_Keyboard. */ /* Add letters to m_Keyboard. */
const RString sFontPath = THEME->GetPathF(m_sName,"letters"); const RString sFontPath = THEME->GetPathF(m_sName,"letters");
const wstring sChars = RStringToWstring(KEYBOARD_LETTERS); const wstring sChars = RStringToWstring(KEYBOARD_LETTERS);
BitmapText *pLetterTemplate = new BitmapText;
pLetterTemplate->SetName( "Letter" );
pLetterTemplate->LoadFromFont( sFontPath );
ActorUtil::LoadAllCommands( *pLetterTemplate, m_sName );
pLetterTemplate->PlayCommand( "AlphabetInit" );
for( unsigned ch = 0; ch < sChars.size(); ++ch ) for( unsigned ch = 0; ch < sChars.size(); ++ch )
{ {
BitmapText *pLetter = new BitmapText; BitmapText *pLetter = new BitmapText( *pLetterTemplate );
pLetter->SetName( ssprintf("LetterP%i",p+1) );
pLetter->LoadFromFont( sFontPath );
pLetter->SetText( ssprintf("%lc", sChars[ch]) ); pLetter->SetText( ssprintf("%lc", sChars[ch]) );
m_textAlphabet[p].push_back( pLetter ); m_textAlphabet[p].push_back( pLetter );
m_Keyboard[p].AddChild( pLetter ); m_Keyboard[p].AddChild( pLetter );
pLetter->RunCommands( ALPHABET_INIT_COMMMAND );
m_AlphabetLetter[p].push_back( sChars[ch] ); m_AlphabetLetter[p].push_back( sChars[ch] );
} }
delete pLetterTemplate;
/* Add "<-". */ /* Add "<-". */
{ {
BitmapText *pLetter = new BitmapText; BitmapText *pLetter = new BitmapText;
pLetter->SetName( ssprintf("LetterP%i",p+1) ); pLetter->SetName( ssprintf("LetterP%i",p+1) );
ActorUtil::LoadAllCommands( *pLetter, m_sName );
pLetter->LoadFromFont( sFontPath ); pLetter->LoadFromFont( sFontPath );
RString sText = "&leftarrow;"; RString sText = "&leftarrow;";
FontCharAliases::ReplaceMarkers( sText ); FontCharAliases::ReplaceMarkers( sText );
pLetter->SetText( sText ); pLetter->SetText( sText );
pLetter->PlayCommand( "OKInit" );
m_textAlphabet[p].push_back( pLetter ); m_textAlphabet[p].push_back( pLetter );
m_Keyboard[p].AddChild( pLetter ); m_Keyboard[p].AddChild( pLetter );
m_AlphabetLetter[p].push_back( CHAR_BACK ); m_AlphabetLetter[p].push_back( CHAR_BACK );
pLetter->RunCommands( OK_INIT_COMMMAND );
} }
/* Add "OK". */ /* Add "OK". */
{ {
BitmapText *pLetter = new BitmapText; BitmapText *pLetter = new BitmapText;
pLetter->SetName( ssprintf("LetterP%i",p+1) ); pLetter->SetName( ssprintf("LetterP%i",p+1) );
ActorUtil::LoadAllCommands( *pLetter, m_sName );
pLetter->LoadFromFont( sFontPath ); pLetter->LoadFromFont( sFontPath );
RString sText = "&ok;"; RString sText = "&ok;";
FontCharAliases::ReplaceMarkers( sText ); FontCharAliases::ReplaceMarkers( sText );
pLetter->SetText( sText ); pLetter->SetText( sText );
pLetter->PlayCommand( "OKInit" );
m_textAlphabet[p].push_back( pLetter ); m_textAlphabet[p].push_back( pLetter );
m_Keyboard[p].AddChild( pLetter ); m_Keyboard[p].AddChild( pLetter );
m_AlphabetLetter[p].push_back( CHAR_OK ); m_AlphabetLetter[p].push_back( CHAR_OK );
pLetter->RunCommands( OK_INIT_COMMMAND );
} }
m_sprCursor[p].SetName( ssprintf("CursorP%i",p+1) ); m_sprCursor[p].SetName( ssprintf("CursorP%i",p+1) );