From 275c325108677f0978bd22594c63915445f4c20e Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Mon, 15 Jul 2002 23:53:13 +0000 Subject: [PATCH] Ez2dancer now supports player 2 --- stepmania/src/ArrowEffects.cpp | 10 +- stepmania/src/GameConstantsAndTypes.h | 8 +- stepmania/src/GameManager.cpp | 76 ++++----- stepmania/src/ScreenEz2SelectPlayer.cpp | 5 - stepmania/src/ScreenEz2SelectStyle.cpp | 197 ++++++++++++++++-------- 5 files changed, 180 insertions(+), 116 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index 86359a0fc7..a40dd01577 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -47,14 +47,18 @@ float ArrowGetXPos( const PlayerOptions& po, int iColNum, float fYOffset, float if ( GAMEMAN->m_CurGame == GAME_EZ2 ) { fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE / 1.3f; - if ( GAMEMAN->m_CurStyle == STYLE_EZ2_REAL ) // real gets MEGA squashed + if ( GAMEMAN->m_CurStyle == STYLE_EZ2_REAL || GAMEMAN->m_CurStyle == STYLE_EZ2_REAL_VERSUS ) // real gets MEGA squashed { - fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE / 1.5f; + fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE / 1.6f; } - else if ( GAMEMAN->m_CurStyle == STYLE_EZ2_DOUBLE ) + else if ( GAMEMAN->m_CurStyle == STYLE_EZ2_DOUBLE && GAMEMAN->m_sMasterPlayerNumber == PLAYER_1) { fPixelOffsetFromCenter = (fColOffsetFromCenter + 2.9f) * ARROW_SIZE / 1.3f; } + else if ( GAMEMAN->m_CurStyle == STYLE_EZ2_DOUBLE && GAMEMAN->m_sMasterPlayerNumber == PLAYER_2) + { + fPixelOffsetFromCenter = (fColOffsetFromCenter - 3.1f) * ARROW_SIZE / 1.3f; + } } switch( po.m_EffectType ) diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index b07076ed82..2411c95b1e 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -222,8 +222,8 @@ inline NotesType StringToNotesType( CString sNotesType ) else if( sNotesType == "ez2-single" ) return NOTES_TYPE_EZ2_SINGLE; else if( sNotesType == "ez2-double" ) return NOTES_TYPE_EZ2_DOUBLE; else if( sNotesType == "ez2-real" ) return NOTES_TYPE_EZ2_REAL; - else if( sNotesType == "ez2-real-versus" ) return NOTES_TYPE_EZ2_REAL_VERSUS; - else if( sNotesType == "ez2-single-versus" ) return NOTES_TYPE_EZ2_SINGLE_VERSUS; +// else if( sNotesType == "ez2-real-versus" ) return NOTES_TYPE_EZ2_REAL_VERSUS; +// else if( sNotesType == "ez2-single-versus" ) return NOTES_TYPE_EZ2_SINGLE_VERSUS; else ASSERT(0); return NOTES_TYPE_DANCE_SINGLE; // invalid NotesType } @@ -240,8 +240,8 @@ inline CString NotesTypeToString( NotesType nt ) case NOTES_TYPE_EZ2_SINGLE: return "ez2-single"; case NOTES_TYPE_EZ2_DOUBLE: return "ez2-double"; case NOTES_TYPE_EZ2_REAL: return "ez2-real"; - case NOTES_TYPE_EZ2_REAL_VERSUS: return "ez2-real-versus"; - case NOTES_TYPE_EZ2_SINGLE_VERSUS: return "ez2-single-versus"; + // case NOTES_TYPE_EZ2_REAL_VERSUS: return "ez2-real-versus"; + // case NOTES_TYPE_EZ2_SINGLE_VERSUS: return "ez2-single-versus"; default: ASSERT(0); return ""; // invalid NotesType } } diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 95acfbd94f..1e0d639a5b 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -413,11 +413,11 @@ StyleDef g_StyleDefs[NUM_STYLES] = { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*1.0f }, }, { // PLAYER_2 - { TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE - { TRACK_2, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!! - { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, - { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, - { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, + { TRACK_1, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE + { TRACK_2, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!! + { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, + { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, + { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; @@ -438,11 +438,11 @@ StyleDef g_StyleDefs[NUM_STYLES] = { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, -EZ2_COL_SPACING*2.5f }, { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, -EZ2_COL_SPACING*1.5f }, { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, -EZ2_COL_SPACING*0.5f }, - { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f }, - { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f }, - { TRACK_8, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f }, - { TRACK_9, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f }, - { TRACK_10, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f }, + { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f }, + { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f }, + { TRACK_8, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f }, + { TRACK_9, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f }, + { TRACK_10, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f }, }, { // PLAYER_2 { TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*4.5f }, // CHANGE THESE WHEN WE CAN SEE THE @@ -450,11 +450,11 @@ StyleDef g_StyleDefs[NUM_STYLES] = { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, -EZ2_COL_SPACING*2.5f }, { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, -EZ2_COL_SPACING*1.5f }, { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, -EZ2_COL_SPACING*0.5f }, - { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f }, - { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f }, - { TRACK_8, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f }, - { TRACK_9, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f }, - { TRACK_10, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f }, + { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f }, + { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f }, + { TRACK_8, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f }, + { TRACK_9, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f }, + { TRACK_10, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; @@ -478,13 +478,13 @@ StyleDef g_StyleDefs[NUM_STYLES] = { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, }, { // PLAYER_2 - { TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE - { TRACK_2, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!! - { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, - { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, - { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, - { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 }, - { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, + { TRACK_1, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE + { TRACK_2, INSTRUMENT_2, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!! + { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, + { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, + { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, + { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 }, + { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; @@ -506,11 +506,11 @@ StyleDef g_StyleDefs[NUM_STYLES] = { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE - { TRACK_2, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!! - { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, - { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, - { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, + { TRACK_1, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE + { TRACK_2, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!! + { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, + { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, + { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; @@ -526,21 +526,21 @@ StyleDef g_StyleDefs[NUM_STYLES] = { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 { TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE - { TRACK_2, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!! - { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*1 }, + { TRACK_2, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!! + { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, - { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*1 }, - { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*2 }, + { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, + { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 }, { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, }, { // PLAYER_2 - { TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE - { TRACK_2, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!! - { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*1 }, - { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, - { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*1 }, - { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*2 }, - { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, + { TRACK_1, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE + { TRACK_2, INSTRUMENT_2, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!! + { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, + { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, + { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, + { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 }, + { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 61c9782027..78ec32045a 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -296,10 +296,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p ) else { m_iSelectedStyle = 1; - //m_soundInvalid.PlayRandom(); - //return; } - // GAMEMAN->m_sMasterPlayerNumber = p; m_soundSelect.PlayRandom(); ez2_lasttimercheck[1] = TIMER->GetTimeSinceStart(); // start the timer for going to next state } @@ -307,8 +304,6 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p ) { m_iSelectedStyle = 2; m_soundSelect.PlayRandom(); - //m_soundInvalid.PlayRandom(); - //return; } TweenOffScreen(); diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp index e19e73e612..63f8b1ae95 100644 --- a/stepmania/src/ScreenEz2SelectStyle.cpp +++ b/stepmania/src/ScreenEz2SelectStyle.cpp @@ -317,24 +317,68 @@ void ScreenEz2SelectStyle::HandleScreenMessage( const ScreenMessage SM ) { case SM_MenuTimer: - // DOESNT SUPPORT PLAYER 2 YET! - if (m_iSelectedStyle == 0) // easy + if (m_iSelectedPlayer == 2) // both players { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; - PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY; + // m_soundInvalid.PlayRandom(); + // return; + + if (m_iSelectedStyle == 0) // easy + { + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_EASY; + } + else if (m_iSelectedStyle == 1) // hard + { + // m_soundInvalid.PlayRandom(); + // return; + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_MEDIUM; + } + else if (m_iSelectedStyle == 2) // real + { + GAMEMAN->m_CurStyle = STYLE_EZ2_REAL_VERSUS; + //m_soundInvalid.PlayRandom(); + //return; + } + } - else if (m_iSelectedStyle == 1) // hard + else { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; - PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM; - } - else if (m_iSelectedStyle == 2) // real - { - GAMEMAN->m_CurStyle = STYLE_EZ2_REAL; - } - else // club - { - GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE; + if (m_iSelectedStyle == 0) // easy + { + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; + if (m_iSelectedPlayer == 0) + { + PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY; + } + else + { + PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_EASY; + } + } + else if (m_iSelectedStyle == 1) // hard + { + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; + if (m_iSelectedPlayer == 0) + { + PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM; + } + else + { + PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_MEDIUM; + } + } + else if (m_iSelectedStyle == 2) // real + { + GAMEMAN->m_CurStyle = STYLE_EZ2_REAL; + } + else // club + { + GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE; + GAMEMAN->m_sMasterPlayerNumber = PLAYER_1; + } } m_soundSelect.PlayRandom(); @@ -667,11 +711,11 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p ) if ((m_iSelectedPlayer == 0 && p == PLAYER_2) || (m_iSelectedPlayer == 1 && p == PLAYER_1)) { - if (p == PLAYER_2) // CURRENTLY PLAYER 2 IS BROKEN - { - m_soundInvalid.PlayRandom(); - return; - } + //if (p == PLAYER_2) // CURRENTLY PLAYER 2 IS BROKEN + //{ + // m_soundInvalid.PlayRandom(); + // return; + //} m_soundSelect.PlayRandom(); TweenPlyOffScreen(); m_iSelectedPlayer = 2; // set to BOTH players now. @@ -689,8 +733,30 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p ) { if (m_iSelectedPlayer == 2) // both players { - m_soundInvalid.PlayRandom(); - return; + // m_soundInvalid.PlayRandom(); + // return; + + if (m_iSelectedStyle == 0 || m_iSelectedStyle == 3) // easy + { + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_EASY; + } + else if (m_iSelectedStyle == 1) // hard + { + // m_soundInvalid.PlayRandom(); + // return; + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM; + PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_MEDIUM; + } + else if (m_iSelectedStyle == 2) // real + { + GAMEMAN->m_CurStyle = STYLE_EZ2_REAL_VERSUS; + //m_soundInvalid.PlayRandom(); + //return; + } + } else { @@ -715,6 +781,7 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p ) else // club { GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE; + GAMEMAN->m_sMasterPlayerNumber = PLAYER_1; //m_soundInvalid.PlayRandom(); //return; } @@ -778,52 +845,50 @@ void ScreenEz2SelectStyle::AnimateGraphics() } } - if (m_iSelectedPlayer != 2) + if (m_iSelectedStyle == 0) // EASY background { - if (m_iSelectedStyle == 0) // EASY background - { - m_sprBackground[3].SetHeight(SCREEN_HEIGHT * 1.7f); - m_sprBackground[3].SetWidth(SCREEN_WIDTH * 1.7f); - m_sprBackground[3].SetEffectSpinning(1.0f); - } - else if (m_iSelectedStyle == 3) // CLUB background - { - m_sprBackground[3].SetHeight(0); - m_sprBackground[3].SetWidth(0); - m_sprBackground[3].SetEffectNone(); - m_sprBackground[2].SetHeight(SCREEN_HEIGHT * 3.3f); - m_sprBackground[2].SetWidth(SCREEN_WIDTH * 3.3f); - m_sprBackground[2].SetEffectSpinning(0.5f); - m_sprBackground[2].SetXY( CENTER_X, -250 ); - } - else if (m_iSelectedStyle == 2) // REAL background - { - m_sprBackground[3].SetHeight(0); - m_sprBackground[3].SetWidth(0); - m_sprBackground[3].SetEffectNone(); - m_sprBackground[2].SetHeight(0); - m_sprBackground[2].SetWidth(0); - m_sprBackground[2].SetEffectNone(); - m_sprBackground[1].SetHeight(SCREEN_HEIGHT * 1.7f); - m_sprBackground[1].SetWidth(SCREEN_WIDTH * 1.7f); - m_sprBackground[1].SetEffectSpinning(2.1f); - } - else if (m_iSelectedStyle == 1) // HARD background - { - m_sprBackground[3].SetHeight(0); - m_sprBackground[3].SetWidth(0); - m_sprBackground[3].SetEffectNone(); - m_sprBackground[2].SetHeight(0); - m_sprBackground[2].SetWidth(0); - m_sprBackground[2].SetEffectNone(); - m_sprBackground[1].SetHeight(0); - m_sprBackground[1].SetWidth(0); - m_sprBackground[1].SetEffectNone(); - m_sprBackground[0].SetHeight(SCREEN_HEIGHT * 1.7f); - m_sprBackground[0].SetWidth(SCREEN_WIDTH * 1.7f); - m_sprBackground[0].SetEffectSpinning(1.0f); - } + m_sprBackground[3].SetHeight(SCREEN_HEIGHT * 1.7f); + m_sprBackground[3].SetWidth(SCREEN_WIDTH * 1.7f); + m_sprBackground[3].SetEffectSpinning(1.0f); } + else if (m_iSelectedStyle == 3) // CLUB background + { + m_sprBackground[3].SetHeight(0); + m_sprBackground[3].SetWidth(0); + m_sprBackground[3].SetEffectNone(); + m_sprBackground[2].SetHeight(SCREEN_HEIGHT * 3.3f); + m_sprBackground[2].SetWidth(SCREEN_WIDTH * 3.3f); + m_sprBackground[2].SetEffectSpinning(0.5f); + m_sprBackground[2].SetXY( CENTER_X, -250 ); + } + else if (m_iSelectedStyle == 2) // REAL background + { + m_sprBackground[3].SetHeight(0); + m_sprBackground[3].SetWidth(0); + m_sprBackground[3].SetEffectNone(); + m_sprBackground[2].SetHeight(0); + m_sprBackground[2].SetWidth(0); + m_sprBackground[2].SetEffectNone(); + m_sprBackground[1].SetHeight(SCREEN_HEIGHT * 1.7f); + m_sprBackground[1].SetWidth(SCREEN_WIDTH * 1.7f); + m_sprBackground[1].SetEffectSpinning(2.1f); + } + else if (m_iSelectedStyle == 1) // HARD background + { + m_sprBackground[3].SetHeight(0); + m_sprBackground[3].SetWidth(0); + m_sprBackground[3].SetEffectNone(); + m_sprBackground[2].SetHeight(0); + m_sprBackground[2].SetWidth(0); + m_sprBackground[2].SetEffectNone(); + m_sprBackground[1].SetHeight(0); + m_sprBackground[1].SetWidth(0); + m_sprBackground[1].SetEffectNone(); + m_sprBackground[0].SetHeight(SCREEN_HEIGHT * 1.7f); + m_sprBackground[0].SetWidth(SCREEN_WIDTH * 1.7f); + m_sprBackground[0].SetEffectSpinning(1.0f); + } + } /************************************