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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-19 06:20:18 +00:00
parent c4495e3900
commit a305c072c0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenDebugOverlay.cpp
+2 -2
View File
@@ -267,7 +267,7 @@ void ScreenDebugOverlay::UpdateText()
case DebugLine_FillMachineStats: s2=""; break; case DebugLine_FillMachineStats: s2=""; break;
case DebugLine_SendNotesEnded: s2=""; break; case DebugLine_SendNotesEnded: s2=""; break;
case DebugLine_Volume: s2=bOn ? "on":"off"; break; case DebugLine_Volume: s2=bOn ? "on":"off"; break;
case DebugLine_ReloadCurrentScreen: s2=SCREENMAN ? SCREENMAN->GetTopScreen()->m_sName:""; break; case DebugLine_ReloadCurrentScreen: s2=SCREENMAN ? SCREENMAN->GetTopScreen()->GetName():""; break;
case DebugLine_ReloadTheme: s2=""; break; case DebugLine_ReloadTheme: s2=""; break;
case DebugLine_WriteProfiles: s2=""; break; case DebugLine_WriteProfiles: s2=""; break;
case DebugLine_WritePreferences: s2=""; break; case DebugLine_WritePreferences: s2=""; break;
@@ -415,7 +415,7 @@ bool ScreenDebugOverlay::OverlayInput( const DeviceInput& DeviceI, const InputEv
case DebugLine_ReloadCurrentScreen: case DebugLine_ReloadCurrentScreen:
SOUND->StopMusic(); SOUND->StopMusic();
ResetGame(); ResetGame();
SCREENMAN->SetNewScreen( SCREENMAN->GetTopScreen()->m_sName ); SCREENMAN->SetNewScreen( SCREENMAN->GetTopScreen()->GetName() );
break; break;
case DebugLine_ReloadTheme: case DebugLine_ReloadTheme:
THEME->ReloadMetrics(); THEME->ReloadMetrics();
stepmania/src/ScreenManager.cpp
+4 -4
View File
@@ -351,7 +351,7 @@ void ScreenManager::PrepareScreen( const CString &sScreenName )
for( int i = (int)m_vPreparedScreens.size()-1; i>=0; i-- ) for( int i = (int)m_vPreparedScreens.size()-1; i>=0; i-- )
{ {
Screen *&pScreen = m_vPreparedScreens[i]; Screen *&pScreen = m_vPreparedScreens[i];
if( pScreen->m_sName == sScreenName ) if( pScreen->GetName() == sScreenName )
return; return;
} }
@@ -370,7 +370,7 @@ void ScreenManager::PrepareScreen( const CString &sScreenName )
Actor *pNewBGA = NULL; Actor *pNewBGA = NULL;
FOREACH( Actor*, m_vPreparedBackgrounds, a ) FOREACH( Actor*, m_vPreparedBackgrounds, a )
{ {
if( (*a)->m_sName == sNewBGA ) if( (*a)->GetName() == sNewBGA )
{ {
pNewBGA = *a; pNewBGA = *a;
break; break;
@@ -486,7 +486,7 @@ void ScreenManager::LoadDelayedScreen()
Screen* pNewScreen = NULL; Screen* pNewScreen = NULL;
FOREACH( Screen*, m_vPreparedScreens, s ) FOREACH( Screen*, m_vPreparedScreens, s )
{ {
if( (*s)->m_sName == sScreenName ) if( (*s)->GetName() == sScreenName )
{ {
pNewScreen = *s; pNewScreen = *s;
m_vPreparedScreens.erase( s ); m_vPreparedScreens.erase( s );
@@ -521,7 +521,7 @@ void ScreenManager::LoadDelayedScreen()
{ {
FOREACH( Actor*, m_vPreparedBackgrounds, a ) FOREACH( Actor*, m_vPreparedBackgrounds, a )
{ {
if( (*a)->m_sName == sNewBGA ) if( (*a)->GetName() == sNewBGA )
{ {
pNewBGA = *a; pNewBGA = *a;
m_vPreparedBackgrounds.erase( a ); m_vPreparedBackgrounds.erase( a );
stepmania/src/ScreenNetSelectBase.cpp
+3 -3
View File
@@ -256,9 +256,9 @@ void ScreenNetSelectBase::UpdateUsers()
void UtilSetQuadInit( Actor& actor, const CString &sClassName ) void UtilSetQuadInit( Actor& actor, const CString &sClassName )
{ {
ActorUtil::SetXYAndOnCommand( actor, sClassName ); ActorUtil::SetXYAndOnCommand( actor, sClassName );
actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.m_sName + "Color" ) ); actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.GetName() + "Color" ) );
actor.SetWidth( THEME->GetMetricF( sClassName, actor.m_sName + "Width" ) ); actor.SetWidth( THEME->GetMetricF( sClassName, actor.GetName() + "Width" ) );
actor.SetHeight( THEME->GetMetricF( sClassName, actor.m_sName + "Height" ) ); actor.SetHeight( THEME->GetMetricF( sClassName, actor.GetName() + "Height" ) );
} }
#endif #endif