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

Remove duplicate code

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-26 22:37:38 +00:00
parent 8610d7050f
commit e97b5fe587
1 changed files with 3 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+3 -56
View File
@@ -95,65 +95,12 @@ void ScreenSelect::Input( const DeviceInput& DeviceI, const InputEventType type,
{
// LOG->Trace( "ScreenSelect::Input()" );
if( MenuI.IsValid() && MenuI.button==MENU_BUTTON_START )
if( Screen::JoinInput(DeviceI, type, GameI, MenuI, StyleI) )
{
PlayerNumber pn = MenuI.player;
if( GAMESTATE->m_bPlayersCanJoin )
{
if( pn!=PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] )
{
/* I think JP should allow playing two-pad singleplayer modes (doubles),
* but not two-pad two-player modes (battle). (Battle mode isn't "joint".)
* That means we should leave player-entry logic alone and simply enable
* couples mode if JP is on and only one person has clicked in. (However,
* that means we'll display couples even if we don't really know if we have
* a second pad, which is a little annoying.)
*
* Also, credit deduction should be handled in StepMania.cpp (along with
* the coin logic) using GAMESTATE->m_bPlayersCanJoin, since there
* are other screens you can join (eg ScreenCaution). -glenn */
/* Joint premium on a DDR machine does allow two player modes with a single
* credit. -Chris
*/
/* Indeed, I can see three different premium settings here:
AnyPlayersTwoCoins (2 coins for doubles and 2 coins for versus)
OnePlayerOneCoin (1 coin for doubles, but 2 coins for versus (like pump and ez2))
TwoPlayerOneCoin (1 coin for doubles / versus play)
perhaps we should change the joint premium system to work this way?
That way we can support all gametypes.
*/
if( PREFSMAN->m_iCoinMode == COIN_PAY )
{
if( !PREFSMAN->m_bJointPremium )
{
if( GAMESTATE->m_iCoins < PREFSMAN->m_iCoinsPerCredit )
{
/* Joint Premium is NOT enabled, and we do not have enough credits */
return;
}
/* Joint Premium is NOT enabled, but we have enough credits. Pay up! */
GAMESTATE->m_iCoins -= PREFSMAN->m_iCoinsPerCredit;
}
}
/* If credits had to be used, it's already taken care of.. add the player */
SOUND->PlayOnce( THEME->GetPathToS("Common start") );
GAMESTATE->m_bSideIsJoined[pn] = true;
SCREENMAN->RefreshCreditsMessages();
this->UpdateSelectableChoices();
return;
}
}
this->UpdateSelectableChoices();
return;
}
// For some reason the menu likes to take 10 seconds to transition O_o
// quite noticeable pause... and in the meantime the player is sitting there
// wondering why their keys aren't working... even ESC... @_@
if( m_Menu.IsTransitioning() )
return;