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

fix base calls; don't PlayMusic in the ctor (SWME does that)

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-08 19:47:44 +00:00
parent 973bda0596
commit 9e51961ded
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+2 -3
View File
@@ -858,7 +858,6 @@ void ScreenEvaluation::Init()
this->SortByDrawOrder(); this->SortByDrawOrder();
SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
m_timerSoundSequences.SetZero(); // zero the sound sequence timer m_timerSoundSequences.SetZero(); // zero the sound sequence timer
m_timerSoundSequences.Touch(); // set the timer going :] m_timerSoundSequences.Touch(); // set the timer going :]
@@ -1290,7 +1289,7 @@ void ScreenEvaluation::Update( float fDeltaTime )
void ScreenEvaluation::DrawPrimitives() void ScreenEvaluation::DrawPrimitives()
{ {
Screen::DrawPrimitives(); ScreenWithMenuElements::DrawPrimitives();
} }
void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
@@ -1338,7 +1337,7 @@ void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType t
} }
} }
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
} }
void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
stepmania/src/ScreenNameEntryTraditional.cpp
+3 -5
View File
@@ -419,8 +419,6 @@ void ScreenNameEntryTraditional::Init()
m_soundChange.Load( THEME->GetPathS(m_sName,"change",true) ); m_soundChange.Load( THEME->GetPathS(m_sName,"change",true) );
m_soundInvalid.Load( THEME->GetPathS(m_sName,"invalid",true) ); m_soundInvalid.Load( THEME->GetPathS(m_sName,"invalid",true) );
SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
this->SortByDrawOrder(); this->SortByDrawOrder();
} }
@@ -481,7 +479,7 @@ void ScreenNameEntryTraditional::Update( float fDelta )
if( m_bFirstUpdate ) if( m_bFirstUpdate )
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("name entry") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("name entry") );
Screen::Update(fDelta); ScreenWithMenuElements::Update(fDelta);
} }
void ScreenNameEntryTraditional::DrawPrimitives() void ScreenNameEntryTraditional::DrawPrimitives()
@@ -489,7 +487,7 @@ void ScreenNameEntryTraditional::DrawPrimitives()
DISPLAY->CameraPushMatrix(); DISPLAY->CameraPushMatrix();
DISPLAY->LoadMenuPerspective( FOV, SCREEN_CENTER_X, SCREEN_CENTER_Y ); DISPLAY->LoadMenuPerspective( FOV, SCREEN_CENTER_X, SCREEN_CENTER_Y );
Screen::DrawPrimitives(); ScreenWithMenuElements::DrawPrimitives();
DISPLAY->CameraPopMatrix(); DISPLAY->CameraPopMatrix();
} }
@@ -499,7 +497,7 @@ void ScreenNameEntryTraditional::Input( const DeviceInput& DeviceI, const InputE
if( IsTransitioning() ) if( IsTransitioning() )
return; return;
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
} }
void ScreenNameEntryTraditional::ChangeDisplayedFeat() void ScreenNameEntryTraditional::ChangeDisplayedFeat()