diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 41608c997e..d46c861d24 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -432,7 +432,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti m_textExplanation[p].SetXY( EXPLANATION_X(p), EXPLANATION_Y(p) ); } break; - case INPUTMODE_TOGETHER: + case INPUTMODE_SHARE_CURSOR: m_textExplanation[0].SetXY( EXPLANATION_TOGETHER_X, EXPLANATION_TOGETHER_Y ); break; default: @@ -990,7 +990,7 @@ void ScreenOptions::PositionItems() } const bool BothPlayersActivated = GAMESTATE->IsHumanPlayer(PLAYER_1) && GAMESTATE->IsHumanPlayer(PLAYER_2); - if( m_InputMode == INPUTMODE_TOGETHER || !BothPlayersActivated ) + if( m_InputMode == INPUTMODE_SHARE_CURSOR || !BothPlayersActivated ) { /* Simply center the cursor. */ first_start = max( P1Choice - halfsize, 0 ); @@ -1132,7 +1132,7 @@ void ScreenOptions::OnChange( PlayerNumber pn ) pText->SetText( text ); } break; - case INPUTMODE_TOGETHER: + case INPUTMODE_SHARE_CURSOR: pText = &m_textExplanation[0]; if( pText->GetText() != text ) { @@ -1312,7 +1312,7 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat ) { row.m_iChoiceWithFocus[pn] = iNewChoiceWithFocus; - if( m_InputMode == INPUTMODE_TOGETHER ) + if( m_InputMode == INPUTMODE_SHARE_CURSOR ) { // lock focus together FOREACH_HumanPlayer( pn ) diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index cdb443a329..fc1bd394df 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -46,7 +46,7 @@ struct OptionRowData enum InputMode { INPUTMODE_INDIVIDUAL, // each player controls their own cursor - INPUTMODE_TOGETHER // both players control the same cursor + INPUTMODE_SHARE_CURSOR // both players control the same cursor }; diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 8c7c9eedb9..db7656c3ce 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -232,7 +232,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ): Flags[i].MakeLower(); if( Flags[i] == "together" ) - im = INPUTMODE_TOGETHER; + im = INPUTMODE_SHARE_CURSOR; if( Flags[i] == "explanations" ) Explanations = true; if( Flags[i] == "forceallplayers" ) diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 5dc04f5d40..a2fa32798b 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -78,7 +78,7 @@ ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions g_ProfileOptionsLines[PO_OS_MOUNT_2].choices[0] = PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_2]; Init( - INPUTMODE_TOGETHER, + INPUTMODE_SHARE_CURSOR, g_ProfileOptionsLines, NUM_PROFILE_OPTIONS_LINES );