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

SetPlayerBalance -> GetPlayerBalance

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-09 23:51:08 +00:00
parent 204d081b09
commit e141795020
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameSoundManager.cpp
+3 -3
View File
@@ -717,13 +717,13 @@ float GameSoundManager::GetPlayLatency() const
return SOUNDMAN->GetPlayLatency(); return SOUNDMAN->GetPlayLatency();
} }
void GameSoundManager::SetPlayerBalance( PlayerNumber pn, RageSoundParams &params ) float GameSoundManager::GetPlayerBalance( PlayerNumber pn )
{ {
/* If two players are active, play sounds on each players' side. */ /* If two players are active, play sounds on each players' side. */
if( GAMESTATE->GetNumPlayersEnabled() == 2 ) if( GAMESTATE->GetNumPlayersEnabled() == 2 )
params.m_Balance = (pn == PLAYER_1)? -1.0f:1.0f; return (pn == PLAYER_1)? -1.0f:1.0f;
else else
params.m_Balance = 0; return 0;
} }
stepmania/src/GameSoundManager.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
void HandleSongTimer( bool on=true ); void HandleSongTimer( bool on=true );
float GetFrameTimingAdjustment( float fDeltaTime ); float GetFrameTimingAdjustment( float fDeltaTime );
static void SetPlayerBalance( PlayerNumber pn, RageSoundParams &params ); static float GetPlayerBalance( PlayerNumber pn );
// Lua // Lua
void PushSelf( lua_State *L ); void PushSelf( lua_State *L );
stepmania/src/Player.cpp
+2 -2
View File
@@ -310,7 +310,7 @@ void Player::Init(
RageSoundParams p; RageSoundParams p;
GameSoundManager::SetPlayerBalance( pn, p ); p.m_Balance = GameSoundManager::GetPlayerBalance( pn );
m_soundMine.SetParams( p ); m_soundMine.SetParams( p );
m_soundAttackLaunch.SetParams( p ); m_soundAttackLaunch.SetParams( p );
@@ -466,7 +466,7 @@ void Player::Load()
m_vKeysounds.resize( pSong->m_vsKeysoundFile.size() ); m_vKeysounds.resize( pSong->m_vsKeysoundFile.size() );
RageSoundParams p; RageSoundParams p;
GameSoundManager::SetPlayerBalance( pn, p ); p.m_Balance = GameSoundManager::GetPlayerBalance( pn );
for( unsigned i=0; i<m_vKeysounds.size(); i++ ) for( unsigned i=0; i<m_vKeysounds.size(); i++ )
{ {
RString sKeysoundFilePath = sSongDir + pSong->m_vsKeysoundFile[i]; RString sKeysoundFilePath = sSongDir + pSong->m_vsKeysoundFile[i];