From 8c25a5bf86145db638ea8f5159b3baca482be1fb Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Wed, 10 Jul 2002 19:13:47 +0000 Subject: [PATCH] Ez2dancer Update. --- stepmania/src/GameManager.cpp | 18 +++++++++--------- stepmania/src/ScreenEz2SelectStyle.cpp | 18 +++++++++++------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 1ba9a9255b..0cd499c58f 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -47,7 +47,7 @@ int NUM_EZ2_BUTTONS = 8; const int DANCE_COL_SPACING = 64; const int DANCE_6PANEL_VERSUS_COL_SPACING = 54; const int PUMP_COL_SPACING = 60; -const int EZ2_COL_SPACING = 30; // CHANGE THIS LATER (Actually don't know colspaces yet) +const int EZ2_COL_SPACING = 20; // CHANGE THIS LATER (Actually don't know colspaces yet) GameDef g_GameDefs[NUM_GAMES] = { @@ -470,20 +470,20 @@ 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_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 }, }, }, diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp index 1cf4026cdc..f9c5308761 100644 --- a/stepmania/src/ScreenEz2SelectStyle.cpp +++ b/stepmania/src/ScreenEz2SelectStyle.cpp @@ -640,22 +640,26 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p ) if (m_iSelectedStyle == 0) // easy { GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; + PREFSMAN->m_PreferredDifficultyClass[p] = CLASS_EASY; } else if (m_iSelectedStyle == 1) // hard { - m_soundInvalid.PlayRandom(); - return; + // m_soundInvalid.PlayRandom(); + // return; + GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; + PREFSMAN->m_PreferredDifficultyClass[p] = CLASS_MEDIUM; } else if (m_iSelectedStyle == 2) // real { - // GAMEMAN->m_CurStyle = STYLE_EZ2_REAL; - m_soundInvalid.PlayRandom(); - return; + GAMEMAN->m_CurStyle = STYLE_EZ2_REAL; + //m_soundInvalid.PlayRandom(); + //return; } else // club { - m_soundInvalid.PlayRandom(); - return; + GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE; + //m_soundInvalid.PlayRandom(); + //return; } } m_soundSelect.PlayRandom();