force particular Premium and CoinMode values if bEventMode

This commit is contained in:
Chris Danford
2004-06-09 08:14:21 +00:00
parent 0b8b2ad654
commit a266e00c93
10 changed files with 51 additions and 26 deletions
+5 -4
View File
@@ -160,12 +160,13 @@ bool Screen::ChangeCoinModeInput( const DeviceInput& DeviceI, const InputEventTy
return false;
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F3 )
{
(int&)PREFSMAN->m_iCoinMode = (PREFSMAN->m_iCoinMode+1) % NUM_COIN_MODES;
PREFSMAN->m_iCoinMode++;
wrap( PREFSMAN->m_iCoinMode, NUM_COIN_MODES );
/* ResetGame();
This causes problems on ScreenIntroMovie, which results in the
movie being restarted and/or becoming out-of-synch -- Miryokuteki */
CString sMessage = CoinModeToString( (CoinMode)PREFSMAN->m_iCoinMode );
CString sMessage = CoinModeToString( (CoinMode)PREFSMAN->GetCoinMode() );
sMessage.MakeUpper();
sMessage = "Coin Mode: " + sMessage;
SCREENMAN->RefreshCreditsMessages();
@@ -188,11 +189,11 @@ bool Screen::JoinInput( const DeviceInput& DeviceI, const InputEventType type, c
/* subtract coins */
int iCoinsToCharge = 0;
if( PREFSMAN->m_iCoinMode == COIN_PAY )
if( PREFSMAN->GetCoinMode() == COIN_PAY )
iCoinsToCharge = PREFSMAN->m_iCoinsPerCredit;
// If joint premium don't take away a credit for the 2nd join.
if( PREFSMAN->m_Premium == PrefsManager::JOINT_PREMIUM &&
if( PREFSMAN->GetPremium() == PrefsManager::JOINT_PREMIUM &&
GAMESTATE->GetNumSidesJoined() == 1 )
iCoinsToCharge = 0;