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

revert using AutoActors for CourseNumber. This was messing up the animations

Browse Source
This commit is contained in:
Chris Danford
2005-05-07 09:58:23 +00:00
parent 6d6762fbe4
commit 6ba78144ff
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+14 -15
View File
@@ -224,7 +224,6 @@ void ScreenGameplay::Init()
g_fOldOffset = GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds; g_fOldOffset = GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds;
m_SongBackground.SetName( "SongBackground" ); m_SongBackground.SetName( "SongBackground" );
m_SongBackground.SetDrawOrder( DRAW_ORDER_BEFORE_EVERYTHING ); m_SongBackground.SetDrawOrder( DRAW_ORDER_BEFORE_EVERYTHING );
ON_COMMAND( m_SongBackground ); ON_COMMAND( m_SongBackground );
@@ -456,7 +455,8 @@ void ScreenGameplay::Init()
// //
// Add stage / SongNumber // Add stage / SongNumber
// //
m_sprCourseSongNumber.SetName( "CourseSongNumber" );
SET_XY( m_sprCourseSongNumber );
FOREACH_EnabledPlayer(p) FOREACH_EnabledPlayer(p)
{ {
@@ -485,13 +485,7 @@ void ScreenGameplay::Init()
case PLAY_MODE_NONSTOP: case PLAY_MODE_NONSTOP:
case PLAY_MODE_ONI: case PLAY_MODE_ONI:
case PLAY_MODE_ENDLESS: case PLAY_MODE_ENDLESS:
for( int i=0; i<MAX_COURSE_SONG_NUMBER_GRAPHICS; i++ ) this->AddChild( &m_sprCourseSongNumber );
{
m_sprCourseSongNumber[i].Load( THEME->GetPathG( m_sName, ssprintf("course song %i",i+1)) );
m_sprCourseSongNumber[i]->SetName( "CourseSongNumber" );
SET_XY( m_sprCourseSongNumber[i] );
this->AddChild( m_sprCourseSongNumber[i] );
}
FOREACH_EnabledPlayer( p ) FOREACH_EnabledPlayer( p )
this->AddChild( &m_textCourseSongNumber[p] ); this->AddChild( &m_textCourseSongNumber[p] );
@@ -863,8 +857,12 @@ void ScreenGameplay::LoadCourseSongNumber( int iSongNumber )
{ {
if( !GAMESTATE->IsCourseMode() ) if( !GAMESTATE->IsCourseMode() )
return; return;
for( int i=0; i<MAX_COURSE_SONG_NUMBER_GRAPHICS; i++ ) const CString path = THEME->GetPathG( m_sName, ssprintf("course song %i",iSongNumber+1), true );
m_sprCourseSongNumber[i]->SetHidden( i != iSongNumber ); if( path != "" )
m_sprCourseSongNumber.Load( path );
else
m_sprCourseSongNumber.UnloadTexture();
SCREENMAN->ZeroNextUpdate();
} }
void ScreenGameplay::LoadNextSong() void ScreenGameplay::LoadNextSong()
@@ -1073,6 +1071,7 @@ void ScreenGameplay::LoadNextSong()
* so cap fDelta at 0 so m_NextSong will show up on screen. * so cap fDelta at 0 so m_NextSong will show up on screen.
* -Chris */ * -Chris */
m_bZeroDeltaOnNextUpdate = true; m_bZeroDeltaOnNextUpdate = true;
SCREENMAN->ZeroNextUpdate();
// //
// Load cabinet lights data // Load cabinet lights data
@@ -2394,13 +2393,13 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
m_NextSong.Reset(); m_NextSong.Reset();
m_NextSong.StartTransitioning( SM_LoadNextSong ); m_NextSong.StartTransitioning( SM_LoadNextSong );
LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex()+1 ); LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex()+1 );
COMMAND( m_sprCourseSongNumber[GAMESTATE->GetCourseSongIndex()], "ChangeIn" ); COMMAND( m_sprCourseSongNumber, "ChangeIn" );
} }
else if( SM == SM_LoadNextSong ) else if( SM == SM_LoadNextSong )
{ {
SongFinished(); SongFinished();
COMMAND( m_sprCourseSongNumber[GAMESTATE->GetCourseSongIndex()], "ChangeOut" ); COMMAND( m_sprCourseSongNumber, "ChangeOut" );
LoadNextSong(); LoadNextSong();
GAMESTATE->m_bPastHereWeGo = true; GAMESTATE->m_bPastHereWeGo = true;
@@ -2536,7 +2535,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
void ScreenGameplay::TweenOnScreen() void ScreenGameplay::TweenOnScreen()
{ {
ON_COMMAND( m_sprLifeFrame ); ON_COMMAND( m_sprLifeFrame );
ON_COMMAND( m_sprCourseSongNumber[GAMESTATE->GetCourseSongIndex()] ); ON_COMMAND( m_sprCourseSongNumber );
ON_COMMAND( m_sprStageFrame ); ON_COMMAND( m_sprStageFrame );
ON_COMMAND( m_textSongOptions ); ON_COMMAND( m_textSongOptions );
ON_COMMAND( m_sprScoreFrame ); ON_COMMAND( m_sprScoreFrame );
@@ -2573,7 +2572,7 @@ void ScreenGameplay::TweenOffScreen()
ScreenWithMenuElements::TweenOffScreen(); ScreenWithMenuElements::TweenOffScreen();
OFF_COMMAND( m_sprLifeFrame ); OFF_COMMAND( m_sprLifeFrame );
OFF_COMMAND( m_sprCourseSongNumber[GAMESTATE->GetCourseSongIndex()] ); OFF_COMMAND( m_sprCourseSongNumber );
OFF_COMMAND( m_sprStageFrame ); OFF_COMMAND( m_sprStageFrame );
OFF_COMMAND( m_textSongOptions ); OFF_COMMAND( m_textSongOptions );
OFF_COMMAND( m_sprScoreFrame ); OFF_COMMAND( m_sprScoreFrame );
stepmania/src/ScreenGameplay.h
+1 -3
View File
@@ -29,8 +29,6 @@ class Inventory;
AutoScreenMessage( SM_NotesEnded ) AutoScreenMessage( SM_NotesEnded )
const int MAX_COURSE_SONG_NUMBER_GRAPHICS = 5;
class LyricsLoader; class LyricsLoader;
class ScreenGameplay : public ScreenWithMenuElements class ScreenGameplay : public ScreenWithMenuElements
{ {
@@ -109,7 +107,7 @@ protected:
AutoActor m_sprLifeFrame; AutoActor m_sprLifeFrame;
LifeMeter* m_pLifeMeter[NUM_PLAYERS]; LifeMeter* m_pLifeMeter[NUM_PLAYERS];
CombinedLifeMeter* m_pCombinedLifeMeter; CombinedLifeMeter* m_pCombinedLifeMeter;
AutoActor m_sprCourseSongNumber[MAX_COURSE_SONG_NUMBER_GRAPHICS]; Sprite m_sprCourseSongNumber;
AutoActor m_sprStageFrame; AutoActor m_sprStageFrame;
BitmapText m_textCourseSongNumber[NUM_PLAYERS]; BitmapText m_textCourseSongNumber[NUM_PLAYERS];
BitmapText m_textStepsDescription[NUM_PLAYERS]; BitmapText m_textStepsDescription[NUM_PLAYERS];