Changeset 9716 in orxonox.OLD for branches/new_class_id/src

Timestamp:

Sep 1, 2006, 8:16:15 PM (18 years ago)

Author:

bensch

Message:

more renamings

Location:

branches/new_class_id/src

Files:

• Makefile.am (modified) (1 diff)
• defs/class_id_DEPRECATED.h (moved) (moved from branches/new_class_id/src/defs/class_id.h) (3 diffs)
• lib/graphics/effects/cloud_effect.cc (modified) (1 diff)
• lib/graphics/effects/fog_effect.cc (modified) (1 diff)
• lib/graphics/effects/lense_flare.cc (modified) (1 diff)
• lib/graphics/effects/lightning_effect.cc (modified) (1 diff)
• lib/graphics/effects/rain_effect.cc (modified) (1 diff)
• lib/graphics/effects/snow_effect.cc (modified) (1 diff)
• lib/graphics/effects/volfog_effect.cc (modified) (1 diff)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/render2D/image_plane.cc (modified) (1 diff)
• lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• lib/lang/Makefile.am (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)
• lib/lang/class_id.cc (moved) (moved from branches/new_class_id/src/lib/lang/new_class_id.cc) (1 diff)
• lib/lang/class_id.h (moved) (moved from branches/new_class_id/src/lib/lang/new_class_id.h) (2 diffs)
• lib/lang/object_list.cc (moved) (moved from branches/new_class_id/src/lib/lang/new_object_list.cc) (1 diff)
• lib/lang/object_list.h (moved) (moved from branches/new_class_id/src/lib/lang/new_object_list.h) (2 diffs)
• lib/lang/test_object_list.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/player_stats.cc (modified) (1 diff)
• lib/particles/box_emitter.cc (modified) (1 diff)
• lib/particles/dot_emitter.cc (modified) (1 diff)
• lib/particles/dot_particles.cc (modified) (1 diff)
• lib/particles/model_particles.cc (modified) (1 diff)
• lib/particles/plane_emitter.cc (modified) (1 diff)
• lib/particles/spark_particles.cc (modified) (1 diff)
• lib/particles/sprite_particles.cc (modified) (1 diff)
• lib/physics/fields/gravity.cc (modified) (1 diff)
• lib/physics/fields/point_gravity.cc (modified) (1 diff)
• lib/physics/fields/twirl.cc (modified) (1 diff)
• lib/physics/physics_connection.cc (modified) (1 diff)
• lib/util/loading/fast_factory.h (modified) (1 diff)
• story_entities/menu/game_menu.cc (modified) (1 diff)
• story_entities/movie_loader.cc (modified) (1 diff)
• story_entities/multi_player_world.cc (modified) (1 diff)
• story_entities/single_player_world.cc (modified) (1 diff)
• subprojects/network/simple_sync.cc (modified) (1 diff)
• util/kill_target.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)
• util/singleplayer_shootemup.cc (modified) (1 diff)
• world_entities/bsp_entity.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)
• world_entities/effects/billboard.cc (modified) (1 diff)
• world_entities/effects/explosion.cc (modified) (1 diff)
• world_entities/effects/lightning_bolt.cc (modified) (1 diff)
• world_entities/elements/image_entity.cc (modified) (1 diff)
• world_entities/elements/text_element.cc (modified) (1 diff)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/environments/building.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (1 diff)
• world_entities/environments/model_entity.cc (modified) (1 diff)
• world_entities/environments/water.cc (modified) (1 diff)
• world_entities/movie_entity.cc (modified) (1 diff)
• world_entities/npcs/attractor_mine.cc (modified) (1 diff)
• world_entities/npcs/door.cc (modified) (1 diff)
• world_entities/npcs/gate.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (1 diff)
• world_entities/npcs/ground_turret.cc (modified) (1 diff)
• world_entities/npcs/network_turret.cc (modified) (1 diff)
• world_entities/npcs/npc_test.cc (modified) (1 diff)
• world_entities/npcs/repair_station.cc (modified) (1 diff)
• world_entities/npcs/space_turret.cc (modified) (1 diff)
• world_entities/planet.cc (modified) (1 diff)
• world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• world_entities/power_ups/param_power_up.cc (modified) (1 diff)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)
• world_entities/projectiles/bomb.cc (modified) (1 diff)
• world_entities/projectiles/boomerang_projectile.cc (modified) (1 diff)
• world_entities/projectiles/guided_missile.cc (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (1 diff)
• world_entities/projectiles/laser.cc (modified) (1 diff)
• world_entities/projectiles/rail_projectile.cc (modified) (1 diff)
• world_entities/projectiles/rocket.cc (modified) (1 diff)
• world_entities/projectiles/test_bullet.cc (modified) (1 diff)
• world_entities/recorder.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/space_ships/collision_probe.cc (modified) (1 diff)
• world_entities/space_ships/cruizer.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (1 diff)
• world_entities/space_ships/hover.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/space_ships/spacecraft_2d.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (1 diff)
• world_entities/spawning_point.cc (modified) (1 diff)
• world_entities/spectator.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• world_entities/weapons/boomerang_gun.cc (modified) (1 diff)
• world_entities/weapons/cannon.cc (modified) (1 diff)
• world_entities/weapons/fps_sniper_rifle.cc (modified) (1 diff)
• world_entities/weapons/hyperblaster.cc (modified) (1 diff)
• world_entities/weapons/laser_cannon.cc (modified) (1 diff)
• world_entities/weapons/targeting_turret.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

branches/new_class_id/src/Makefile.am

@@ -72 +72 @@
                 defs/globals.h \
                 defs/compiler.h \
-                defs/class_id.h \
+                defs/class_id_DEPRECATED.h \
                 subprojects/benchmark.h
 

branches/new_class_id/src/defs/class_id_DEPRECATED.h

@@ -18 +18 @@
 
 /*!
- * @file class_id.h
+ * @file class_id_DEPRECATED.h
  * @brief contains a list of orxonox ClassID's (identities to register classes and their SuperClasses)
  *
@@ -31 +31 @@
  */
 
-#ifndef _CLASS_ID_H
-#define _CLASS_ID_H
+#ifndef _CLASS_ID___DEPRECATED___H
+#define _CLASS_ID___DEPRECATED___H
 
 //! list of all classes to be loadable in via the ObjectManager
@@ -463 +463 @@
 
 
-#endif /* _CLASS_ID_H */
+#endif /* _CLASS_ID___DEPRECATED___H */

branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc

@@ -29 +29 @@
 #include "script_class.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 Vector    CloudEffect::cloudColor;

branches/new_class_id/src/lib/graphics/effects/fog_effect.cc

@@ -29 +29 @@
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 CREATE_SCRIPTABLE_CLASS(FogEffect, FogEffect::classID(),

branches/new_class_id/src/lib/graphics/effects/lense_flare.cc

@@ -33 +33 @@
 #include "camera.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);

branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc

@@ -27 +27 @@
 #include "cloud_effect.h"
 #include "script_class.h"
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);

branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

@@ -31 +31 @@
 #include "script_class.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);

branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

@@ -30 +30 @@
 #include "cloud_effect.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);

branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc

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

branches/new_class_id/src/lib/graphics/light.cc

@@ -27 +27 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(Light, CL_LIGHT);

branches/new_class_id/src/lib/graphics/render2D/image_plane.cc

@@ -24 +24 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);

branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

@@ -25 +25 @@
 #include "util/loading/load_param.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
 CREATE_FACTORY(GLMenuImageScreen);

branches/new_class_id/src/lib/lang/Makefile.am

@@ -9 +9 @@
 libORXlang_a_SOURCES = \
                 base_object.cc \
-                new_class_id.cc \
-                new_object_list.cc
+                class_id.cc \
+                object_list.cc
 
 noinst_HEADERS = \
                 base_object.h \
-                new_class_id.h \
-                new_object_list.h
+                class_id.h \
+                object_list.h
 
 

branches/new_class_id/src/lib/lang/base_object.h

@@ -14 +14 @@
 #define __BASE_OBJECT_H_
 
-#include "new_object_list.h"
+#include "object_list.h"
 #include "sigslot/slot.h"
 

branches/new_class_id/src/lib/lang/class_id.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "new_class_id.h"
-#include "new_object_list.h"
+#include "class_id.h"
+#include "object_list.h"
 
 /**

branches/new_class_id/src/lib/lang/class_id.h

@@ -1 +1 @@
 /*!
- * @file new_class_id.h
+ * @file class_id.h
  * @brief Definition of a dynamically allocating ClassID
  *
  */
 
-#ifndef _NEW_CLASS_ID_H
-#define _NEW_CLASS_ID_H
+#ifndef _CLASS_ID_H
+#define _CLASS_ID_H
 
 #include <string>
@@ -74 +74 @@
 };
 
-#endif /* _NEW_CLASS_ID_H */
+#endif /* _CLASS_ID_H */

branches/new_class_id/src/lib/lang/object_list.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "new_object_list.h"
+#include "object_list.h"
 #include <cassert>
 

branches/new_class_id/src/lib/lang/object_list.h

@@ -1 +1 @@
 /*!
- * @file new_object_list.h
+ * @file object_list.h
  * @brief Definition of a dynamically allocating ClassID
  *
  */
 
-#ifndef _NEW_OBJECT_LIST_H
-#define _NEW_OBJECT_LIST_H
-
-#include "new_class_id.h"
+#ifndef _OBJECT_LIST_H
+#define _OBJECT_LIST_H
+
+#include "class_id.h"
 #include <cassert>
 #include <map>
@@ -331 +331 @@
 }
 
-#endif /* _NEW_OBJECT_LIST_H */
+#endif /* _OBJECT_LIST_H */

branches/new_class_id/src/lib/lang/test_object_list.cc

@@ -1 @@
-#include "new_class_id.h"
-#include "new_object_list.h"
+#include "class_id.h"
+#include "object_list.h"
 #include <iostream>
 

branches/new_class_id/src/lib/network/network_stream.cc

@@ -1194 +1194 @@
           }
           else
-            ; /// FIXME NEW_CLASS_ID :: b = Factory::fabricate( leafClassId );
+            ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
 
           if ( !b )

branches/new_class_id/src/lib/network/player_stats.cc

@@ -30 +30 @@
 #include "shell_command.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);

branches/new_class_id/src/lib/particles/box_emitter.cc

@@ -24 +24 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);

branches/new_class_id/src/lib/particles/dot_emitter.cc

@@ -26 +26 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
 CREATE_FACTORY(DotEmitter);

branches/new_class_id/src/lib/particles/dot_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);

branches/new_class_id/src/lib/particles/model_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);

branches/new_class_id/src/lib/particles/plane_emitter.cc

@@ -24 +24 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);

branches/new_class_id/src/lib/particles/spark_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);

branches/new_class_id/src/lib/particles/sprite_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);

branches/new_class_id/src/lib/physics/fields/gravity.cc

@@ -21 +21 @@
 #include "util/loading/factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
 

branches/new_class_id/src/lib/physics/fields/point_gravity.cc

@@ -20 +20 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
 

branches/new_class_id/src/lib/physics/fields/twirl.cc

@@ -20 +20 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
 

branches/new_class_id/src/lib/physics/physics_connection.cc

@@ -27 +27 @@
 #include "util/loading/load_param.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinition(PhysicsConnection);
 CREATE_FACTORY(PhysicsConnection);

branches/new_class_id/src/lib/util/loading/fast_factory.h

@@ -33 +33 @@
  * Creates a FastFactory for a Class' static function named ClassName::fastFactory.
  * @param CLASS_NAME the name of the Class to create the fast-factory for.
- * @param CLASS_ID the ID of the class to create the fast-factory for @see "class_id.h"
+ * @param CLASS_ID the ID of the class to create the fast-factory for @see "class_id_DEPRECATED.h"
  *
  * notice, that the Class to be called, must implement:

branches/new_class_id/src/story_entities/menu/game_menu.cc

@@ -42 +42 @@
 #include "preferences.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a GameMenu
 ObjectListDefinitionID(GameMenu, CL_GAME_MENU);

branches/new_class_id/src/story_entities/movie_loader.cc

@@ -25 +25 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
 CREATE_FACTORY(MovieLoader);

branches/new_class_id/src/story_entities/multi_player_world.cc

@@ -36 +36 @@
 SHELL_COMMAND(debug, MultiPlayerWorld, debug);
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a MultiPlayerWorld
 ObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);

branches/new_class_id/src/story_entities/single_player_world.cc

@@ -29 +29 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a SinglePlayerWorld
 ObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);

branches/new_class_id/src/subprojects/network/simple_sync.cc

@@ -22 +22 @@
 #include "simple_sync.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 #include "loading/fast_factory.h"
 #include "lib/util/loading/factory.h"

branches/new_class_id/src/util/kill_target.cc

@@ -22 +22 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
 CREATE_FACTORY(KillTarget);

branches/new_class_id/src/util/multiplayer_team_deathmatch.cc

@@ -48 +48 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);

branches/new_class_id/src/util/singleplayer_shootemup.cc

@@ -25 +25 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
 CREATE_FACTORY(SingleplayerShootemup);

branches/new_class_id/src/world_entities/bsp_entity.cc

@@ -18 +18 @@
 #include "util/loading/resource_manager.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
 CREATE_FACTORY(BspEntity);

branches/new_class_id/src/world_entities/creatures/fps_player.cc

@@ -41 +41 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
 CREATE_FACTORY(FPSPlayer);

branches/new_class_id/src/world_entities/creatures/md2_creature.cc

@@ -37 +37 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
 CREATE_FACTORY(MD2Creature);

branches/new_class_id/src/world_entities/effects/billboard.cc

@@ -26 +26 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Billboard, CL_BILLBOARD);
 CREATE_FACTORY(Billboard);

branches/new_class_id/src/world_entities/effects/explosion.cc

@@ -27 +27 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Explosion, CL_EXPLOSION);
 CREATE_FAST_FACTORY_STATIC(Explosion);

branches/new_class_id/src/world_entities/effects/lightning_bolt.cc

@@ -25 +25 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
 CREATE_FACTORY(LightningBolt);

branches/new_class_id/src/world_entities/elements/image_entity.cc

@@ -30 +30 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
 CREATE_FACTORY(ImageEntity);

branches/new_class_id/src/world_entities/elements/text_element.cc

@@ -27 +27 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
 CREATE_FACTORY(TextElement);

branches/new_class_id/src/world_entities/environment.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
 CREATE_FACTORY(Environment);

branches/new_class_id/src/world_entities/environments/building.cc

@@ -23 +23 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Building, CL_BUILDING);
 CREATE_FACTORY(Building);

branches/new_class_id/src/world_entities/environments/mapped_water.cc

@@ -25 +25 @@
 #include "script_class.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
 CREATE_FACTORY(MappedWater);

branches/new_class_id/src/world_entities/environments/model_entity.cc

@@ -23 +23 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
 CREATE_FACTORY(ModelEntity);

branches/new_class_id/src/world_entities/environments/water.cc

@@ -33 +33 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Water, CL_WATER);
 CREATE_FACTORY(Water);

branches/new_class_id/src/world_entities/movie_entity.cc

@@ -21 +21 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
 CREATE_FACTORY(MovieEntity);

branches/new_class_id/src/world_entities/npcs/attractor_mine.cc

@@ -33 +33 @@
 #include "effects/explosion.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
 CREATE_FACTORY(AttractorMine);

branches/new_class_id/src/world_entities/npcs/door.cc

@@ -26 +26 @@
 #include "door.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Door, CL_DOOR);
 CREATE_FACTORY(Door);

branches/new_class_id/src/world_entities/npcs/gate.cc

@@ -31 +31 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Gate, CL_GATE);
 CREATE_FACTORY(Gate);

branches/new_class_id/src/world_entities/npcs/generic_npc.cc

@@ -32 +32 @@
 #include "bsp_entity.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
 CREATE_FACTORY(GenericNPC);

branches/new_class_id/src/world_entities/npcs/ground_turret.cc

@@ -29 +29 @@
 #include "effects/explosion.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 
 ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);

branches/new_class_id/src/world_entities/npcs/network_turret.cc

@@ -31 +31 @@
 #include "weapons/aiming_turret.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
 CREATE_FACTORY(NetworkTurret);

branches/new_class_id/src/world_entities/npcs/npc_test.cc

@@ -30 +30 @@
 #include "effects/explosion.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
 CREATE_FACTORY(NPC2);

branches/new_class_id/src/world_entities/npcs/repair_station.cc

@@ -26 +26 @@
 #include "repair_station.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
 CREATE_FACTORY(RepairStation);

branches/new_class_id/src/world_entities/npcs/space_turret.cc

@@ -29 +29 @@
 #include "effects/explosion.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
 CREATE_FACTORY(SpaceTurret);

branches/new_class_id/src/world_entities/planet.cc

@@ -32 +32 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Planet, CL_PLANET);
 CREATE_FACTORY(Planet);

branches/new_class_id/src/world_entities/power_ups/laser_power_up.cc

@@ -24 +24 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
 CREATE_FACTORY(LaserPowerUp);

branches/new_class_id/src/world_entities/power_ups/param_power_up.cc

@@ -27 +27 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
 CREATE_FACTORY(ParamPowerUp);

branches/new_class_id/src/world_entities/power_ups/turret_power_up.cc

@@ -24 +24 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
 CREATE_FACTORY(TurretPowerUp);

branches/new_class_id/src/world_entities/power_ups/weapon_power_up.cc

@@ -27 +27 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
 CREATE_FACTORY(WeaponPowerUp);

branches/new_class_id/src/world_entities/projectiles/bomb.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Bomb, CL_BOMB);
 CREATE_FAST_FACTORY_STATIC(Bomb);

branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
 CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);

branches/new_class_id/src/world_entities/projectiles/guided_missile.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
 CREATE_FAST_FACTORY_STATIC(GuidedMissile);

branches/new_class_id/src/world_entities/projectiles/hyperblast.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
 CREATE_FAST_FACTORY_STATIC(Hyperblast);

branches/new_class_id/src/world_entities/projectiles/laser.cc

@@ -28 +28 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinition(Laser);
 CREATE_FAST_FACTORY_STATIC(Laser);

branches/new_class_id/src/world_entities/projectiles/rail_projectile.cc

@@ -28 +28 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
 CREATE_FAST_FACTORY_STATIC(RailProjectile);

branches/new_class_id/src/world_entities/projectiles/rocket.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Rocket, CL_ROCKET);
 CREATE_FAST_FACTORY_STATIC(Rocket);

branches/new_class_id/src/world_entities/projectiles/test_bullet.cc

@@ -24 +24 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
 CREATE_FAST_FACTORY_STATIC(TestBullet);

branches/new_class_id/src/world_entities/recorder.cc

@@ -22 +22 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Recorder, CL_RECORDER);
 CREATE_FACTORY(Recorder);

branches/new_class_id/src/world_entities/skybox.cc

@@ -31 +31 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SkyBox, CL_SKYBOX);
 CREATE_FACTORY(SkyBox);

branches/new_class_id/src/world_entities/space_ships/collision_probe.cc

@@ -24 +24 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
 

branches/new_class_id/src/world_entities/space_ships/cruizer.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Cruizer, CL_CRUIZER);
 CREATE_FACTORY(Cruizer);

branches/new_class_id/src/world_entities/space_ships/helicopter.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
 CREATE_FACTORY(Helicopter);

branches/new_class_id/src/world_entities/space_ships/hover.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Hover, CL_HOVER);
 CREATE_FACTORY(Hover);

branches/new_class_id/src/world_entities/space_ships/space_ship.cc

@@ -53 +53 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
 CREATE_FACTORY(SpaceShip);

branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc

@@ -38 +38 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
 CREATE_FACTORY(Spacecraft2D);

branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
 CREATE_FACTORY(TurbineHover);

branches/new_class_id/src/world_entities/spawning_point.cc

@@ -33 +33 @@
 #include "converter.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
 CREATE_FACTORY( SpawningPoint);

branches/new_class_id/src/world_entities/spectator.cc

@@ -22 +22 @@
 #include "shared_network_data.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Spectator, CL_SPECTATOR);
 CREATE_FACTORY(Spectator);

branches/new_class_id/src/world_entities/terrain.cc

@@ -34 +34 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Terrain, CL_TERRAIN);
 CREATE_FACTORY(Terrain);

branches/new_class_id/src/world_entities/test_entity.cc

@@ -35 +35 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinition(TestEntity);
 CREATE_FACTORY(TestEntity);

branches/new_class_id/src/world_entities/weapons/aiming_turret.cc

@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
 CREATE_FACTORY(AimingTurret);

branches/new_class_id/src/world_entities/weapons/boomerang_gun.cc

@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
 CREATE_FACTORY(BoomerangGun);

branches/new_class_id/src/world_entities/weapons/cannon.cc

@@ -36 +36 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Cannon, CL_CANNON);
 CREATE_FACTORY(Cannon);

branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -39 +39 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
 CREATE_FACTORY(FPSSniperRifle);

branches/new_class_id/src/world_entities/weapons/hyperblaster.cc

@@ -35 +35 @@
 
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
 CREATE_FACTORY(Hyperblaster);

branches/new_class_id/src/world_entities/weapons/laser_cannon.cc

@@ -31 +31 @@
 #include "loading/fast_factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
 CREATE_FACTORY(LaserCannon);

branches/new_class_id/src/world_entities/weapons/targeting_turret.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
 CREATE_FACTORY(TargetingTurret);

branches/new_class_id/src/world_entities/weapons/test_gun.cc

@@ -33 +33 @@
 #include "loading/fast_factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TestGun, CL_TEST_GUN);
 CREATE_FACTORY(TestGun);

branches/new_class_id/src/world_entities/weapons/turret.cc

@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-#include "class_id.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Turret, CL_TURRET);
 CREATE_FACTORY(Turret);