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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-03-11 02:06:39 +00:00
parent 68a0c2ab57
commit 2465eddf0f
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+15 -17
View File
@@ -266,6 +266,12 @@ void ScreenGameplay::Init()
m_Foreground.SetDrawOrder( DRAW_ORDER_OVERLAY+1 ); // on top of the overlay, but under transitions m_Foreground.SetDrawOrder( DRAW_ORDER_OVERLAY+1 ); // on top of the overlay, but under transitions
this->AddChild( &m_Foreground ); this->AddChild( &m_Foreground );
if( PREFSMAN->m_bShowBeginnerHelper )
{
m_BeginnerHelper.SetDrawOrder( DRAW_ORDER_BEFORE_EVERYTHING );
m_BeginnerHelper.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
this->AddChild( &m_BeginnerHelper );
}
m_sprStaticBackground.SetName( "StaticBG" ); m_sprStaticBackground.SetName( "StaticBG" );
m_sprStaticBackground.Load( THEME->GetPathG(m_sName,"Static Background") ); m_sprStaticBackground.Load( THEME->GetPathG(m_sName,"Static Background") );
@@ -1031,17 +1037,15 @@ void ScreenGameplay::LoadNextSong()
} }
} }
if( m_BeginnerHelper.Initialize( 2 ) ) // Init for doubles m_Background.Unload();
if( !PREFSMAN->m_bShowBeginnerHelper || !m_BeginnerHelper.Initialize(2) )
{ {
m_Background.Unload(); // BeginnerHelper has its own BG control. m_BeginnerHelper.SetHidden( true );
m_Background.StopAnimating();
m_BeginnerHelper.SetX( SCREEN_CENTER_X ); /* BeginnerHelper disabled, or failed to load. */
m_BeginnerHelper.SetY( SCREEN_CENTER_Y );
}
else
{
/* BeginnerHelper disabled/failed to load. */
m_Background.LoadFromSong( GAMESTATE->m_pCurSong ); m_Background.LoadFromSong( GAMESTATE->m_pCurSong );
if( !GAMESTATE->m_bDemonstrationOrJukebox ) if( !GAMESTATE->m_bDemonstrationOrJukebox )
{ {
/* This will fade from a preset brightness to the actual brightness (based /* This will fade from a preset brightness to the actual brightness (based
@@ -1053,6 +1057,8 @@ void ScreenGameplay::LoadNextSong()
m_Background.FadeToActualBrightness(); m_Background.FadeToActualBrightness();
} }
} }
else
m_BeginnerHelper.SetHidden( false );
m_Foreground.LoadFromSong( GAMESTATE->m_pCurSong ); m_Foreground.LoadFromSong( GAMESTATE->m_pCurSong );
@@ -1297,8 +1303,6 @@ void ScreenGameplay::Update( float fDeltaTime )
//LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() ); //LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() );
m_BeginnerHelper.Update(fDeltaTime);
m_AutoKeysounds.Update(fDeltaTime); m_AutoKeysounds.Update(fDeltaTime);
// //
@@ -1698,12 +1702,6 @@ void ScreenGameplay::AbortGiveUp()
m_GiveUpTimer.SetZero(); m_GiveUpTimer.SetZero();
} }
void ScreenGameplay::DrawPrimitives()
{
m_BeginnerHelper.DrawPrimitives();
Screen::DrawPrimitives();
}
void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{ {
stepmania/src/ScreenGameplay.h
-1
View File
@@ -36,7 +36,6 @@ public:
virtual ~ScreenGameplay(); virtual ~ScreenGameplay();
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void DrawPrimitives();
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );