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

remove m_meterSongPosition - this can be done with XML now

Browse Source 
fix crash
This commit is contained in:
Glenn Maynard
2005-02-26 10:14:27 +00:00
parent 0ae355094f
commit 709d9e60d7
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+2 -9
View File
@@ -422,12 +422,6 @@ void ScreenGameplay::Init()
this->AddChild( &m_textSongTitle ); this->AddChild( &m_textSongTitle );
m_meterSongPosition.Load( THEME->GetPathG(m_sName,"song position meter"), SONG_POSITION_METER_WIDTH, THEME->GetPathG(m_sName,"song position tip") );
m_meterSongPosition.SetName( "SongPositionMeter" );
SET_XY( m_meterSongPosition );
this->AddChild( &m_meterSongPosition );
m_MaxCombo.LoadFromFont( THEME->GetPathF(m_sName,"max combo") ); m_MaxCombo.LoadFromFont( THEME->GetPathF(m_sName,"max combo") );
m_MaxCombo.SetName( "MaxCombo" ); m_MaxCombo.SetName( "MaxCombo" );
SET_XY( m_MaxCombo ); SET_XY( m_MaxCombo );
@@ -2392,7 +2386,6 @@ void ScreenGameplay::TweenOnScreen()
ON_COMMAND( m_textSongOptions ); ON_COMMAND( m_textSongOptions );
ON_COMMAND( m_sprScoreFrame ); ON_COMMAND( m_sprScoreFrame );
ON_COMMAND( m_textSongTitle ); ON_COMMAND( m_textSongTitle );
ON_COMMAND( m_meterSongPosition );
ON_COMMAND( m_BPMDisplay ); ON_COMMAND( m_BPMDisplay );
ON_COMMAND( m_MaxCombo ); ON_COMMAND( m_MaxCombo );
@@ -2420,7 +2413,8 @@ void ScreenGameplay::TweenOnScreen()
FOREACH_NSScoreBoardColumn( sc ) FOREACH_NSScoreBoardColumn( sc )
ON_COMMAND( m_Scoreboard[sc] ); ON_COMMAND( m_Scoreboard[sc] );
m_Overlay->PlayCommand("On"); if( m_Overlay.IsLoaded() )
m_Overlay->PlayCommand("On");
} }
void ScreenGameplay::TweenOffScreen() void ScreenGameplay::TweenOffScreen()
@@ -2432,7 +2426,6 @@ void ScreenGameplay::TweenOffScreen()
OFF_COMMAND( m_textSongOptions ); OFF_COMMAND( m_textSongOptions );
OFF_COMMAND( m_sprScoreFrame ); OFF_COMMAND( m_sprScoreFrame );
OFF_COMMAND( m_textSongTitle ); OFF_COMMAND( m_textSongTitle );
OFF_COMMAND( m_meterSongPosition );
OFF_COMMAND( m_BPMDisplay ); OFF_COMMAND( m_BPMDisplay );
OFF_COMMAND( m_MaxCombo ); OFF_COMMAND( m_MaxCombo );
stepmania/src/ScreenGameplay.h
-2
View File
@@ -22,7 +22,6 @@ class Inventory;
#include "LyricDisplay.h" #include "LyricDisplay.h"
#include "Character.h" #include "Character.h"
#include "Attack.h" #include "Attack.h"
#include "MeterDisplay.h"
#include "ActiveAttackList.h" #include "ActiveAttackList.h"
#include "NetworkSyncManager.h" #include "NetworkSyncManager.h"
#include "AutoKeysounds.h" #include "AutoKeysounds.h"
@@ -134,7 +133,6 @@ protected:
BitmapText m_textSurviveTime; // used in extra stage BitmapText m_textSurviveTime; // used in extra stage
BitmapText m_textSongTitle; BitmapText m_textSongTitle;
SongMeterDisplay m_meterSongPosition;
Player m_Player[NUM_PLAYERS]; Player m_Player[NUM_PLAYERS];