From 3cf87f8ac0196622e1f7e89d4d8f44d5b0cf6cb8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 18 Oct 2004 04:36:42 +0000 Subject: [PATCH] "play" and "pause" are now synonymous with animate,1 and animate,0 --- stepmania/src/Actor.cpp | 6 ++++-- stepmania/src/Sprite.cpp | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index e983ca909f..45bb1ae041 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -717,6 +717,8 @@ void Actor::HandleCommand( const ParsedCommand &command ) else if( sName=="scaletofit" ) { RectF R(fParam(1), fParam(2), fParam(3), fParam(4)); ScaleToFitInside(R); } // Commands that take effect immediately (ignoring the tweening queue): else if( sName=="animate" ) EnableAnimation( bParam(1) ); + else if( sName=="play" ) EnableAnimation( true ); + else if( sName=="pause" ) EnableAnimation( false ); else if( sName=="setstate" ) SetState( iParam(1) ); else if( sName=="texturewrapping" ) SetTextureWrapping( bParam(1) ); else if( sName=="additiveblend" ) SetBlendMode( bParam(1) ? BLEND_ADD : BLEND_NORMAL ); @@ -745,8 +747,8 @@ void Actor::HandleCommand( const ParsedCommand &command ) * GainFocus and LoseFocus. So, don't run CheckHandledParams * on these commands. */ else if( sName=="customtexturerect" || sName=="texcoordvelocity" || sName=="scaletoclipped" || - sName=="stretchtexcoords" || sName=="position" || sName=="loop" || sName=="play" || - sName=="pause" || sName=="rate" || sName=="propagate" ) + sName=="stretchtexcoords" || sName=="position" || sName=="loop" || + sName=="rate" || sName=="propagate" ) return; else { diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 65460a88ce..a2e0f83349 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -879,8 +879,6 @@ void Sprite::HandleCommand( const ParsedCommand &command ) * shouldn't depend on Actor. */ else if( sName=="position" ) GetTexture()->SetPosition( fParam(1) ); else if( sName=="loop" ) GetTexture()->SetLooping( bParam(1) ); - else if( sName=="play" ) GetTexture()->Play(); - else if( sName=="pause" ) GetTexture()->Pause(); else if( sName=="rate" ) GetTexture()->SetPlaybackRate( fParam(1) ); else {