From f202bbe6806603bf042f6426ecc026de13bd22eb Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 23 Jul 2002 19:02:47 +0000 Subject: [PATCH] Minor bug fixes --- stepmania/src/LifeMeterBar.cpp | 8 ++++---- stepmania/src/ScreenEz2SelectStyle.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 1b3722835a..3a1a87acc2 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -152,10 +152,10 @@ void LifeMeterBar::Update( float fDeltaTime ) // set custom texture coords CRect rectSize( - -METER_WIDTH/2, - -METER_HEIGHT/2, - -METER_WIDTH/2 + METER_WIDTH * m_fTrailingLifePercentage, - -METER_HEIGHT/2 + METER_HEIGHT ); + int( -METER_WIDTH/2 ), + int( -METER_HEIGHT/2 ), + int( -METER_WIDTH/2 + METER_WIDTH * m_fTrailingLifePercentage ), + int( -METER_HEIGHT/2 + METER_HEIGHT) ); float fPrecentOffset = TIMER->GetTimeSinceStart(); fPrecentOffset -= (int)fPrecentOffset; diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp index 31794fd4c0..add48edefb 100644 --- a/stepmania/src/ScreenEz2SelectStyle.cpp +++ b/stepmania/src/ScreenEz2SelectStyle.cpp @@ -330,7 +330,7 @@ void ScreenEz2SelectStyle::HandleScreenMessage( const ScreenMessage SM ) { // m_soundInvalid.PlayRandom(); // return; - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD_VERSUS; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE_HARD_VERSUS; } else if (m_iSelectedStyle == 2) // real { @@ -344,11 +344,11 @@ void ScreenEz2SelectStyle::HandleScreenMessage( const ScreenMessage SM ) { if (m_iSelectedStyle == 0) // easy { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE; } else if (m_iSelectedStyle == 1) // hard { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE_HARD; } else if (m_iSelectedStyle == 2) // real { @@ -718,15 +718,15 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p ) if (m_iSelectedStyle == 0 || m_iSelectedStyle == 3) // easy { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS; } else if (m_iSelectedStyle == 1) // hard { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD_VERSUS; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE_HARD_VERSUS; } else if (m_iSelectedStyle == 2) // real { - GAMEMAN->m_CurStyle = STYLE_EZ2_REAL_VERSUS; + GAMESTATE->m_CurStyle = STYLE_EZ2_REAL_VERSUS; } } @@ -734,11 +734,11 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p ) { if (m_iSelectedStyle == 0) // easy { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE; } else if (m_iSelectedStyle == 1) // hard { - GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD; + GAMESTATE->m_CurStyle = STYLE_EZ2_SINGLE_HARD; } else if (m_iSelectedStyle == 2) // real {