Index: branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc	(revision 9729)
+++ branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc	(revision 9746)
@@ -50,8 +50,8 @@
 
 CREATE_SCRIPTABLE_CLASS(CloudEffect, CloudEffect::classID(),
-                        addMethod("skyColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellSkyColor))
-                        ->addMethod("cloudColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellCloudColor))
-                        ->addMethod("activate", ExecutorLua0<CloudEffect>(&CloudEffect::activate))
-                        ->addMethod("deactivate", ExecutorLua0<CloudEffect>(&CloudEffect::deactivate))
+                        addMethod("skyColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellSkyColor))
+                        ->addMethod("cloudColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellCloudColor))
+                        ->addMethod("activate", Executor0<CloudEffect, lua_State*>(&CloudEffect::activate))
+                        ->addMethod("deactivate", Executor0<CloudEffect, lua_State*>(&CloudEffect::deactivate))
                        );
 
Index: branches/new_class_id/src/lib/graphics/effects/fog_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/fog_effect.cc	(revision 9729)
+++ branches/new_class_id/src/lib/graphics/effects/fog_effect.cc	(revision 9746)
@@ -21,4 +21,5 @@
 #include "script_class.h"
 #include "cloud_effect.h"
+#include "debug.h"
 
 ObjectListDefinition(FogEffect);
@@ -32,8 +33,8 @@
 
 CREATE_SCRIPTABLE_CLASS(FogEffect, FogEffect::classID(),
-                        addMethod("fadeIn", ExecutorLua0<FogEffect>(&FogEffect::fadeInFog))
-                            ->addMethod("fadeOut", ExecutorLua0<FogEffect>(&FogEffect::fadeOutFog))
-                            ->addMethod("activate", ExecutorLua0<FogEffect>(&FogEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<FogEffect>(&FogEffect::deactivate))
+                        addMethod("fadeIn", Executor0<FogEffect, lua_State*>(&FogEffect::fadeInFog))
+                            ->addMethod("fadeOut", Executor0<FogEffect, lua_State*>(&FogEffect::fadeOutFog))
+                            ->addMethod("activate", Executor0<FogEffect, lua_State*>(&FogEffect::activate))
+                            ->addMethod("deactivate", Executor0<FogEffect, lua_State*>(&FogEffect::deactivate))
                        );
 
Index: branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc	(revision 9729)
+++ branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc	(revision 9746)
@@ -27,4 +27,5 @@
 #include "cloud_effect.h"
 #include "script_class.h"
+#include "debug.h"
 #include "class_id_DEPRECATED.h"
 
@@ -35,6 +36,6 @@
 
 CREATE_SCRIPTABLE_CLASS(LightningEffect, LightningEffect::classID(),
-                        addMethod("activate", ExecutorLua0<LightningEffect>(&LightningEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<LightningEffect>(&LightningEffect::deactivate))
+                        addMethod("activate", Executor0<LightningEffect, lua_State*>(&LightningEffect::activate))
+                            ->addMethod("deactivate", Executor0<LightningEffect, lua_State*>(&LightningEffect::deactivate))
                        );
 
Index: branches/new_class_id/src/lib/graphics/effects/rain_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/rain_effect.cc	(revision 9729)
+++ branches/new_class_id/src/lib/graphics/effects/rain_effect.cc	(revision 9746)
@@ -30,4 +30,5 @@
 #include "cloud_effect.h"
 #include "script_class.h"
+#include "debug.h"
 
 #include "class_id_DEPRECATED.h"
@@ -44,8 +45,8 @@
 
 CREATE_SCRIPTABLE_CLASS(RainEffect, RainEffect::classID(),
-                        addMethod("startRaining", ExecutorLua0<RainEffect>(&RainEffect::startRaining))
-                            ->addMethod("stopRaining", ExecutorLua0<RainEffect>(&RainEffect::stopRaining))
-                            ->addMethod("activate", ExecutorLua0<RainEffect>(&RainEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<RainEffect>(&RainEffect::deactivate))
+                        addMethod("startRaining", Executor0<RainEffect, lua_State*>(&RainEffect::startRaining))
+                            ->addMethod("stopRaining", Executor0<RainEffect, lua_State*>(&RainEffect::stopRaining))
+                            ->addMethod("activate", Executor0<RainEffect, lua_State*>(&RainEffect::activate))
+                            ->addMethod("deactivate", Executor0<RainEffect, lua_State*>(&RainEffect::deactivate))
                        );
 
Index: branches/new_class_id/src/lib/graphics/effects/snow_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/snow_effect.cc	(revision 9729)
+++ branches/new_class_id/src/lib/graphics/effects/snow_effect.cc	(revision 9746)
@@ -38,6 +38,6 @@
 
 CREATE_SCRIPTABLE_CLASS(SnowEffect, SnowEffect::classID(),
-                            addMethod("activate", ExecutorLua0<SnowEffect>(&SnowEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<SnowEffect>(&SnowEffect::deactivate))
+                            addMethod("activate", Executor0<SnowEffect, lua_State*>(&SnowEffect::activate))
+                            ->addMethod("deactivate", Executor0<SnowEffect, lua_State*>(&SnowEffect::deactivate))
                        );
 
