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

Ez2dancer now supports player 2

Browse Source
This commit is contained in:
Andrew Livy
2002-07-15 23:53:13 +00:00
parent e6590c9836
commit 275c325108
5 changed files with 180 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ArrowEffects.cpp
+7 -3
View File
@@ -47,14 +47,18 @@ float ArrowGetXPos( const PlayerOptions& po, int iColNum, float fYOffset, float
if ( GAMEMAN->m_CurGame == GAME_EZ2 ) if ( GAMEMAN->m_CurGame == GAME_EZ2 )
{ {
fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE / 1.3f; 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; 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 ) switch( po.m_EffectType )
stepmania/src/GameConstantsAndTypes.h
+4 -4
View File
@@ -222,8 +222,8 @@ inline NotesType StringToNotesType( CString sNotesType )
else if( sNotesType == "ez2-single" ) return NOTES_TYPE_EZ2_SINGLE; else if( sNotesType == "ez2-single" ) return NOTES_TYPE_EZ2_SINGLE;
else if( sNotesType == "ez2-double" ) return NOTES_TYPE_EZ2_DOUBLE; 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" ) return NOTES_TYPE_EZ2_REAL;
else if( sNotesType == "ez2-real-versus" ) return NOTES_TYPE_EZ2_REAL_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 if( sNotesType == "ez2-single-versus" ) return NOTES_TYPE_EZ2_SINGLE_VERSUS;
else ASSERT(0); return NOTES_TYPE_DANCE_SINGLE; // invalid NotesType 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_SINGLE: return "ez2-single";
case NOTES_TYPE_EZ2_DOUBLE: return "ez2-double"; case NOTES_TYPE_EZ2_DOUBLE: return "ez2-double";
case NOTES_TYPE_EZ2_REAL: return "ez2-real"; case NOTES_TYPE_EZ2_REAL: return "ez2-real";
case NOTES_TYPE_EZ2_REAL_VERSUS: return "ez2-real-versus"; // case NOTES_TYPE_EZ2_REAL_VERSUS: return "ez2-real-versus";
case NOTES_TYPE_EZ2_SINGLE_VERSUS: return "ez2-single-versus"; // case NOTES_TYPE_EZ2_SINGLE_VERSUS: return "ez2-single-versus";
default: ASSERT(0); return ""; // invalid NotesType default: ASSERT(0); return ""; // invalid NotesType
} }
} }
stepmania/src/GameManager.cpp
+38 -38
View File
@@ -413,11 +413,11 @@ StyleDef g_StyleDefs[NUM_STYLES] =
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*1.0f }, { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*1.0f },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE { TRACK_1, INSTRUMENT_2, 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_2, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 },
}, },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // 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_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, -EZ2_COL_SPACING*2.5f },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, -EZ2_COL_SPACING*1.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_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, -EZ2_COL_SPACING*0.5f },
{ TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f }, { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f },
{ TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f }, { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f },
{ TRACK_8, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f }, { TRACK_8, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f },
{ TRACK_9, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f }, { TRACK_9, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f },
{ TRACK_10, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f }, { TRACK_10, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*4.5f }, // CHANGE THESE WHEN WE CAN SEE THE { 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_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, -EZ2_COL_SPACING*2.5f },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, -EZ2_COL_SPACING*1.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_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, -EZ2_COL_SPACING*0.5f },
{ TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f }, { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, +EZ2_COL_SPACING*0.5f },
{ TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f }, { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, +EZ2_COL_SPACING*1.5f },
{ TRACK_8, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f }, { TRACK_8, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*2.5f },
{ TRACK_9, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f }, { TRACK_9, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*3.5f },
{ TRACK_10, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f }, { TRACK_10, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*4.5f },
}, },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // 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 }, { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE { TRACK_1, INSTRUMENT_2, 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_2, INSTRUMENT_2, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_6, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 }, { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 },
{ TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 },
}, },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // 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 }, { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE { TRACK_1, INSTRUMENT_2, 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_2, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 }, { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 }, { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 },
}, },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
@@ -526,21 +526,21 @@ StyleDef g_StyleDefs[NUM_STYLES] =
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1 { // PLAYER_1
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE { 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_2, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*1 }, { TRACK_3, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, { TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*1 }, { TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*2 }, { TRACK_6, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 },
{ TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, { TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*3 }, // CHANGE THESE WHEN WE CAN SEE THE { TRACK_1, INSTRUMENT_2, 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_2, INSTRUMENT_2, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*2 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_LRLEFTHAND, -EZ2_COL_SPACING*1 }, { TRACK_3, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 }, { TRACK_4, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*1 }, { TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_6, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*2 }, { TRACK_6, INSTRUMENT_2, EZ2_BUTTON_LRRIGHTHAND, +EZ2_COL_SPACING*2 },
{ TRACK_7, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 }, { TRACK_7, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*3 },
}, },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
stepmania/src/ScreenEz2SelectPlayer.cpp
-5
View File
@@ -296,10 +296,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p )
else else
{ {
m_iSelectedStyle = 1; m_iSelectedStyle = 1;
//m_soundInvalid.PlayRandom();
//return;
} }
// GAMEMAN->m_sMasterPlayerNumber = p;
m_soundSelect.PlayRandom(); m_soundSelect.PlayRandom();
ez2_lasttimercheck[1] = TIMER->GetTimeSinceStart(); // start the timer for going to next state 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_iSelectedStyle = 2;
m_soundSelect.PlayRandom(); m_soundSelect.PlayRandom();
//m_soundInvalid.PlayRandom();
//return;
} }
TweenOffScreen(); TweenOffScreen();
stepmania/src/ScreenEz2SelectStyle.cpp
+131 -66
View File
@@ -317,24 +317,68 @@ void ScreenEz2SelectStyle::HandleScreenMessage( const ScreenMessage SM )
{ {
case SM_MenuTimer: case SM_MenuTimer:
// DOESNT SUPPORT PLAYER 2 YET! if (m_iSelectedPlayer == 2) // both players
if (m_iSelectedStyle == 0) // easy
{ {
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; // m_soundInvalid.PlayRandom();
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY; // 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; if (m_iSelectedStyle == 0) // easy
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM; {
} GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;
else if (m_iSelectedStyle == 2) // real if (m_iSelectedPlayer == 0)
{ {
GAMEMAN->m_CurStyle = STYLE_EZ2_REAL; PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY;
} }
else // club else
{ {
GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE; 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(); 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 ((m_iSelectedPlayer == 0 && p == PLAYER_2) || (m_iSelectedPlayer == 1 && p == PLAYER_1))
{ {
if (p == PLAYER_2) // CURRENTLY PLAYER 2 IS BROKEN //if (p == PLAYER_2) // CURRENTLY PLAYER 2 IS BROKEN
{ //{
m_soundInvalid.PlayRandom(); // m_soundInvalid.PlayRandom();
return; // return;
} //}
m_soundSelect.PlayRandom(); m_soundSelect.PlayRandom();
TweenPlyOffScreen(); TweenPlyOffScreen();
m_iSelectedPlayer = 2; // set to BOTH players now. m_iSelectedPlayer = 2; // set to BOTH players now.
@@ -689,8 +733,30 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p )
{ {
if (m_iSelectedPlayer == 2) // both players if (m_iSelectedPlayer == 2) // both players
{ {
m_soundInvalid.PlayRandom(); // m_soundInvalid.PlayRandom();
return; // 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 else
{ {
@@ -715,6 +781,7 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p )
else // club else // club
{ {
GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE; GAMEMAN->m_CurStyle = STYLE_EZ2_DOUBLE;
GAMEMAN->m_sMasterPlayerNumber = PLAYER_1;
//m_soundInvalid.PlayRandom(); //m_soundInvalid.PlayRandom();
//return; //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].SetHeight(SCREEN_HEIGHT * 1.7f); m_sprBackground[3].SetEffectSpinning(1.0f);
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);
}
} }
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);
}
} }
/************************************ /************************************