From 8ef0fff740add5b3bd72f17af95b84ea6e72c276 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 15 Jan 2005 22:58:27 +0000 Subject: [PATCH] cleanup --- stepmania/src/BGAnimationLayer.cpp | 30 +++++++++++++++++++++++++++++ stepmania/src/BGAnimationLayer.h | 31 ------------------------------ 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index 3fcab8910d..f8db312399 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -96,6 +96,36 @@ void BGAnimationLayer::LoadFromAniLayerFile( const CString& sPath ) return; // this will ignore other effects in the file name } + enum Effect { + EFFECT_CENTER, + EFFECT_STRETCH_STILL, + EFFECT_STRETCH_SCROLL_LEFT, + EFFECT_STRETCH_SCROLL_RIGHT, + EFFECT_STRETCH_SCROLL_UP, + EFFECT_STRETCH_SCROLL_DOWN, + EFFECT_STRETCH_WATER, + EFFECT_STRETCH_BUBBLE, + EFFECT_STRETCH_TWIST, + EFFECT_STRETCH_SPIN, + EFFECT_PARTICLES_SPIRAL_OUT, + EFFECT_PARTICLES_SPIRAL_IN, + EFFECT_PARTICLES_FLOAT_UP, + EFFECT_PARTICLES_FLOAT_DOWN, + EFFECT_PARTICLES_FLOAT_LEFT, + EFFECT_PARTICLES_FLOAT_RIGHT, + EFFECT_PARTICLES_BOUNCE, + EFFECT_TILE_STILL, + EFFECT_TILE_SCROLL_LEFT, + EFFECT_TILE_SCROLL_RIGHT, + EFFECT_TILE_SCROLL_UP, + EFFECT_TILE_SCROLL_DOWN, + EFFECT_TILE_FLIP_X, + EFFECT_TILE_FLIP_Y, + EFFECT_TILE_PULSE, + NUM_EFFECTS, // leave this at the end + EFFECT_INVALID + }; + const CString EFFECT_STRING[NUM_EFFECTS] = { "center", "stretchstill", diff --git a/stepmania/src/BGAnimationLayer.h b/stepmania/src/BGAnimationLayer.h index f75081b0e5..ffbf1fa6d1 100644 --- a/stepmania/src/BGAnimationLayer.h +++ b/stepmania/src/BGAnimationLayer.h @@ -30,36 +30,6 @@ public: protected: vector m_vParticleVelocity; - enum Effect { - EFFECT_CENTER, - EFFECT_STRETCH_STILL, - EFFECT_STRETCH_SCROLL_LEFT, - EFFECT_STRETCH_SCROLL_RIGHT, - EFFECT_STRETCH_SCROLL_UP, - EFFECT_STRETCH_SCROLL_DOWN, - EFFECT_STRETCH_WATER, - EFFECT_STRETCH_BUBBLE, - EFFECT_STRETCH_TWIST, - EFFECT_STRETCH_SPIN, - EFFECT_PARTICLES_SPIRAL_OUT, - EFFECT_PARTICLES_SPIRAL_IN, - EFFECT_PARTICLES_FLOAT_UP, - EFFECT_PARTICLES_FLOAT_DOWN, - EFFECT_PARTICLES_FLOAT_LEFT, - EFFECT_PARTICLES_FLOAT_RIGHT, - EFFECT_PARTICLES_BOUNCE, - EFFECT_TILE_STILL, - EFFECT_TILE_SCROLL_LEFT, - EFFECT_TILE_SCROLL_RIGHT, - EFFECT_TILE_SCROLL_UP, - EFFECT_TILE_SCROLL_DOWN, - EFFECT_TILE_FLIP_X, - EFFECT_TILE_FLIP_Y, - EFFECT_TILE_PULSE, - NUM_EFFECTS, // leave this at the end - EFFECT_INVALID - }; - enum Type { TYPE_SPRITE, @@ -98,7 +68,6 @@ protected: float m_fTilesSpacingY; float m_fTileVelocityX; float m_fTileVelocityY; - }; #endif