From d252e312449a2342b68771fb348192f27e48f70c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 7 Sep 2002 10:11:00 +0000 Subject: [PATCH] After an assertion failure, the user might continue. If we ASSERT(0), return. (We should probably be throwing, though.) --- stepmania/src/Actor.cpp | 4 ++-- stepmania/src/OptionsCursor.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 7da70cdce0..26e0d6f591 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -176,7 +176,7 @@ void Actor::UpdateTweening( float fDeltaTime ) const float fPercentThroughTween = 1-(TI.m_fTimeLeftInTween / TI.m_fTweenTime); // distort the percentage if appropriate - float fPercentAlongPath; + float fPercentAlongPath = 0.f; switch( TI.m_TweenType ) { case TWEEN_LINEAR: fPercentAlongPath = fPercentThroughTween; break; @@ -325,7 +325,7 @@ void Actor::ScaleTo( LPRECT pRect, StretchType st ) float fNewZoomX = fabsf(rect_width / m_size.x); float fNewZoomY = fabsf(rect_height / m_size.y); - float fNewZoom; + float fNewZoom = 0.f; switch( st ) { case cover: diff --git a/stepmania/src/OptionsCursor.cpp b/stepmania/src/OptionsCursor.cpp index 91899b4f20..3b2c326074 100644 --- a/stepmania/src/OptionsCursor.cpp +++ b/stepmania/src/OptionsCursor.cpp @@ -42,7 +42,7 @@ void OptionsCursor::Load( PlayerNumber pn, bool bUnderline ) { case PLAYER_1: iBaseFrameNo = 0; break; case PLAYER_2: iBaseFrameNo = 3; break; - default: ASSERT(0); break; + default: ASSERT(0); return; } m_sprLeft.SetState( iBaseFrameNo+0 ); m_sprMiddle.SetState( iBaseFrameNo+1 );