diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index 6ee116c784..86359a0fc7 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -37,6 +37,26 @@ float ArrowGetXPos( const PlayerOptions& po, int iColNum, float fYOffset, float float fColOffsetFromCenter = iColNum - (GAMEMAN->GetCurrentStyleDef()->m_iColsPerPlayer-1)/2.0f; float fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE; + // BUG OR FEATURE??? THIS IS WHERE THE REAL COLUMN PLACEMENT HAPPENS!!! + // GAMEMANAGER SITS AROUND ON ITS ASS DOING NOTHING + // + // As I know very little about this system, and as this is the only place I can think of that I + // can possibly change my arrow placements, Ez2dancer column setups will be here until + // somebody makes some other system. In the meantime, if it works, i'm using it. + + if ( GAMEMAN->m_CurGame == GAME_EZ2 ) + { + fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE / 1.3f; + if ( GAMEMAN->m_CurStyle == STYLE_EZ2_REAL ) // real gets MEGA squashed + { + fPixelOffsetFromCenter = fColOffsetFromCenter * ARROW_SIZE / 1.5f; + } + else if ( GAMEMAN->m_CurStyle == STYLE_EZ2_DOUBLE ) + { + fPixelOffsetFromCenter = (fColOffsetFromCenter + 2.9f) * ARROW_SIZE / 1.3f; + } + } + switch( po.m_EffectType ) { case PlayerOptions::EFFECT_DRUNK: diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 666153fd65..e7e7b137bd 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -98,7 +98,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() m_soundChange.Load( THEME->GetPathTo(SOUND_SELECT_STYLE_CHANGE) ); m_soundSelect.Load( THEME->GetPathTo(SOUND_MENU_START) ); - + m_soundInvalid.Load( THEME->GetPathTo(SOUND_MENU_INVALID) ); // SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_SELECT_STYLE_INTRO) ); @@ -289,7 +289,6 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p ) // figure out whether we should add a player into the fray or not if( GAMEMAN->m_sMasterPlayerNumber != PLAYER_2 && GAMEMAN->m_sMasterPlayerNumber != PLAYER_1 ) { - GAMEMAN->m_sMasterPlayerNumber = p; if (p == PLAYER_1) { m_iSelectedStyle = 0; @@ -297,7 +296,10 @@ 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 } @@ -305,6 +307,8 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p ) { m_iSelectedStyle = 2; m_soundSelect.PlayRandom(); + //m_soundInvalid.PlayRandom(); + //return; } TweenOffScreen(); diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h index 370d9c199e..046cd4c259 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.h +++ b/stepmania/src/ScreenEz2SelectPlayer.h @@ -49,4 +49,5 @@ private: RandomSample m_soundChange; RandomSample m_soundSelect; + RandomSample m_soundInvalid; }; diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp index 950e77df92..f72f6965d3 100644 --- a/stepmania/src/ScreenEz2SelectStyle.cpp +++ b/stepmania/src/ScreenEz2SelectStyle.cpp @@ -619,6 +619,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; + } m_soundSelect.PlayRandom(); TweenPlyOffScreen(); m_iSelectedPlayer = 2; // set to BOTH players now.