From 3a13724a706885adccf321f5f39128887a6b8648 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 12 Feb 2003 07:52:20 +0000 Subject: [PATCH] Cleanups: Don't use variables that start with an underscore. They're reserved for the system. Using single-letter variable names is fine for simple for() counters, but don't use them for real variables. Here you probably meant "Coins", "CoinsPerCredit" (const) and "Remainder". Er, you're implementing div and mod iteratively. :) --- stepmania/src/ScreenManager.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 8b8fd77382..5bfa7bdfea 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -399,20 +399,8 @@ void ScreenManager::RefreshCreditsMessages() m_textCreditInfo[p].SetDiffuse( CREDITS_COLOR ); m_textCreditInfo[p].SetShadowLength( CREDITS_SHADOW_LENGTH ); - - int _c = GAMESTATE->m_iCoins; - int _x = PREFSMAN->m_iCoinsPerCredit; LOG->Trace("Actual coins: %d",GAMESTATE->m_iCoins); - unsigned int _r = 0; - - while (_c >= _x) { - _c -= _x; - _r++; - - } - - switch( PREFSMAN->m_CoinMode ) { case PrefsManager::COIN_HOME: @@ -424,8 +412,13 @@ void ScreenManager::RefreshCreditsMessages() m_textCreditInfo[p].SetText( "NOT PRESENT" ); break; case PrefsManager::COIN_PAY: - if (_c == 0) m_textCreditInfo[p].SetText( ssprintf("CREDIT(S) %d ",_r) ); - else m_textCreditInfo[p].SetText( ssprintf("CREDIT(S) %d (%d / %d)",_r,_c,_x ) ); + { + int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit; + CString txt = ssprintf("CREDIT(S) %d ", GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit); + if (Coins) + txt += ssprintf(" (%d / %d)", Coins, PREFSMAN->m_iCoinsPerCredit ); + m_textCreditInfo[p].SetText(txt); + } break; case PrefsManager::COIN_FREE: m_textCreditInfo[p].SetText( "FREE PLAY" ); @@ -434,4 +427,5 @@ void ScreenManager::RefreshCreditsMessages() ASSERT(0); } } -} \ No newline at end of file +} +