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

Some respect for OOP. (MasterPlayerNumber)

Browse Source
This commit is contained in:
Jason Felds
2011-06-06 20:40:11 -04:00
parent 963cc9d4f1
commit 0a7b9ce170
33 changed files with 106 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenDebugOverlay.cpp
+3 -3
View File
@@ -598,8 +598,8 @@ class DebugLineAutoplay : public IDebugLine
virtual bool IsEnabled() { return GamePreferences::m_AutoPlay.Get() != PC_HUMAN; }
virtual void DoAndLog( RString &sMessageOut )
{
ASSERT( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID );
PlayerController pc = GAMESTATE->m_pPlayerState[GAMESTATE->m_MasterPlayerNumber]->m_PlayerController;
ASSERT( GAMESTATE->GetMasterPlayerNumber() != PLAYER_INVALID );
PlayerController pc = GAMESTATE->m_pPlayerState[GAMESTATE->GetMasterPlayerNumber()]->m_PlayerController;
bool bHoldingShift =
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) ) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT) );
@@ -639,7 +639,7 @@ class DebugLineAssist : public IDebugLine
virtual bool IsEnabled() { return GAMESTATE->m_SongOptions.GetSong().m_bAssistClap || GAMESTATE->m_SongOptions.GetSong().m_bAssistMetronome; }
virtual void DoAndLog( RString &sMessageOut )
{
ASSERT( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID );
ASSERT( GAMESTATE->GetMasterPlayerNumber() != PLAYER_INVALID );
bool bHoldingShift = INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) );
bool b;
if( bHoldingShift )