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

use SOUND->PlayOnceFromAnnouncer

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-12 20:11:36 +00:00
parent 5c41e31f60
commit f1fddd90d1
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+11 -12
View File
@@ -18,7 +18,6 @@
#include "GameManager.h"
#include "SongManager.h"
#include "RageLog.h"
#include "AnnouncerManager.h"
#include "LifeMeterBar.h"
#include "LifeMeterBattery.h"
#include "GameState.h"
@@ -1152,7 +1151,7 @@ void ScreenGameplay::PlayAnnouncer( CString type, float fSeconds )
return;
m_fTimeSinceLastDancingComment = 0;
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(type) );
SOUND->PlayOnceFromAnnouncer( type );
if( m_pCombinedLifeMeter )
m_pCombinedLifeMeter->OnTaunt();
@@ -1171,7 +1170,7 @@ void ScreenGameplay::Update( float fDeltaTime )
if( m_bFirstUpdate )
{
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay intro") ); // crowd cheer
SOUND->PlayOnceFromAnnouncer( "gameplay intro" ); // crowd cheer
//
// Get the transitions rolling
@@ -1909,17 +1908,17 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{
case SM_PlayReady:
m_Background.FadeToActualBrightness();
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay ready") );
SOUND->PlayOnceFromAnnouncer( "gameplay ready" );
m_Ready.StartTransitioning( SM_PlayGo );
break;
case SM_PlayGo:
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay here we go extra") );
SOUND->PlayOnceFromAnnouncer( "gameplay here we go extra" );
else if( GAMESTATE->IsFinalStage() )
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay here we go final") );
SOUND->PlayOnceFromAnnouncer( "gameplay here we go final" );
else
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay here we go normal") );
SOUND->PlayOnceFromAnnouncer( "gameplay here we go normal" );
m_Go.StartTransitioning( SM_None );
GAMESTATE->m_bPastHereWeGo = true;
@@ -2031,7 +2030,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{
TweenOffScreen();
m_Extra.StartTransitioning( SM_GoToStateAfterCleared );
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay extra") );
SOUND->PlayOnceFromAnnouncer( "gameplay extra" );
}
else
{
@@ -2059,7 +2058,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
break;
}
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
SOUND->PlayOnceFromAnnouncer( "gameplay cleared" );
}
}
@@ -2206,11 +2205,11 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
// Feels hackish. Feel free to make cleaner.
if( GAMESTATE->IsCourseMode() )
if( GAMESTATE->GetCourseSongIndex() > (int(m_apSongsQueue.size() / 2) - 1 ) )
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed halfway" ) );
SOUND->PlayOnceFromAnnouncer( "gameplay oni failed halfway" );
else
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed" ) );
SOUND->PlayOnceFromAnnouncer( "gameplay oni failed" );
else
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") );
SOUND->PlayOnceFromAnnouncer( "gameplay failed" );
break;
case SM_GoToScreenAfterFail:
stepmania/src/ScreenSelectDifficulty.cpp
+1 -1
View File
@@ -383,7 +383,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
static bool bPlaySelect = true;
if( bPlaySelect )
{
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.m_sName.c_str())) );
SOUND->PlayOnceFromAnnouncer( ssprintf("ScreenSelectDifficulty comment %s",mc.m_sName.c_str()) );
m_soundSelect.Play();
}
stepmania/src/ScreenSelectGroup.cpp
+3 -3
View File
@@ -141,7 +141,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : Screen( sClassName
m_soundChange.Load( THEME->GetPathToS("ScreenSelectGroup change") );
m_soundSelect.Load( THEME->GetPathToS("Common start") );
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
SOUND->PlayOnceFromAnnouncer( "select group intro" );
SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") );
@@ -260,9 +260,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn )
GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() );
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") );
SOUND->PlayOnceFromAnnouncer( "select group comment all music" );
else
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") );
SOUND->PlayOnceFromAnnouncer( "select group comment general" );
TweenOffScreen();
stepmania/src/ScreenTitleMenu.cpp
+2 -2
View File
@@ -169,7 +169,7 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam
// this->AddChild( &m_BeginOut );
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") );
SOUND->PlayOnceFromAnnouncer( "title menu game name" );
m_soundChange.Load( THEME->GetPathToS("ScreenTitleMenu change"),true );
@@ -337,7 +337,7 @@ void ScreenTitleMenu::HandleScreenMessage( const ScreenMessage SM )
switch( SM )
{
case SM_PlayComment:
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu attract") );
SOUND->PlayOnceFromAnnouncer( "title menu attract" );
this->PostScreenMessage( SM_PlayComment, SECONDS_BETWEEN_COMMENTS );
break;
case SM_GoToNextScreen: