source/fx/fx.h

@@ -13,10 +13,7 @@ class CFX : public CFXThing
 public:
 		enum	FX_TYPE
 		{
-			FX_TYPE_JELLYFISH_LEGS,		// zero also used to chain fx, so first must be unique type (I know what I mean)
-			FX_TYPE_FALLINGTILE,
-
-			FX_TYPE_EXPLODE,
+			FX_TYPE_NONE=0,
 
 			FX_TYPE_SPLASH_WATER,
 			FX_TYPE_SPLASH_ACID,
@@ -41,23 +38,19 @@ public:
 			FX_TYPE_THWACK,
 
 			FX_TYPE_LIGHTNING_BOLT,
-			FX_TYPE_LIGHTNING_SHEET,
-			FX_TYPE_LIGHTNING_BLAST,
-			FX_TYPE_LIGHTNING_RADIAL,
-			FX_TYPE_LIGHTNING_PROJECTILE,
-			
+		
 			FX_TYPE_SHOCKWAVE,
 			FX_TYPE_DAZE,
-
-			FX_TYPE_CASCADE,		
-			FX_TYPE_CASCADE_SPLASH,	
-			FX_TYPE_FIREBALL,
 			FX_TYPE_STEAM,
 			FX_TYPE_SMOKE,
 			FX_TYPE_GAS,
 			FX_TYPE_FLAMES,
 
+			FX_TYPE_JELLYFISH_LEGS,
+			FX_TYPE_FALLINGTILE,
+			FX_TYPE_EXPLODE,
 			FX_TYPE_NRG_BAR,
+			FX_TYPE_LASER,
 			FX_TYPE_MAX
 		};
 		enum