This commit is contained in:
Glenn Maynard
2006-11-21 18:33:54 +00:00
parent efa198b4aa
commit 8ada5509f5
2 changed files with 2 additions and 4 deletions
+1 -2
View File
@@ -2,7 +2,6 @@
#include "MenuTimer.h" #include "MenuTimer.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "AnnouncerManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "Font.h" #include "Font.h"
#include "GameSoundManager.h" #include "GameSoundManager.h"
@@ -80,7 +79,7 @@ void MenuTimer::Update( float fDeltaTime )
return; return;
if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); SOUND->PlayOnceFromAnnouncer( "hurry up" );
int iCrossed = (int)floorf(fOldSecondsLeft); int iCrossed = (int)floorf(fOldSecondsLeft);
+1 -2
View File
@@ -9,7 +9,6 @@
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "GameSoundManager.h" #include "GameSoundManager.h"
#include "AnnouncerManager.h"
#include "MemoryCardDisplay.h" #include "MemoryCardDisplay.h"
#define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth") #define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth")
@@ -150,7 +149,7 @@ void ScreenWithMenuElements::BeginScreen()
this->SortByDrawOrder(); this->SortByDrawOrder();
m_In.StartTransitioning( SM_DoneFadingIn ); m_In.StartTransitioning( SM_DoneFadingIn );
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); SOUND->PlayOnceFromAnnouncer( m_sName+" intro" );
StartPlayingMusic(); StartPlayingMusic();
/* Evaluate FirstUpdateCommand. */ /* Evaluate FirstUpdateCommand. */