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

SOUNDMAN -> SOUND

Browse Source 
RageSoundManager.h -> RageSounds.h
This commit is contained in:
Glenn Maynard
2003-07-26 23:05:16 +00:00
parent 101d49085f
commit fe489cd281
43 changed files with 130 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuElements.cpp
-1
View File
@@ -12,7 +12,6 @@
#include "MenuElements.h" #include "MenuElements.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
stepmania/src/MenuTimer.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "Font.h" #include "Font.h"
#include "RageSoundManager.h" #include "RageSounds.h"
const float TIMER_SECONDS = 99; const float TIMER_SECONDS = 99;
@@ -86,7 +86,7 @@ void MenuTimer::Update( float fDeltaTime )
int iNewDisplay = (int)(fNewSecondsLeft + 0.99f); int iNewDisplay = (int)(fNewSecondsLeft + 0.99f);
if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") );
if( iOldDisplay != iNewDisplay ) if( iOldDisplay != iNewDisplay )
{ {
stepmania/src/ModeSwitcher.cpp
-1
View File
@@ -16,7 +16,6 @@
#include "PrefsManager.h" #include "PrefsManager.h"
#include "SongManager.h" #include "SongManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "RageSoundManager.h"
#include "StyleDef.h" #include "StyleDef.h"
#include "song.h" #include "song.h"
#include "ActorUtil.h" #include "ActorUtil.h"
stepmania/src/MusicBannerWheel.cpp
+2 -2
View File
@@ -25,7 +25,7 @@ TODO:
#include "PrefsManager.h" #include "PrefsManager.h"
#include "SongManager.h" #include "SongManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "StyleDef.h" #include "StyleDef.h"
#include "song.h" #include "song.h"
#include "ActorUtil.h" #include "ActorUtil.h"
@@ -301,7 +301,7 @@ void MusicBannerWheel::PlayMusicSample()
Song* pSong = GetSelectedSong(); Song* pSong = GetSelectedSong();
if( pSong && pSong->HasMusic() ) if( pSong && pSong->HasMusic() )
{ {
SOUNDMAN->PlayMusic(pSong->GetMusicPath(), true, SOUND->PlayMusic(pSong->GetMusicPath(), true,
pSong->m_fMusicSampleStartSeconds, pSong->m_fMusicSampleStartSeconds,
pSong->m_fMusicSampleLengthSeconds); pSong->m_fMusicSampleLengthSeconds);
} }
stepmania/src/MusicWheel.cpp
-1
View File
@@ -17,7 +17,6 @@
#include "SongManager.h" #include "SongManager.h"
#include "GameManager.h" #include "GameManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" // for sending SM_PlayMusicSample #include "ScreenManager.h" // for sending SM_PlayMusicSample
#include "RageLog.h" #include "RageLog.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
stepmania/src/MusicWheelItem.cpp
-1
View File
@@ -17,7 +17,6 @@
#include "SongManager.h" #include "SongManager.h"
#include "GameManager.h" #include "GameManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" // for sending SM_PlayMusicSample #include "ScreenManager.h" // for sending SM_PlayMusicSample
#include "RageLog.h" #include "RageLog.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
stepmania/src/ScreenGameplay.cpp
+7 -7
View File
@@ -38,7 +38,7 @@
#include "ActorUtil.h" #include "ActorUtil.h"
#include "NoteSkinManager.h" #include "NoteSkinManager.h"
#include "RageTextureManager.h" #include "RageTextureManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "CombinedLifeMeterEnemy.h" #include "CombinedLifeMeterEnemy.h"
#include "CombinedLifeMeterTug.h" #include "CombinedLifeMeterTug.h"
#include "Inventory.h" #include "Inventory.h"
@@ -895,7 +895,7 @@ bool ScreenGameplay::IsTimeToPlayTicks() const
// will start coming out the speaker. Compensate for this by boosting // will start coming out the speaker. Compensate for this by boosting
// fPositionSeconds ahead // fPositionSeconds ahead
float fPositionSeconds = GAMESTATE->m_fMusicSeconds; float fPositionSeconds = GAMESTATE->m_fMusicSeconds;
fPositionSeconds += (SOUNDMAN->GetPlayLatency()+(float)G_TICK_EARLY_SECONDS) * m_soundMusic.GetPlaybackRate(); fPositionSeconds += (SOUND->GetPlayLatency()+(float)G_TICK_EARLY_SECONDS) * m_soundMusic.GetPlaybackRate();
float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds ); float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
@@ -935,7 +935,7 @@ void ScreenGameplay::Update( float fDeltaTime )
if( m_bFirstUpdate ) if( m_bFirstUpdate )
{ {
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay intro") ); // crowd cheer SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay intro") ); // crowd cheer
// //
// Get the transitions rolling // Get the transitions rolling
@@ -1217,7 +1217,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
(DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT) ) (DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT) )
{ {
m_DancingState = STATE_OUTRO; m_DancingState = STATE_OUTRO;
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common back") ); SOUND->PlayOnce( THEME->GetPathToS("Common back") );
/* Hmm. There are a bunch of subtly different ways we can /* Hmm. There are a bunch of subtly different ways we can
* tween out: * tween out:
* 1. Keep rendering the song, and keep it moving. This might * 1. Keep rendering the song, and keep it moving. This might
@@ -1575,7 +1575,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{ {
TweenOffScreen(); TweenOffScreen();
m_Extra.StartTransitioning( SM_GoToStateAfterCleared ); m_Extra.StartTransitioning( SM_GoToStateAfterCleared );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay extra") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay extra") );
} }
else else
{ {
@@ -1603,7 +1603,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
break; break;
} }
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
} }
} }
} }
@@ -1802,7 +1802,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
SET_XY( m_textSurviveTime ); SET_XY( m_textSurviveTime );
} }
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") );
break; break;
case SM_GoToScreenAfterFail: case SM_GoToScreenAfterFail:
stepmania/src/ScreenGameplayOptions.cpp
+2 -2
View File
@@ -13,7 +13,7 @@
#include "ScreenGameplayOptions.h" #include "ScreenGameplayOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
@@ -54,7 +54,7 @@ ScreenGameplayOptions::ScreenGameplayOptions() :
false, true ); false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") );
} }
void ScreenGameplayOptions::ImportOptions() void ScreenGameplayOptions::ImportOptions()
stepmania/src/ScreenGraphicOptions.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "ScreenGraphicOptions.h" #include "ScreenGraphicOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
@@ -68,7 +68,7 @@ ScreenGraphicOptions::ScreenGraphicOptions() :
false, true ); false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenGraphicOptions music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenGraphicOptions music") );
} }
void ScreenGraphicOptions::ImportOptions() void ScreenGraphicOptions::ImportOptions()
stepmania/src/ScreenInputOptions.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "ScreenInputOptions.h" #include "ScreenInputOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
@@ -57,7 +57,7 @@ ScreenInputOptions::ScreenInputOptions() :
false, true ); false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenInputOptions music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenInputOptions music") );
} }
void ScreenInputOptions::ImportOptions() void ScreenInputOptions::ImportOptions()
stepmania/src/ScreenInstructions.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "ScreenInstructions.h" #include "ScreenInstructions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "RageLog.h" #include "RageLog.h"
@@ -72,7 +72,7 @@ ScreenInstructions::ScreenInstructions() : Screen("ScreenInstructions")
m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE ); m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE );
m_sprHowToPlay.SetX( CENTER_X ); m_sprHowToPlay.SetX( CENTER_X );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenInstructions music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenInstructions music") );
} }
ScreenInstructions::~ScreenInstructions() ScreenInstructions::~ScreenInstructions()
stepmania/src/ScreenJukebox.cpp
+3 -2
View File
@@ -18,6 +18,7 @@
#include "StepMania.h" #include "StepMania.h"
#include "SDL_utils.h" #include "SDL_utils.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageSounds.h"
@@ -188,10 +189,10 @@ void ScreenJukebox::Input( const DeviceInput& DeviceI, const InputEventType type
// fall through // fall through
case COIN_HOME: case COIN_HOME:
case COIN_FREE: case COIN_FREE:
SOUNDMAN->StopMusic(); SOUND->StopMusic();
/* We already played the it was a coin was inserted. Don't play it again. */ /* We already played the it was a coin was inserted. Don't play it again. */
if( MenuI.button != MENU_BUTTON_COIN ) if( MenuI.button != MENU_BUTTON_COIN )
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common coin") ); SOUND->PlayOnce( THEME->GetPathToS("Common coin") );
SDL_Delay( 800 ); // do a little pause, like the arcade does SDL_Delay( 800 ); // do a little pause, like the arcade does
SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break; break;
stepmania/src/ScreenJukeboxMenu.cpp
+5 -5
View File
@@ -19,7 +19,7 @@
#include "GameManager.h" #include "GameManager.h"
#include "RageLog.h" #include "RageLog.h"
#include "GameState.h" #include "GameState.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "ScreenJukebox.h" #include "ScreenJukebox.h"
@@ -55,7 +55,7 @@ ScreenJukeboxMenu::ScreenJukeboxMenu() : Screen("ScreenJukeboxMenu")
m_soundInvalid.Load( THEME->GetPathToS("Common invalid") ); m_soundInvalid.Load( THEME->GetPathToS("Common invalid") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenJukeboxMenu music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenJukeboxMenu music") );
} }
@@ -140,8 +140,8 @@ void ScreenJukeboxMenu::MenuStart( PlayerNumber pn )
} }
SOUNDMAN->StopMusic(); SOUND->StopMusic();
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
m_Menu.StartTransitioning( SM_GoToNextScreen ); m_Menu.StartTransitioning( SM_GoToNextScreen );
} }
@@ -149,5 +149,5 @@ void ScreenJukeboxMenu::MenuBack( PlayerNumber pn )
{ {
m_Menu.StartTransitioning( SM_GoToPrevScreen ); m_Menu.StartTransitioning( SM_GoToPrevScreen );
SOUNDMAN->StopMusic(); SOUND->StopMusic();
} }
stepmania/src/ScreenMachineOptions.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "ScreenMachineOptions.h" #include "ScreenMachineOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
@@ -63,7 +63,7 @@ ScreenMachineOptions::ScreenMachineOptions() :
false, true ); false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") );
} }
void ScreenMachineOptions::ImportOptions() void ScreenMachineOptions::ImportOptions()
stepmania/src/ScreenMapControllers.cpp
+4 -4
View File
@@ -19,7 +19,7 @@
#include "InputMapper.h" #include "InputMapper.h"
#include "GameManager.h" #include "GameManager.h"
#include "GameState.h" #include "GameState.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -102,7 +102,7 @@ ScreenMapControllers::ScreenMapControllers() : Screen("ScreenMapControllers")
m_Menu.Load( "ScreenMapControllers", false ); // no timer m_Menu.Load( "ScreenMapControllers", false ); // no timer
this->AddChild( &m_Menu ); this->AddChild( &m_Menu );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") );
Refresh(); Refresh();
} }
@@ -150,7 +150,7 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy
if ( DeviceI.device == DEVICE_KEYBOARD && (DeviceI.button >= SDLK_F1 && DeviceI.button <= SDLK_F12) ) if ( DeviceI.device == DEVICE_KEYBOARD && (DeviceI.button >= SDLK_F1 && DeviceI.button <= SDLK_F12) )
{ {
m_textError.SetText( "That key can not be mapped." ); m_textError.SetText( "That key can not be mapped." );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common invalid" ) ); SOUND->PlayOnce( THEME->GetPathToS("Common invalid" ) );
m_textError.StopTweening(); m_textError.StopTweening();
m_textError.SetDiffuse( RageColor(0,1,0,1) ); m_textError.SetDiffuse( RageColor(0,1,0,1) );
m_textError.BeginTweening( 3 ); m_textError.BeginTweening( 3 );
@@ -250,7 +250,7 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy
case SDLK_ESCAPE: /* Quit the screen. */ case SDLK_ESCAPE: /* Quit the screen. */
if(!m_Menu.IsTransitioning()) if(!m_Menu.IsTransitioning())
{ {
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
m_Menu.StartTransitioning( SM_GoToNextScreen ); m_Menu.StartTransitioning( SM_GoToNextScreen );
for( int b=0; b<GAMESTATE->GetCurrentGameDef()->m_iButtonsPerController; b++ ) for( int b=0; b<GAMESTATE->GetCurrentGameDef()->m_iButtonsPerController; b++ )
m_Line[b].Command( (b%2)? ODD_LINE_OUT:EVEN_LINE_OUT ); m_Line[b].Command( (b%2)? ODD_LINE_OUT:EVEN_LINE_OUT );
stepmania/src/ScreenMiniMenu.cpp
+4 -4
View File
@@ -14,7 +14,7 @@
#include "ScreenMiniMenu.h" #include "ScreenMiniMenu.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -216,7 +216,7 @@ void ScreenMiniMenu::MenuStart( PlayerNumber pn )
{ {
m_Out.StartTransitioning( SM_GoToOK ); m_Out.StartTransitioning( SM_GoToOK );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
s_iLastLine = m_iCurLine; s_iLastLine = m_iCurLine;
COPY( s_iLastAnswers, m_iCurAnswers ); COPY( s_iLastAnswers, m_iCurAnswers );
@@ -233,7 +233,7 @@ void ScreenMiniMenu::BeforeLineChanged()
m_textAnswer[m_iCurLine].SetEffectNone(); m_textAnswer[m_iCurLine].SetEffectNone();
m_textLabel[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED ); m_textLabel[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED );
m_textAnswer[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED ); m_textAnswer[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED );
SOUNDMAN->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); SOUND->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") );
} }
void ScreenMiniMenu::AfterLineChanged() void ScreenMiniMenu::AfterLineChanged()
@@ -246,7 +246,7 @@ void ScreenMiniMenu::AfterLineChanged()
void ScreenMiniMenu::AfterAnswerChanged() void ScreenMiniMenu::AfterAnswerChanged()
{ {
SOUNDMAN->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); SOUND->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") );
int iAnswerInRow = m_iCurAnswers[m_iCurLine]; int iAnswerInRow = m_iCurAnswers[m_iCurLine];
CString sAnswerText = m_Def.rows[m_iCurLine].choices[iAnswerInRow]; CString sAnswerText = m_Def.rows[m_iCurLine].choices[iAnswerInRow];
m_textAnswer[m_iCurLine].SetText( sAnswerText ); m_textAnswer[m_iCurLine].SetText( sAnswerText );
stepmania/src/ScreenMusicScroll.cpp
+3 -2
View File
@@ -18,6 +18,7 @@
#include "RageLog.h" #include "RageLog.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "SongManager.h" #include "SongManager.h"
#include "RageSounds.h"
#include "GameState.h" #include "GameState.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
@@ -90,9 +91,9 @@ ScreenMusicScroll::ScreenMusicScroll() : Screen("ScreenMusicScroll")
m_Out.Load( THEME->GetPathToB("ScreenMusicScroll out") ); m_Out.Load( THEME->GetPathToB("ScreenMusicScroll out") );
// this->AddChild( &m_Out ); // draw and update manually // this->AddChild( &m_Out ); // draw and update manually
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenMusicScroll music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenMusicScroll music") );
} }
stepmania/src/ScreenNameEntry.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
#include "GameManager.h" #include "GameManager.h"
#include "RageLog.h" #include "RageLog.h"
#include "GameState.h" #include "GameState.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "ScreenRanking.h" #include "ScreenRanking.h"
#include "Course.h" #include "Course.h"
@@ -249,7 +249,7 @@ ScreenNameEntry::ScreenNameEntry() : Screen("ScreenNameEntry")
m_soundStep.Load( THEME->GetPathToS("ScreenNameEntry step") ); m_soundStep.Load( THEME->GetPathToS("ScreenNameEntry step") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenNameEntry music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenNameEntry music") );
m_fFakeBeat = 0; m_fFakeBeat = 0;
} }
stepmania/src/ScreenOptions.cpp
-1
View File
@@ -13,7 +13,6 @@
#include "ScreenOptions.h" #include "ScreenOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
stepmania/src/ScreenOptionsMenu.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "ScreenOptionsMenu.h" #include "ScreenOptionsMenu.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
@@ -68,7 +68,7 @@ ScreenOptionsMenu::ScreenOptionsMenu() :
false, true ); false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenOptionsMenu music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenOptionsMenu music") );
} }
/* We depend on the SM options navigation for this screen, not arcade. */ /* We depend on the SM options navigation for this screen, not arcade. */
stepmania/src/ScreenPlayerOptions.cpp
+3 -2
View File
@@ -17,6 +17,7 @@
#include "GameState.h" #include "GameState.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "RageSounds.h"
#include "NoteSkinManager.h" #include "NoteSkinManager.h"
#include "NoteFieldPositioning.h" #include "NoteFieldPositioning.h"
#include "ScreenSongOptions.h" #include "ScreenSongOptions.h"
@@ -97,7 +98,7 @@ ScreenPlayerOptions::ScreenPlayerOptions() :
m_bAcceptedChoices = false; m_bAcceptedChoices = false;
m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES ); m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
} }
@@ -399,7 +400,7 @@ void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventTyp
{ {
m_bGoToOptions = true; m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 ); m_sprOptionsMessage.SetState( 1 );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
} }
} }
stepmania/src/ScreenPrompt.cpp
+3 -3
View File
@@ -14,7 +14,7 @@
#include "ScreenPrompt.h" #include "ScreenPrompt.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -154,7 +154,7 @@ void ScreenPrompt::MenuRight( PlayerNumber pn )
m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() ); m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() );
m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f ); m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f );
SOUNDMAN->PlayOnce( THEME->GetPathToS("ScreenPrompt change") ); SOUND->PlayOnce( THEME->GetPathToS("ScreenPrompt change") );
} }
void ScreenPrompt::MenuStart( PlayerNumber pn ) void ScreenPrompt::MenuStart( PlayerNumber pn )
@@ -174,7 +174,7 @@ void ScreenPrompt::MenuStart( PlayerNumber pn )
m_textAnswer[1].BeginTweening( 0.2f ); m_textAnswer[1].BeginTweening( 0.2f );
m_textAnswer[1].SetDiffuse( RageColor(1,1,1,0) ); m_textAnswer[1].SetDiffuse( RageColor(1,1,1,0) );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
if( m_bAnswer ) if( m_bAnswer )
{ {
stepmania/src/ScreenRaveOptions.cpp
-1
View File
@@ -13,7 +13,6 @@
#include "ScreenRaveOptions.h" #include "ScreenRaveOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
stepmania/src/ScreenSelect.cpp
+6 -6
View File
@@ -14,7 +14,7 @@
#include "ScreenSelect.h" #include "ScreenSelect.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameManager.h" #include "GameManager.h"
@@ -83,8 +83,8 @@ void ScreenSelect::Update( float fDelta )
if(m_bFirstUpdate) if(m_bFirstUpdate)
{ {
/* Don't play sounds during the ctor, since derived classes havn't loaded yet. */ /* Don't play sounds during the ctor, since derived classes havn't loaded yet. */
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") );
SOUNDMAN->PlayMusic( THEME->GetPathToS(m_sName+" music") ); SOUND->PlayMusic( THEME->GetPathToS(m_sName+" music") );
} }
Screen::Update( fDelta ); Screen::Update( fDelta );
@@ -149,7 +149,7 @@ void ScreenSelect::Input( const DeviceInput& DeviceI, const InputEventType type,
} }
/* If credits had to be used, it's already taken care of.. add the player */ /* If credits had to be used, it's already taken care of.. add the player */
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
GAMESTATE->m_bSideIsJoined[pn] = true; GAMESTATE->m_bSideIsJoined[pn] = true;
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
this->UpdateSelectableChoices(); this->UpdateSelectableChoices();
@@ -193,7 +193,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
} }
break; break;
case SM_GoToPrevScreen: case SM_GoToPrevScreen:
SOUNDMAN->StopMusic(); SOUND->StopMusic();
SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break; break;
case SM_GoToNextScreen: case SM_GoToNextScreen:
@@ -207,7 +207,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
void ScreenSelect::MenuBack( PlayerNumber pn ) void ScreenSelect::MenuBack( PlayerNumber pn )
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
m_Menu.Back( SM_GoToPrevScreen ); m_Menu.Back( SM_GoToPrevScreen );
} }
stepmania/src/ScreenSelectCharacter.cpp
+3 -2
View File
@@ -13,6 +13,7 @@
#include "ScreenSelectCharacter.h" #include "ScreenSelectCharacter.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageSounds.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -111,9 +112,9 @@ ScreenSelectCharacter::ScreenSelectCharacter() : Screen("ScreenSelectCharacter")
m_soundChange.Load( THEME->GetPathToS("ScreenSelectCharacter change") ); m_soundChange.Load( THEME->GetPathToS("ScreenSelectCharacter change") );
m_soundSelect.Load( THEME->GetPathToS("Common start") ); m_soundSelect.Load( THEME->GetPathToS("Common start") );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectCharacter music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCharacter music") );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
stepmania/src/ScreenSelectCourse.cpp
+6 -6
View File
@@ -22,7 +22,7 @@
#include "InputQueue.h" #include "InputQueue.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "GameState.h" #include "GameState.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "CodeDetector.h" #include "CodeDetector.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "Course.h" #include "Course.h"
@@ -63,7 +63,7 @@ ScreenSelectCourse::ScreenSelectCourse() : Screen("ScreenSelectCourse")
CodeDetector::RefreshCacheItems(); CodeDetector::RefreshCacheItems();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") );
m_bMadeChoice = false; m_bMadeChoice = false;
m_bGoToOptions = false; m_bGoToOptions = false;
@@ -128,9 +128,9 @@ ScreenSelectCourse::ScreenSelectCourse() : Screen("ScreenSelectCourse")
m_soundChangeNotes.Load( THEME->GetPathToS("ScreenSelectCourse difficulty") ); m_soundChangeNotes.Load( THEME->GetPathToS("ScreenSelectCourse difficulty") );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course intro") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") );
UpdateOptionsDisplays(); UpdateOptionsDisplays();
@@ -332,7 +332,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn )
switch( m_MusicWheel.GetSelectedType() ) switch( m_MusicWheel.GetSelectedType() )
{ {
case TYPE_COURSE: case TYPE_COURSE:
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") );
TweenOffScreen(); TweenOffScreen();
@@ -392,7 +392,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn )
void ScreenSelectCourse::MenuBack( PlayerNumber pn ) void ScreenSelectCourse::MenuBack( PlayerNumber pn )
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
m_Menu.Back( SM_GoToPrevScreen ); m_Menu.Back( SM_GoToPrevScreen );
} }
stepmania/src/ScreenSelectDifficulty.cpp
+2 -1
View File
@@ -13,6 +13,7 @@
#include "ScreenSelectDifficulty.h" #include "ScreenSelectDifficulty.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSounds.h"
#include "GameManager.h" #include "GameManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "GameState.h" #include "GameState.h"
@@ -301,7 +302,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
if(m_CurrentPage != PAGE_2 || !AnotherPlayerSelected) if(m_CurrentPage != PAGE_2 || !AnotherPlayerSelected)
{ {
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) );
m_soundSelect.Play(); m_soundSelect.Play();
} }
stepmania/src/ScreenSelectDifficultyEX.cpp
+2 -1
View File
@@ -16,6 +16,7 @@
#include "ModeChoice.h" #include "ModeChoice.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageLog.h" #include "RageLog.h"
#include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "ScreenSelectDifficultyEX.h" #include "ScreenSelectDifficultyEX.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -383,7 +384,7 @@ void ScreenSelectDifficultyEX::MenuStart( PlayerNumber pn )
m_sprDifficulty[e].SetDiffuse( RageColor(.5,.5,.5,1) ); m_sprDifficulty[e].SetDiffuse( RageColor(.5,.5,.5,1) );
} }
} }
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.name)) );
m_soundSelect.Play(); m_soundSelect.Play();
} }
stepmania/src/ScreenSelectGame.cpp
+2 -2
View File
@@ -10,7 +10,7 @@
*/ */
#include "ScreenSelectGame.h" #include "ScreenSelectGame.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageLog.h" #include "RageLog.h"
@@ -58,7 +58,7 @@ ScreenSelectGame::ScreenSelectGame() :
false, true ); false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectGame music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGame music") );
} }
void ScreenSelectGame::ImportOptions() void ScreenSelectGame::ImportOptions()
stepmania/src/ScreenSelectGroup.cpp
+5 -5
View File
@@ -20,7 +20,7 @@
#include "SongManager.h" #include "SongManager.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "GameState.h" #include "GameState.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include <map> #include <map>
#include "ActorUtil.h" #include "ActorUtil.h"
@@ -139,9 +139,9 @@ ScreenSelectGroup::ScreenSelectGroup() : Screen("ScreenSelectGroup")
m_soundChange.Load( THEME->GetPathToS("ScreenSelectGroup change") ); m_soundChange.Load( THEME->GetPathToS("ScreenSelectGroup change") );
m_soundSelect.Load( THEME->GetPathToS("Common start") ); m_soundSelect.Load( THEME->GetPathToS("Common start") );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") );
AfterChange(); AfterChange();
TweenOnScreen(); TweenOnScreen();
@@ -256,9 +256,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn )
GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() ); GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() );
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC ) if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") );
else else
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") );
TweenOffScreen(); TweenOffScreen();
stepmania/src/ScreenSelectMaster.cpp
+2 -1
View File
@@ -15,6 +15,7 @@
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameManager.h" #include "GameManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "RageSounds.h"
#include "GameState.h" #include "GameState.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "ModeChoice.h" #include "ModeChoice.h"
@@ -410,7 +411,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
if(GetCurrentPage() != PAGE_2 || !AnotherPlayerSelected) if(GetCurrentPage() != PAGE_2 || !AnotherPlayerSelected)
{ {
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectMaster comment %s",mc.name)) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectMaster comment %s",mc.name)) );
m_soundSelect.Play(); m_soundSelect.Play();
} }
stepmania/src/ScreenSelectMode.cpp
-1
View File
@@ -12,7 +12,6 @@ Chris Danford
#include "ScreenSelectMode.h" #include "ScreenSelectMode.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSoundManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameManager.h" #include "GameManager.h"
stepmania/src/ScreenSelectMusic.cpp
+13 -13
View File
@@ -16,7 +16,7 @@
#include "PrefsManager.h" #include "PrefsManager.h"
#include "SongManager.h" #include "SongManager.h"
#include "GameManager.h" #include "GameManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageLog.h" #include "RageLog.h"
@@ -240,7 +240,7 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic")
m_soundOptionsChange.Load( THEME->GetPathToS("ScreenSelectMusic options") ); m_soundOptionsChange.Load( THEME->GetPathToS("ScreenSelectMusic options") );
m_soundLocked.Load( THEME->GetPathToS("ScreenSelectMusic locked") ); m_soundLocked.Load( THEME->GetPathToS("ScreenSelectMusic locked") );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") );
m_bMadeChoice = false; m_bMadeChoice = false;
m_bGoToOptions = false; m_bGoToOptions = false;
@@ -501,7 +501,7 @@ void ScreenSelectMusic::Update( float fDeltaTime )
{ {
if( !m_sSampleMusicToPlay.empty() ) if( !m_sSampleMusicToPlay.empty() )
{ {
SOUNDMAN->PlayMusic( SOUND->PlayMusic(
m_sSampleMusicToPlay, m_sSampleMusicToPlay,
true, true,
m_fSampleStartSeconds, m_fSampleStartSeconds,
@@ -561,7 +561,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
m_bGoToOptions = true; m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 ); m_sprOptionsMessage.SetState( 1 );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
return; return;
} }
@@ -710,7 +710,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
else else
{ {
GAMESTATE->AdjustFailType(); GAMESTATE->AdjustFailType();
SOUNDMAN->StopMusic(); SOUND->StopMusic();
SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) ); SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) );
} }
break; break;
@@ -765,11 +765,11 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
} }
if( bIsNew ) if( bIsNew )
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") );
else if( bIsHard ) else if( bIsHard )
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") );
else else
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") );
m_bMadeChoice = true; m_bMadeChoice = true;
@@ -782,7 +782,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
} }
case TYPE_COURSE: case TYPE_COURSE:
{ {
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") );
Course *pCourse = m_MusicWheel.GetSelectedCourse(); Course *pCourse = m_MusicWheel.GetSelectedCourse();
ASSERT( pCourse ); ASSERT( pCourse );
@@ -852,7 +852,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
void ScreenSelectMusic::MenuBack( PlayerNumber pn ) void ScreenSelectMusic::MenuBack( PlayerNumber pn )
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
m_Menu.Back( SM_GoToPrevScreen ); m_Menu.Back( SM_GoToPrevScreen );
} }
@@ -1079,10 +1079,10 @@ void ScreenSelectMusic::AfterMusicChange()
// Don't stop music if it's already playing the right file. // Don't stop music if it's already playing the right file.
if( SampleMusicToPlay == "" ) if( SampleMusicToPlay == "" )
SOUNDMAN->StopMusic(); SOUND->StopMusic();
else if( SOUNDMAN->GetMusicPath() != SampleMusicToPlay ) else if( SOUND->GetMusicPath() != SampleMusicToPlay )
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
m_sSampleMusicToPlay = SampleMusicToPlay; m_sSampleMusicToPlay = SampleMusicToPlay;
m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY; m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY;
} }
stepmania/src/ScreenSelectStyle.cpp
+2 -1
View File
@@ -12,6 +12,7 @@
#include "ScreenSelectStyle.h" #include "ScreenSelectStyle.h"
#include "GameManager.h" #include "GameManager.h"
#include "RageSounds.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
@@ -181,7 +182,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 ); SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 );
const ModeChoice& mc = m_aModeChoices[GetSelectionIndex(pn)]; const ModeChoice& mc = m_aModeChoices[GetSelectionIndex(pn)];
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectStyle comment %s",mc.name)) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectStyle comment %s",mc.name)) );
// //
// TweenOffScreen // TweenOffScreen
stepmania/src/ScreenSelectStyle5th.cpp
+10 -10
View File
@@ -14,7 +14,7 @@
#include "ScreenSelectStyle5th.h" #include "ScreenSelectStyle5th.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameManager.h" #include "GameManager.h"
@@ -186,9 +186,9 @@ ScreenSelectStyle5th::ScreenSelectStyle5th() : Screen("ScreenSelectStyle5th")
m_soundChange.Load( THEME->GetPathToG("ScreenSelectStyle5th change") ); m_soundChange.Load( THEME->GetPathToG("ScreenSelectStyle5th change") );
m_soundSelect.Load( THEME->GetPathToS("Common start") ); m_soundSelect.Load( THEME->GetPathToS("Common start") );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSelectStyle5th music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectStyle5th music") );
m_soundChange.PlayRandom(); m_soundChange.PlayRandom();
TweenOnScreen(); TweenOnScreen();
@@ -228,7 +228,7 @@ void ScreenSelectStyle5th::HandleScreenMessage( const ScreenMessage SM )
MenuStart(PLAYER_1); MenuStart(PLAYER_1);
break; break;
case SM_GoToPrevScreen: case SM_GoToPrevScreen:
SOUNDMAN->StopMusic(); SOUND->StopMusic();
SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break; break;
case SM_GoToNextScreen: case SM_GoToNextScreen:
@@ -285,11 +285,11 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn )
CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName;
sCurStyleName.MakeLower(); sCurStyleName.MakeLower();
if( -1!=sCurStyleName.Find("single") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment single") ); if( -1!=sCurStyleName.Find("single") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment single") );
else if( -1!=sCurStyleName.Find("versus") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment versus") ); else if( -1!=sCurStyleName.Find("versus") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("ScreenSelectStyle5th comment versus") );
else if( -1!=sCurStyleName.Find("double") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") ); else if( -1!=sCurStyleName.Find("double") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") );
else if( -1!=sCurStyleName.Find("couple") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); else if( -1!=sCurStyleName.Find("couple") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") );
else if( -1!=sCurStyleName.Find("solo") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); else if( -1!=sCurStyleName.Find("solo") ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") );
this->ClearMessageQueue(); this->ClearMessageQueue();
@@ -300,7 +300,7 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn )
void ScreenSelectStyle5th::MenuBack( PlayerNumber pn ) void ScreenSelectStyle5th::MenuBack( PlayerNumber pn )
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
m_Menu.Back( SM_GoToPrevScreen ); m_Menu.Back( SM_GoToPrevScreen );
} }
stepmania/src/ScreenSongOptions.cpp
-1
View File
@@ -12,7 +12,6 @@
#include "ScreenSongOptions.h" #include "ScreenSongOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "RageLog.h" #include "RageLog.h"
stepmania/src/ScreenSoundOptions.cpp
+2 -1
View File
@@ -14,6 +14,7 @@
#include "ScreenSoundOptions.h" #include "ScreenSoundOptions.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSoundManager.h"
#include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
@@ -46,7 +47,7 @@ ScreenSoundOptions::ScreenSoundOptions() :
Init( INPUTMODE_BOTH, g_SoundOptionsLines, NUM_SOUND_OPTIONS_LINES, false, true ); Init( INPUTMODE_BOTH, g_SoundOptionsLines, NUM_SOUND_OPTIONS_LINES, false, true );
m_Menu.m_MenuTimer.Disable(); m_Menu.m_MenuTimer.Disable();
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenSoundOptions music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSoundOptions music") );
} }
void ScreenSoundOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) void ScreenSoundOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
stepmania/src/ScreenStage.cpp
+14 -14
View File
@@ -20,7 +20,7 @@
#include "Sprite.h" #include "Sprite.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "GameState.h" #include "GameState.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -54,7 +54,7 @@ enum StageMode
ScreenStage::ScreenStage() : Screen("ScreenStage") ScreenStage::ScreenStage() : Screen("ScreenStage")
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenStage "+GAMESTATE->GetStageText()) ); m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenStage "+GAMESTATE->GetStageText()) );
this->AddChild( &m_Background ); this->AddChild( &m_Background );
@@ -98,7 +98,7 @@ ScreenStage::ScreenStage() : Screen("ScreenStage")
//else stage_mode = MODE_NORMAL; //else stage_mode = MODE_NORMAL;
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+GAMESTATE->GetStageText()) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+GAMESTATE->GetStageText()) );
// switch( stage_mode ) // switch( stage_mode )
// { // {
@@ -108,21 +108,21 @@ ScreenStage::ScreenStage() : Screen("ScreenStage")
// switch( iStageNo ) // switch( iStageNo )
// { // {
// case 1: break; // case 1: break;
// case 2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 2") ); break; // case 2: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 2") ); break;
// case 3: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 3") ); break; // case 3: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 3") ); break;
// case 4: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 4") ); break; // case 4: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 4") ); break;
// case 5: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 5") ); break; // case 5: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 5") ); break;
// case 6: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 6") ); break; // case 6: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 6") ); break;
// default: ; break; // play nothing // default: ; break; // play nothing
// } // }
// } // }
// break; // break;
// case MODE_FINAL: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage final") ); break; // case MODE_FINAL: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage final") ); break;
// case MODE_EXTRA1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break; // case MODE_EXTRA1: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break;
// case MODE_EXTRA2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break; // case MODE_EXTRA2: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break;
// case MODE_NONSTOP: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage nonstop") ); break; // case MODE_NONSTOP: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage nonstop") ); break;
// case MODE_ONI: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage oni") ); break; // case MODE_ONI: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage oni") ); break;
// case MODE_ENDLESS: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage endless") ); break; // case MODE_ENDLESS: SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage endless") ); break;
// default: ASSERT(0); // default: ASSERT(0);
// } // }
// //
stepmania/src/ScreenStyleSplash.cpp
+3 -3
View File
@@ -13,7 +13,7 @@
#include "ScreenStyleSplash.h" #include "ScreenStyleSplash.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "GameState.h" #include "GameState.h"
@@ -30,7 +30,7 @@ const ScreenMessage SM_StartClosing = ScreenMessage(SM_User-8);
ScreenStyleSplash::ScreenStyleSplash() : Screen("ScreenStyleSplash") ScreenStyleSplash::ScreenStyleSplash() : Screen("ScreenStyleSplash")
{ {
SOUNDMAN->StopMusic(); SOUND->StopMusic();
CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName; CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
CString sStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; CString sStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName;
@@ -97,7 +97,7 @@ void ScreenStyleSplash::MenuBack( PlayerNumber pn )
return; return;
this->ClearMessageQueue(); this->ClearMessageQueue();
m_Menu.Back( SM_GoToPrevScreen ); m_Menu.Back( SM_GoToPrevScreen );
SOUNDMAN->PlayOnce( THEME->GetPathToS("menu back") ); SOUND->PlayOnce( THEME->GetPathToS("menu back") );
} }
void ScreenStyleSplash::DrawPrimitives() void ScreenStyleSplash::DrawPrimitives()
stepmania/src/ScreenTest.cpp
+2 -1
View File
@@ -18,6 +18,7 @@
#include "ScreenTestSound.h" #include "ScreenTestSound.h"
#include "ScreenTestFonts.h" #include "ScreenTestFonts.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageSounds.h"
ScreenTest::~ScreenTest() ScreenTest::~ScreenTest()
@@ -43,7 +44,7 @@ ScreenTest::ScreenTest() : Screen("ScreenTest")
current = NULL; current = NULL;
cur_screen = -1; cur_screen = -1;
SOUNDMAN->StopMusic(); SOUND->StopMusic();
SetScreen(0); SetScreen(0);
} }
stepmania/src/ScreenTextEntry.cpp
+2 -2
View File
@@ -13,7 +13,7 @@
#include "ScreenTextEntry.h" #include "ScreenTextEntry.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "ScreenTitleMenu.h" #include "ScreenTitleMenu.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PrefsManager.h" #include "PrefsManager.h"
@@ -204,7 +204,7 @@ void ScreenTextEntry::MenuStart( PlayerNumber pn )
m_textAnswer.BeginTweening( 0.2f ); m_textAnswer.BeginTweening( 0.2f );
m_textAnswer.SetDiffuse( RageColor(1,1,1,0) ); m_textAnswer.SetDiffuse( RageColor(1,1,1,0) );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") ); SOUND->PlayOnce( THEME->GetPathToS("Common start") );
if( m_bCancelled ) { if( m_bCancelled ) {
if( m_pOnCancel ) m_pOnCancel(); if( m_pOnCancel ) m_pOnCancel();
stepmania/src/ScreenTitleMenu.cpp
+3 -3
View File
@@ -25,7 +25,7 @@
#include "InputMapper.h" #include "InputMapper.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "SDL_utils.h" #include "SDL_utils.h"
#include "RageSoundManager.h" #include "RageSounds.h"
#include "CodeDetector.h" #include "CodeDetector.h"
#include "RageTextureManager.h" #include "RageTextureManager.h"
#include "UnlockSystem.h" #include "UnlockSystem.h"
@@ -136,7 +136,7 @@ ScreenTitleMenu::ScreenTitleMenu() : Screen("ScreenTitleMenu")
this->AddChild( &m_BeginOut ); this->AddChild( &m_BeginOut );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") );
m_soundAttract.Load( ANNOUNCER->GetPathTo("title menu attract") ); m_soundAttract.Load( ANNOUNCER->GetPathTo("title menu attract") );
@@ -150,7 +150,7 @@ ScreenTitleMenu::ScreenTitleMenu() : Screen("ScreenTitleMenu")
LoseFocus( i ); LoseFocus( i );
GainFocus( m_Choice ); GainFocus( m_Choice );
SOUNDMAN->PlayMusic( THEME->GetPathToS("ScreenTitleMenu music") ); SOUND->PlayMusic( THEME->GetPathToS("ScreenTitleMenu music") );
this->PostScreenMessage( SM_PlayComment, SECONDS_BETWEEN_COMMENTS); this->PostScreenMessage( SM_PlayComment, SECONDS_BETWEEN_COMMENTS);
stepmania/src/StepMania.cpp
+1 -1
View File
@@ -620,7 +620,7 @@ bool HandleGlobalInputs( DeviceInput DeviceI, InputEventType type, GameInput Gam
break; break;
GAMESTATE->m_iCoins++; GAMESTATE->m_iCoins++;
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common coin") ); SOUND->PlayOnce( THEME->GetPathToS("Common coin") );
return false; // Attract need to know because they go to TitleMenu on > 1 credit return false; // Attract need to know because they go to TitleMenu on > 1 credit
} }