Changeset 10114 in orxonox.OLD for trunk/src/world_entities/weather_effects

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/weather_effects

Files:

• cloud_effect.cc (modified) (2 diffs)
• fog_effect.cc (modified) (1 diff)
• lense_flare.cc (modified) (1 diff)
• lightning_effect.cc (modified) (1 diff)
• rain_effect.cc (modified) (1 diff)
• snow_effect.cc (modified) (1 diff)
• volfog_effect.cc (modified) (1 diff)

trunk/src/world_entities/weather_effects/cloud_effect.cc

@@ -30 +30 @@
 #include "resource_shader.h"
 
-#include "class_id_DEPRECATED.h"
+
 
 Vector    CloudEffect::cloudColor;
@@ -41 +41 @@
 float     CloudEffect::fadeTime;
 
-ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
+ObjectListDefinition(CloudEffect);
 
 

trunk/src/world_entities/weather_effects/fog_effect.cc

@@ -30 +30 @@
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
 
-#include "class_id_DEPRECATED.h"
+
 
 CREATE_SCRIPTABLE_CLASS(FogEffect,

trunk/src/world_entities/weather_effects/lense_flare.cc

@@ -34 +34 @@
 #include "camera.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
+
+
+ObjectListDefinition(LenseFlare);
 CREATE_FACTORY(LenseFlare);
 

trunk/src/world_entities/weather_effects/lightning_effect.cc

@@ -28 +28 @@
 #include "script_class.h"
 #include "debug.h"
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+
+
+ObjectListDefinition(LightningEffect);
 
 SHELL_COMMAND(activate, LightningEffect, activateLightning);

trunk/src/world_entities/weather_effects/rain_effect.cc

@@ -32 +32 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+
+
+ObjectListDefinition(RainEffect);
 
 // Define shell commands

trunk/src/world_entities/weather_effects/snow_effect.cc

@@ -30 +30 @@
 #include "cloud_effect.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
+
+
+ObjectListDefinition(SnowEffect);
 SHELL_COMMAND(activate, SnowEffect, activateSnow);
 SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);

trunk/src/world_entities/weather_effects/volfog_effect.cc

@@ -49 +49 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
+
+ObjectListDefinition(VolFogEffect);
 CREATE_FACTORY(VolFogEffect);