From 9d38caa32f0a23f398c6d7c702cf407c92bf4385 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Fri, 25 Feb 2011 15:49:36 -0600
Subject: [PATCH] more ssc futures preparations

---
 src/Actor.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Actor.h b/src/Actor.h
index c393dcd952..6878569ce3 100644
--- a/src/Actor.h
+++ b/src/Actor.h
@@ -64,6 +64,7 @@ LuaDeclareType( VertAlign );
 /** @brief The bottom vertical alignment constant. */
 #define align_bottom 1.0f
 
+// ssc futures:
 /*
 enum EffectAction
 {
@@ -113,13 +114,9 @@ public:
 	 * todo: split out into diffuse effects and translation effects, or
 	 * create an effect stack instead. -aj */
 	enum Effect { no_effect,
-			// diffuse effects
 			diffuse_blink, diffuse_shift, diffuse_ramp,
-			glow_blink, glow_shift, glow_ramp,
-			rainbow,
-			// translation effects
-			wag, bounce, bob, pulse,
-			spin, vibrate
+			glow_blink, glow_shift, glow_ramp, rainbow,
+			wag, bounce, bob, pulse, spin, vibrate
 	};
 
 	/** @brief Various values an Actor's effect can be tied to. */
@@ -160,8 +157,8 @@ public:
 				m_effectColor1(RageColor(1,1,1,1)), m_effectColor2(RageColor(1,1,1,1))
 		{ }
 
-		EffectAction	m_Action;
-		EffectType		m_Type; // diffuse, glow, or translate
+		EffectAction	m_Action; // replaces the old Effect enum
+		EffectType		m_Type; // determined by EffectAction
 		float			m_fSecsIntoEffect;
 		float			m_fEffectDelta;
 		RageColor		m_EffectColor1;
@@ -207,6 +204,7 @@ public:
 		RageColor	diffuse[4];
 		/** @brief The glow color for this TweenState. */
 		RageColor	glow;
+		/** @brief A magical value that nobody really knows the use for. ;) */
 		float		aux;
 	};