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

rename MultiPlayer_1 -> MultiPlayer_P1 for consistency with Lua

Browse Source
This commit is contained in:
Chris Danford
2007-08-24 20:49:53 +00:00
parent bd9447ede4
commit 06212434a5
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+1 -1
View File
@@ -931,7 +931,7 @@ int GameState::GetCourseSongIndex() const
{ {
/* iSongsPlayed includes the current song, so it's 1-based; subtract one. */ /* iSongsPlayed includes the current song, so it's 1-based; subtract one. */
if( GAMESTATE->m_bMultiplayer ) if( GAMESTATE->m_bMultiplayer )
return STATSMAN->m_CurStageStats.m_multiPlayer[MultiPlayer_1].m_iSongsPlayed-1; return STATSMAN->m_CurStageStats.m_multiPlayer[MultiPlayer_P1].m_iSongsPlayed-1;
else else
return STATSMAN->m_CurStageStats.m_player[m_MasterPlayerNumber].m_iSongsPlayed-1; return STATSMAN->m_CurStageStats.m_player[m_MasterPlayerNumber].m_iSongsPlayed-1;
} }
stepmania/src/InputMapper.cpp
+1 -1
View File
@@ -988,7 +988,7 @@ MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id )
{ {
if( id == InputDevice_Invalid ) if( id == InputDevice_Invalid )
return MultiPlayer_Invalid; return MultiPlayer_Invalid;
return enum_add2( MultiPlayer_1, id - DEVICE_JOY1 ); return enum_add2( MultiPlayer_P1, id - DEVICE_JOY1 );
} }
GameButton InputScheme::ButtonNameToIndex( const RString &sButtonName ) const GameButton InputScheme::ButtonNameToIndex( const RString &sButtonName ) const
stepmania/src/PlayerNumber.h
+32 -32
View File
@@ -29,38 +29,38 @@ const PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
enum MultiPlayer enum MultiPlayer
{ {
MultiPlayer_1 = 0, MultiPlayer_P1 = 0,
MultiPlayer_2, MultiPlayer_P2,
MultiPlayer_3, MultiPlayer_P3,
MultiPlayer_4, MultiPlayer_P4,
MultiPlayer_5, MultiPlayer_P5,
MultiPlayer_6, MultiPlayer_P6,
MultiPlayer_7, MultiPlayer_P7,
MultiPlayer_8, MultiPlayer_P8,
MultiPlayer_9, MultiPlayer_P9,
MultiPlayer_10, MultiPlayer_P10,
MultiPlayer_11, MultiPlayer_P11,
MultiPlayer_12, MultiPlayer_P12,
MultiPlayer_13, MultiPlayer_P13,
MultiPlayer_14, MultiPlayer_P14,
MultiPlayer_15, MultiPlayer_P15,
MultiPlayer_16, MultiPlayer_P16,
MultiPlayer_17, MultiPlayer_P17,
MultiPlayer_18, MultiPlayer_P18,
MultiPlayer_19, MultiPlayer_P19,
MultiPlayer_20, MultiPlayer_P20,
MultiPlayer_21, MultiPlayer_P21,
MultiPlayer_22, MultiPlayer_P22,
MultiPlayer_23, MultiPlayer_P23,
MultiPlayer_24, MultiPlayer_P24,
MultiPlayer_25, MultiPlayer_P25,
MultiPlayer_26, MultiPlayer_P26,
MultiPlayer_27, MultiPlayer_P27,
MultiPlayer_28, MultiPlayer_P28,
MultiPlayer_29, MultiPlayer_P29,
MultiPlayer_30, MultiPlayer_P30,
MultiPlayer_31, MultiPlayer_P31,
MultiPlayer_32, MultiPlayer_P32,
NUM_MultiPlayer, // leave this at the end NUM_MultiPlayer, // leave this at the end
MultiPlayer_Invalid MultiPlayer_Invalid
}; };