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

fixed crash when saving Course records

Browse Source 
fixed incorrect handing of "accelerate" token in Actor::Fade
This commit is contained in:
Chris Danford
2003-02-24 00:47:13 +00:00
parent aac5e21f9b
commit bed2c0a74b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+5 -5
View File
@@ -514,7 +514,7 @@ void GetFadeFlagsFromString( CString sFadeString,
void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds, bool bOnToScreenOrOffOfScreen )
void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds, bool bFadingOff )
{
sFadeString.MakeLower();
@@ -528,8 +528,8 @@ void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds,
TweenType tt;
if( CONTAINS("linear") ) tt = TWEEN_LINEAR;
else if( CONTAINS("accelerate") ) tt = bOnToScreenOrOffOfScreen ? TWEEN_BIAS_END : TWEEN_BIAS_BEGIN;
else if( CONTAINS("bounce") ) tt = bOnToScreenOrOffOfScreen ? TWEEN_BOUNCE_END : TWEEN_BOUNCE_BEGIN;
else if( CONTAINS("accelerate") ) tt = bFadingOff ? TWEEN_BIAS_END : TWEEN_BIAS_BEGIN;
else if( CONTAINS("bounce") ) tt = bFadingOff ? TWEEN_BOUNCE_BEGIN : TWEEN_BOUNCE_END;
else if( CONTAINS("spring") ) tt = TWEEN_SPRING;
else tt = TWEEN_LINEAR;
@@ -561,10 +561,10 @@ void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds,
StopTweening();
m_current = bOnToScreenOrOffOfScreen ? original : mod;
m_current = bFadingOff ? original : mod;
BeginTweening( fSleepSeconds );
BeginTweening( fFadeSeconds, tt );
LatestTween() = bOnToScreenOrOffOfScreen ? mod : original;
LatestTween() = bFadingOff ? mod : original;
}
float Actor::TweenTime() const