Context Navigation

← Previous Changeset
Next Changeset →

Changeset 9925 in orxonox.OLD

Timestamp:

Nov 9, 2006, 7:20:19 PM (17 years ago)

Author:

bensch

Message:

network: totally removed old-classID, and (hopefully) all compile-bugs

Location:

branches/network/src

Files:

: 86 edited

lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) (1 diff)
lib/network/player_stats.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)
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/particles/box_emitter.cc (modified) (1 diff)
world_entities/particles/dot_emitter.cc (modified) (1 diff)
world_entities/particles/dot_particles.cc (modified) (1 diff)
world_entities/particles/model_particles.cc (modified) (1 diff)
world_entities/particles/plane_emitter.cc (modified) (1 diff)
world_entities/particles/spark_particles.cc (modified) (1 diff)
world_entities/particles/sprite_particles.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)
world_entities/weather_effects/cloud_effect.cc (modified) (2 diffs)
world_entities/weather_effects/fog_effect.cc (modified) (1 diff)
world_entities/weather_effects/lense_flare.cc (modified) (1 diff)
world_entities/weather_effects/lightning_effect.cc (modified) (1 diff)
world_entities/weather_effects/rain_effect.cc (modified) (1 diff)
world_entities/weather_effects/snow_effect.cc (modified) (1 diff)
world_entities/weather_effects/volfog_effect.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
+ObjectListDefinition(GLMenuImageScreen);
 CREATE_FACTORY(GLMenuImageScreen);

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

-                      r9869
+                      r9925
 #include "shell_command.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
+ObjectListDefinition(PlayerStats);
 CREATE_FACTORY(PlayerStats);

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

-                      r9869
+                      r9925
 #include "util/loading/factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
+ObjectListDefinition(Gravity);
 CREATE_FACTORY(Gravity);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
+ObjectListDefinition(PointGravity);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
+ObjectListDefinition(Twirl);

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

r9869	r9925
28	28	#include "util/loading/load_param.h"
29	29
30		#include "class_id_DEPRECATED.h"
	30
31	31	ObjectListDefinition(PhysicsConnection);
32	32	CREATE_FACTORY(PhysicsConnection);

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

-                      r9869
+                      r9925
 #include "parser/preferences/preferences.h"
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a GameMenu
 ObjectListDefinitionID(GameMenu, CL_GAME_MENU);
+ObjectListDefinition(GameMenu);
 CREATE_FACTORY(GameMenu);

branches/network/src/story_entities/movie_loader.cc

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
+ObjectListDefinition(MovieLoader);
 CREATE_FACTORY(MovieLoader);

branches/network/src/story_entities/multi_player_world.cc

-                      r9869
+                      r9925
 SHELL_COMMAND(debug, MultiPlayerWorld, debug);
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a MultiPlayerWorld
 ObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
+ObjectListDefinition(MultiPlayerWorld);
 CREATE_FACTORY(MultiPlayerWorld);

branches/network/src/story_entities/single_player_world.cc

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a SinglePlayerWorld
 ObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
+ObjectListDefinition(SinglePlayerWorld);
 CREATE_FACTORY(SinglePlayerWorld);

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

r9869	r9925
22	22	#include "simple_sync.h"
23	23
24		#include "class_id_DEPRECATED.h"
	24
25	25	#include "loading/fast_factory.h"
26	26	#include "lib/util/loading/factory.h"

branches/network/src/util/kill_target.cc

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
+ObjectListDefinition(KillTarget);
 CREATE_FACTORY(KillTarget);

branches/network/src/util/multiplayer_team_deathmatch.cc

-                      r9912
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
+ObjectListDefinition(MultiplayerTeamDeathmatch);
 CREATE_FACTORY(MultiplayerTeamDeathmatch);
 /**

branches/network/src/util/singleplayer_shootemup.cc

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
+ObjectListDefinition(SingleplayerShootemup);
 CREATE_FACTORY(SingleplayerShootemup);

branches/network/src/world_entities/bsp_entity.cc

-                      r9869
+                      r9925
 #include "loading/resource_manager.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
+ObjectListDefinition(BspEntity);
 CREATE_FACTORY(BspEntity);

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

-                      r9922
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
+ObjectListDefinition(FPSPlayer);
 CREATE_FACTORY(FPSPlayer);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+ObjectListDefinition(MD2Creature);
 CREATE_FACTORY(MD2Creature);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Billboard, CL_BILLBOARD);
+ObjectListDefinition(Billboard);
 CREATE_FACTORY(Billboard);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Explosion, CL_EXPLOSION);
+ObjectListDefinition(Explosion);
 CREATE_FAST_FACTORY_STATIC(Explosion);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
+ObjectListDefinition(LightningBolt);
 CREATE_FACTORY(LightningBolt);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
+ObjectListDefinition(ImageEntity);
 CREATE_FACTORY(ImageEntity);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
+ObjectListDefinition(TextElement);
 CREATE_FACTORY(TextElement);

branches/network/src/world_entities/environment.cc

-                      r9869
+                      r9925
 #include "util/loading/factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
+ObjectListDefinition(Environment);
 CREATE_FACTORY(Environment);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Building, CL_BUILDING);
+ObjectListDefinition(Building);
 CREATE_FACTORY(Building);

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

-                      r9882
+                      r9925
 #include "resource_shader.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
+ObjectListDefinition(MappedWater);
 CREATE_FACTORY(MappedWater);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
+ObjectListDefinition(ModelEntity);
 CREATE_FACTORY(ModelEntity);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Water, CL_WATER);
+ObjectListDefinition(Water);
 CREATE_FACTORY(Water);

branches/network/src/world_entities/movie_entity.cc

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
+ObjectListDefinition(MovieEntity);
 CREATE_FACTORY(MovieEntity);

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

-                      r9869
+                      r9925
 #include "effects/explosion.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
+ObjectListDefinition(AttractorMine);
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"

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

-                      r9869
+                      r9925
 #include "door.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Door, CL_DOOR);
+ObjectListDefinition(Door);
 CREATE_FACTORY(Door);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Gate, CL_GATE);
+ObjectListDefinition(Gate);
 CREATE_FACTORY(Gate);

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

-                      r9869
+                      r9925
 #include "bsp_entity.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
+ObjectListDefinition(GenericNPC);
 CREATE_FACTORY(GenericNPC);

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

-                      r9869
+                      r9925
 #include "effects/explosion.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+ObjectListDefinition(GroundTurret);
 CREATE_FACTORY(GroundTurret);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
+ObjectListDefinition(NetworkTurret);
 CREATE_FACTORY(NetworkTurret);

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

-                      r9869
+                      r9925
 #include "effects/explosion.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+ObjectListDefinition(NPC2);
 CREATE_FACTORY(NPC2);

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

-                      r9869
+                      r9925
 #include "repair_station.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
+ObjectListDefinition(RepairStation);
 CREATE_FACTORY(RepairStation);

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

-                      r9869
+                      r9925
 #include "effects/explosion.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
+ObjectListDefinition(SpaceTurret);
 CREATE_FACTORY(SpaceTurret);

branches/network/src/world_entities/particles/box_emitter.cc

-                      r9869
+                      r9925
 #include "debug.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
+ObjectListDefinition(BoxEmitter);
 CREATE_FACTORY(BoxEmitter);

branches/network/src/world_entities/particles/dot_emitter.cc

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
+ObjectListDefinition(DotEmitter);
 CREATE_FACTORY(DotEmitter);

branches/network/src/world_entities/particles/dot_particles.cc

-                      r9869
+                      r9925
 #include "state.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
+ObjectListDefinition(DotParticles);
 CREATE_FACTORY(DotParticles);

branches/network/src/world_entities/particles/model_particles.cc

-                      r9869
+                      r9925
 #include "debug.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
+ObjectListDefinition(ModelParticles);
 CREATE_FACTORY(ModelParticles);

branches/network/src/world_entities/particles/plane_emitter.cc

-                      r9869
+                      r9925
 #include "debug.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
+ObjectListDefinition(PlaneEmitter);
 CREATE_FACTORY(PlaneEmitter);

branches/network/src/world_entities/particles/spark_particles.cc

-                      r9869
+                      r9925
 #include "shell_command.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
+ObjectListDefinition(SparkParticles);
 CREATE_FACTORY(SparkParticles);

branches/network/src/world_entities/particles/sprite_particles.cc

-                      r9869
+                      r9925
 #include "shell_command.h"
-#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
+ObjectListDefinition(SpriteParticles);
 CREATE_FACTORY(SpriteParticles);

branches/network/src/world_entities/planet.cc

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Planet, CL_PLANET);
+ObjectListDefinition(Planet);
 CREATE_FACTORY(Planet);

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

-                      r9907
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
+ObjectListDefinition(LaserPowerUp);
 CREATE_FACTORY(LaserPowerUp);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
+ObjectListDefinition(ParamPowerUp);
 CREATE_FACTORY(ParamPowerUp);

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

-                      r9907
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
+ObjectListDefinition(TurretPowerUp);
 CREATE_FACTORY(TurretPowerUp);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+ObjectListDefinition(WeaponPowerUp);
 CREATE_FACTORY(WeaponPowerUp);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Bomb, CL_BOMB);
+ObjectListDefinition(Bomb);
 CREATE_FAST_FACTORY_STATIC(Bomb);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
+ObjectListDefinition(BoomerangProjectile);
 CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
+ObjectListDefinition(GuidedMissile);
 CREATE_FAST_FACTORY_STATIC(GuidedMissile);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
+ObjectListDefinition(Hyperblast);
 CREATE_FAST_FACTORY_STATIC(Hyperblast);

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

r9869	r9925
28	28
29	29
30		#include "class_id_DEPRECATED.h"
	30
31	31	ObjectListDefinition(Laser);
32	32	CREATE_FAST_FACTORY_STATIC(Laser);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
+ObjectListDefinition(RailProjectile);
 CREATE_FAST_FACTORY_STATIC(RailProjectile);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Rocket, CL_ROCKET);
+ObjectListDefinition(Rocket);
 CREATE_FAST_FACTORY_STATIC(Rocket);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
+ObjectListDefinition(TestBullet);
 CREATE_FAST_FACTORY_STATIC(TestBullet);

branches/network/src/world_entities/recorder.cc

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Recorder, CL_RECORDER);
+ObjectListDefinition(Recorder);
 CREATE_FACTORY(Recorder);

branches/network/src/world_entities/skybox.cc

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SkyBox, CL_SKYBOX);
+ObjectListDefinition(SkyBox);
 CREATE_FACTORY(SkyBox);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
+ObjectListDefinition(CollisionProbe);
 CREATE_FACTORY(CollisionProbe);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Cruizer, CL_CRUIZER);
+ObjectListDefinition(Cruizer);
 CREATE_FACTORY(Cruizer);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
+ObjectListDefinition(Helicopter);
 CREATE_FACTORY(Helicopter);
 #include "script_class.h"

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Hover, CL_HOVER);
+ObjectListDefinition(Hover);
 CREATE_FACTORY(Hover);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
+ObjectListDefinition(SpaceShip);
 CREATE_FACTORY(SpaceShip);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
+ObjectListDefinition(Spacecraft2D);
 CREATE_FACTORY(Spacecraft2D);

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

-                      r9869
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
+ObjectListDefinition(TurbineHover);
 CREATE_FACTORY(TurbineHover);

branches/network/src/world_entities/spawning_point.cc

-                      r9869
+                      r9925
 #include "converter.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
+ObjectListDefinition(SpawningPoint);
 CREATE_FACTORY( SpawningPoint);
 /**

branches/network/src/world_entities/spectator.cc

-                      r9922
+                      r9925
 #include "src/world_entities/npcs/generic_npc.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Spectator, CL_SPECTATOR);
+ObjectListDefinition(Spectator);
 CREATE_FACTORY(Spectator);

branches/network/src/world_entities/terrain.cc

-                      r9877
+                      r9925
 #include "debug.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Terrain, CL_TERRAIN);
+ObjectListDefinition(Terrain);
 CREATE_FACTORY(Terrain);

branches/network/src/world_entities/test_entity.cc

r9869	r9925
35	35
36	36
37		#include "class_id_DEPRECATED.h"
	37
38	38	ObjectListDefinition(TestEntity);
39	39	CREATE_FACTORY(TestEntity);

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

-                      r9869
+                      r9925
 #include "util/loading/factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
+ObjectListDefinition(AimingTurret);
 CREATE_FACTORY(AimingTurret);

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

-                      r9869
+                      r9925
 #include "util/loading/factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
+ObjectListDefinition(BoomerangGun);
 CREATE_FACTORY(BoomerangGun);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Cannon, CL_CANNON);
+ObjectListDefinition(Cannon);
 CREATE_FACTORY(Cannon);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
+ObjectListDefinition(FPSSniperRifle);
 CREATE_FACTORY(FPSSniperRifle);

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

-                      r9869
+                      r9925
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
+ObjectListDefinition(Hyperblaster);
 CREATE_FACTORY(Hyperblaster);

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

-                      r9869
+                      r9925
 #include "loading/fast_factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
+ObjectListDefinition(LaserCannon);
 CREATE_FACTORY(LaserCannon);

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

-                      r9869
+                      r9925
 #include "util/loading/factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
+ObjectListDefinition(TargetingTurret);
 CREATE_FACTORY(TargetingTurret);

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

-                      r9869
+                      r9925
 #include "loading/fast_factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(TestGun, CL_TEST_GUN);
+ObjectListDefinition(TestGun);
 CREATE_FACTORY(TestGun);
 /**

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

-                      r9869
+                      r9925
 #include "util/loading/factory.h"
+#include "class_id_DEPRECATED.h"
 ObjectListDefinitionID(Turret, CL_TURRET);
+ObjectListDefinition(Turret);
 CREATE_FACTORY(Turret);

branches/network/src/world_entities/weather_effects/cloud_effect.cc

-                      r9869
+                      r9925
 #include "resource_shader.h"
+#include "class_id_DEPRECATED.h"
 Vector    CloudEffect::cloudColor;
 …
 float     CloudEffect::fadeTime;
 ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
+ObjectListDefinition(CloudEffect);

branches/network/src/world_entities/weather_effects/fog_effect.cc

r9869	r9925
30	30	SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
31	31
32		#include "class_id_DEPRECATED.h"
	32
33	33
34	34	CREATE_SCRIPTABLE_CLASS(FogEffect,

branches/network/src/world_entities/weather_effects/lense_flare.cc

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

branches/network/src/world_entities/weather_effects/lightning_effect.cc

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

branches/network/src/world_entities/weather_effects/rain_effect.cc

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

branches/network/src/world_entities/weather_effects/snow_effect.cc

-                      r9869
+                      r9925
 #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);

branches/network/src/world_entities/weather_effects/volfog_effect.cc

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

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 9925 in orxonox.OLD

Legend:

Download in other formats: