From 820855f379504cb790240b59028914d202541326 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 25 Feb 2007 22:33:54 +0000 Subject: [PATCH] remove unused MaxCombo. Do this in Lua if wanted. --- stepmania/src/ScreenGameplay.cpp | 10 ---------- stepmania/src/ScreenGameplay.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 935e168d0d..09b1d65470 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -584,13 +584,6 @@ void ScreenGameplay::Init() } #endif - m_MaxCombo.LoadFromFont( THEME->GetPathF(m_sName,"max combo") ); - m_MaxCombo.SetName( "MaxCombo" ); - LOAD_ALL_COMMANDS_AND_SET_XY( m_MaxCombo ); - m_MaxCombo.SetText( ssprintf("%d", m_vPlayerInfo[0].GetPlayerStageStats()->m_iMaxCombo) ); // TODO: Make this work for both players - this->AddChild( &m_MaxCombo ); - - FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) { // primary score display @@ -1518,9 +1511,6 @@ void ScreenGameplay::Update( float fDeltaTime ) if( m_bPaused ) return; - if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID && m_MaxCombo.GetVisible() ) - m_MaxCombo.SetText( ssprintf("%d", STATSMAN->m_CurStageStats.m_player[GAMESTATE->m_MasterPlayerNumber].m_iMaxCombo) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */ - //LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() ); m_AutoKeysounds.Update(fDeltaTime); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index b53ad80a93..e76529a4cd 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -206,8 +206,6 @@ protected: RageTimer m_GiveUpTimer; void AbortGiveUp( bool bShowText ); - BitmapText m_MaxCombo; // TODO: move this into an overlay - Transition m_Ready; Transition m_Go; Transition m_Failed;