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

style

Browse Source
This commit is contained in:
Glenn Maynard
2006-03-28 09:34:10 +00:00
parent ee9c292b09
commit b02e382975
1 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenNameEntryTraditional.cpp
+51 -51
View File
@@ -230,49 +230,49 @@ void ScreenNameEntryTraditional::Init()
this->AddChild( &m_Keyboard[p] ); this->AddChild( &m_Keyboard[p] );
/* Add letters to m_Keyboard. */ /* Add letters to m_Keyboard. */
const RString fontpath = THEME->GetPathF(m_sName,"letters"); const RString sFontPath = THEME->GetPathF(m_sName,"letters");
const wstring Chars = RStringToWstring(KEYBOARD_LETTERS); const wstring sChars = RStringToWstring(KEYBOARD_LETTERS);
for( unsigned ch = 0; ch < Chars.size(); ++ch ) for( unsigned ch = 0; ch < sChars.size(); ++ch )
{ {
BitmapText *Letter = new BitmapText; BitmapText *pLetter = new BitmapText;
Letter->SetName( ssprintf("LetterP%i",p+1) ); pLetter->SetName( ssprintf("LetterP%i",p+1) );
Letter->LoadFromFont( fontpath ); pLetter->LoadFromFont( sFontPath );
Letter->SetText( ssprintf("%lc", Chars[ch]) ); pLetter->SetText( ssprintf("%lc", sChars[ch]) );
m_textAlphabet[p].push_back( Letter ); m_textAlphabet[p].push_back( pLetter );
m_Keyboard[p].AddChild( Letter ); m_Keyboard[p].AddChild( pLetter );
Letter->RunCommands( ALPHABET_INIT_COMMMAND ); pLetter->RunCommands( ALPHABET_INIT_COMMMAND );
m_AlphabetLetter[p].push_back( Chars[ch] ); m_AlphabetLetter[p].push_back( sChars[ch] );
} }
/* Add "<-". */ /* Add "<-". */
{ {
BitmapText *Letter = new BitmapText; BitmapText *pLetter = new BitmapText;
Letter->SetName( ssprintf("LetterP%i",p+1) ); pLetter->SetName( ssprintf("LetterP%i",p+1) );
Letter->LoadFromFont( fontpath ); pLetter->LoadFromFont( sFontPath );
RString text = "&leftarrow;"; RString sText = "&leftarrow;";
FontCharAliases::ReplaceMarkers( text ); FontCharAliases::ReplaceMarkers( sText );
Letter->SetText( text ); pLetter->SetText( sText );
m_textAlphabet[p].push_back( Letter ); m_textAlphabet[p].push_back( pLetter );
m_Keyboard[p].AddChild( Letter ); m_Keyboard[p].AddChild( pLetter );
m_AlphabetLetter[p].push_back( CHAR_BACK ); m_AlphabetLetter[p].push_back( CHAR_BACK );
Letter->RunCommands( OK_INIT_COMMMAND ); pLetter->RunCommands( OK_INIT_COMMMAND );
} }
/* Add "OK". */ /* Add "OK". */
{ {
BitmapText *Letter = new BitmapText; BitmapText *pLetter = new BitmapText;
Letter->SetName( ssprintf("LetterP%i",p+1) ); pLetter->SetName( ssprintf("LetterP%i",p+1) );
Letter->LoadFromFont( fontpath ); pLetter->LoadFromFont( sFontPath );
RString text = "&ok;"; RString sText = "&ok;";
FontCharAliases::ReplaceMarkers( text ); FontCharAliases::ReplaceMarkers( sText );
Letter->SetText( text ); pLetter->SetText( sText );
m_textAlphabet[p].push_back( Letter ); m_textAlphabet[p].push_back( pLetter );
m_Keyboard[p].AddChild( Letter ); m_Keyboard[p].AddChild( pLetter );
m_AlphabetLetter[p].push_back( CHAR_OK ); m_AlphabetLetter[p].push_back( CHAR_OK );
Letter->RunCommands( OK_INIT_COMMMAND ); pLetter->RunCommands( OK_INIT_COMMMAND );
} }
m_sprCursor[p].SetName( ssprintf("CursorP%i",p+1) ); m_sprCursor[p].SetName( ssprintf("CursorP%i",p+1) );
@@ -451,26 +451,26 @@ static inline int wrapn( int x, int n )
void ScreenNameEntryTraditional::PositionCharsAndCursor( int pn ) void ScreenNameEntryTraditional::PositionCharsAndCursor( int pn )
{ {
const int Selected = m_SelectedChar[pn]; const int iSelected = m_SelectedChar[pn];
const int NumDisplayed = NUM_ALPHABET_DISPLAYED; const int iNumDisplayed = NUM_ALPHABET_DISPLAYED;
const int TotalDisplayed = (int)m_textAlphabet[pn].size(); const int iTotalDisplayed = (int)m_textAlphabet[pn].size();
const int Start = wrapn( Selected - TotalDisplayed/2, TotalDisplayed ); const int iStart = wrapn( iSelected - iTotalDisplayed/2, iTotalDisplayed );
const int First = -NumDisplayed/2; const int iFirst = -iNumDisplayed/2;
const int Last = NumDisplayed/2; const int iLast = iNumDisplayed/2;
for( int i = 0; i < (int)m_textAlphabet[pn].size(); ++i ) for( int i = 0; i < (int)m_textAlphabet[pn].size(); ++i )
{ {
const int Num = wrapn( Start+i, (int) m_textAlphabet[pn].size() ); const int iNum = wrapn( iStart+i, (int) m_textAlphabet[pn].size() );
BitmapText *bt = m_textAlphabet[pn][Num]; BitmapText *bt = m_textAlphabet[pn][iNum];
const int Pos = i - TotalDisplayed/2; const int iPos = i - iTotalDisplayed/2;
const bool hidden = ( Pos < First || Pos > Last ); const bool bHidden = ( iPos < iFirst || iPos > iLast );
const int ActualPos = clamp( Pos, First-1, Last+1 ); const int iActualPos = clamp( iPos, iFirst-1, iLast+1 );
bt->RunCommands( CHANGE_COMMAND ); bt->RunCommands( CHANGE_COMMAND );
bt->SetX( ActualPos * ALPHABET_GAP_X ); bt->SetX( iActualPos * ALPHABET_GAP_X );
bt->SetDiffuseAlpha( hidden? 0.0f:1.0f ); bt->SetDiffuseAlpha( bHidden? 0.0f:1.0f );
} }
m_sprCursor[pn].SetXY( 0,0 ); m_sprCursor[pn].SetXY( 0,0 );
@@ -576,16 +576,16 @@ void ScreenNameEntryTraditional::Finish( PlayerNumber pn )
UpdateSelectionText( pn ); /* hide NAME_ cursor */ UpdateSelectionText( pn ); /* hide NAME_ cursor */
RString selection = WStringToRString( m_sSelection[pn] ); RString sSelection = WStringToRString( m_sSelection[pn] );
// save last used ranking name // save last used ranking name
Profile* pProfile = PROFILEMAN->GetProfile(pn); Profile* pProfile = PROFILEMAN->GetProfile(pn);
pProfile->m_sLastUsedHighScoreName = selection; pProfile->m_sLastUsedHighScoreName = sSelection;
TrimRight( selection, " " ); TrimRight( sSelection, " " );
TrimLeft( selection, " " ); TrimLeft( sSelection, " " );
GAMESTATE->StoreRankingName( pn, selection ); GAMESTATE->StoreRankingName( pn, sSelection );
OFF_COMMAND( m_Keyboard[pn] ); OFF_COMMAND( m_Keyboard[pn] );
for( int i = 0; i < (int)m_textAlphabet[pn].size(); ++i ) for( int i = 0; i < (int)m_textAlphabet[pn].size(); ++i )
@@ -626,9 +626,9 @@ void ScreenNameEntryTraditional::HandleStart( PlayerNumber pn )
if( !m_bStillEnteringName[pn] ) if( !m_bStillEnteringName[pn] )
return; // ignore return; // ignore
const int CurrentSelection = m_SelectedChar[pn]; const int iCurrentSelection = m_SelectedChar[pn];
const int SelectedLetter = m_AlphabetLetter[pn][CurrentSelection]; const int iSelectedLetter = m_AlphabetLetter[pn][iCurrentSelection];
switch( SelectedLetter ) switch( iSelectedLetter )
{ {
case CHAR_OK: case CHAR_OK:
m_soundKey.Play(); m_soundKey.Play();
@@ -647,7 +647,7 @@ void ScreenNameEntryTraditional::HandleStart( PlayerNumber pn )
SelectChar( pn, CHAR_BACK ); SelectChar( pn, CHAR_BACK );
break; break;
} }
m_sSelection[pn] += wchar_t(SelectedLetter); m_sSelection[pn] += wchar_t(iSelectedLetter);
UpdateSelectionText( pn ); UpdateSelectionText( pn );
m_soundKey.Play(); m_soundKey.Play();