Changeset 9638 for code/branches/core6/src

Timestamp:

Aug 11, 2013, 5:52:29 PM (11 years ago)

Author:

landauf

Message:

renamed CreateFactory() as RegisterClass() to be more consistent with the corresponding RegisterObject() macro

Location:

code/branches/core6/src

Files:

• libraries/core/BaseObject.cc (modified) (1 diff)
• libraries/core/CoreIncludes.h (modified) (6 diffs)
• libraries/core/Namespace.cc (modified) (1 diff)
• libraries/core/Template.cc (modified) (1 diff)
• libraries/tools/ResourceCollection.cc (modified) (1 diff)
• libraries/tools/ResourceLocation.cc (modified) (1 diff)
• modules/designtools/CreateStars.cc (modified) (1 diff)
• modules/docking/Dock.cc (modified) (1 diff)
• modules/docking/DockToShip.cc (modified) (1 diff)
• modules/docking/DockingController.cc (modified) (1 diff)
• modules/docking/DockingTarget.cc (modified) (1 diff)
• modules/docking/MoveToDockingTarget.cc (modified) (1 diff)
• modules/gametypes/OldRaceCheckPoint.cc (modified) (1 diff)
• modules/gametypes/OldSpaceRace.cc (modified) (1 diff)
• modules/gametypes/RaceCheckPoint.cc (modified) (1 diff)
• modules/gametypes/SpaceRace.cc (modified) (1 diff)
• modules/gametypes/SpaceRaceBot.cc (modified) (1 diff)
• modules/gametypes/SpaceRaceController.cc (modified) (1 diff)
• modules/gametypes/SpaceRaceManager.cc (modified) (1 diff)
• modules/notifications/NotificationDispatcher.cc (modified) (1 diff)
• modules/notifications/NotificationQueue.cc (modified) (1 diff)
• modules/notifications/NotificationQueueCEGUI.cc (modified) (1 diff)
• modules/notifications/dispatchers/CommandNotification.cc (modified) (1 diff)
• modules/notifications/dispatchers/SimpleNotification.cc (modified) (1 diff)
• modules/objects/Attacher.cc (modified) (1 diff)
• modules/objects/ForceField.cc (modified) (1 diff)
• modules/objects/Planet.cc (modified) (1 diff)
• modules/objects/Script.cc (modified) (1 diff)
• modules/objects/SpaceBoundaries.cc (modified) (1 diff)
• modules/objects/Turret.cc (modified) (1 diff)
• modules/objects/collisionshapes/BoxCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/ConeCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/SphereCollisionShape.cc (modified) (1 diff)
• modules/objects/eventsystem/EventDispatcher.cc (modified) (1 diff)
• modules/objects/eventsystem/EventFilter.cc (modified) (1 diff)
• modules/objects/eventsystem/EventListener.cc (modified) (1 diff)
• modules/objects/eventsystem/EventName.cc (modified) (1 diff)
• modules/objects/eventsystem/EventTarget.cc (modified) (1 diff)
• modules/objects/triggers/CheckPoint.cc (modified) (1 diff)
• modules/objects/triggers/DistanceMultiTrigger.cc (modified) (1 diff)
• modules/objects/triggers/DistanceTrigger.cc (modified) (1 diff)
• modules/objects/triggers/DistanceTriggerBeacon.cc (modified) (1 diff)
• modules/objects/triggers/EventMultiTrigger.cc (modified) (1 diff)
• modules/objects/triggers/EventTrigger.cc (modified) (1 diff)
• modules/objects/triggers/MultiTrigger.cc (modified) (1 diff)
• modules/objects/triggers/MultiTriggerContainer.cc (modified) (1 diff)
• modules/objects/triggers/Trigger.cc (modified) (1 diff)
• modules/objects/triggers/TriggerBase.cc (modified) (1 diff)
• modules/overlays/FadeoutText.cc (modified) (1 diff)
• modules/overlays/GUIOverlay.cc (modified) (1 diff)
• modules/overlays/OverlayText.cc (modified) (1 diff)
• modules/overlays/debugging/DebugFPSText.cc (modified) (1 diff)
• modules/overlays/debugging/DebugRTRText.cc (modified) (1 diff)
• modules/overlays/hud/AnnounceMessage.cc (modified) (1 diff)
• modules/overlays/hud/ChatOverlay.cc (modified) (1 diff)
• modules/overlays/hud/DeathMessage.cc (modified) (1 diff)
• modules/overlays/hud/GametypeFadingMessage.cc (modified) (1 diff)
• modules/overlays/hud/GametypeStaticMessage.cc (modified) (1 diff)
• modules/overlays/hud/HUDBar.cc (modified) (1 diff)
• modules/overlays/hud/HUDBoostBar.cc (modified) (1 diff)
• modules/overlays/hud/HUDEnemyHealthBar.cc (modified) (1 diff)
• modules/overlays/hud/HUDHealthBar.cc (modified) (1 diff)
• modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• modules/overlays/hud/HUDRadar.cc (modified) (1 diff)
• modules/overlays/hud/HUDSpeedBar.cc (modified) (1 diff)
• modules/overlays/hud/HUDTimer.cc (modified) (1 diff)
• modules/overlays/hud/KillMessage.cc (modified) (1 diff)
• modules/overlays/hud/LastManStandingInfos.cc (modified) (1 diff)
• modules/overlays/hud/LastTeamStandingInfos.cc (modified) (1 diff)
• modules/overlays/hud/PauseNotice.cc (modified) (1 diff)
• modules/overlays/hud/TeamBaseMatchScore.cc (modified) (1 diff)
• modules/overlays/stats/Scoreboard.cc (modified) (1 diff)
• modules/overlays/stats/Stats.cc (modified) (1 diff)
• modules/pickup/Pickup.cc (modified) (1 diff)
• modules/pickup/PickupCollection.cc (modified) (1 diff)
• modules/pickup/PickupRepresentation.cc (modified) (1 diff)
• modules/pickup/PickupSpawner.cc (modified) (1 diff)
• modules/pickup/items/DamageBoostPickup.cc (modified) (1 diff)
• modules/pickup/items/DronePickup.cc (modified) (1 diff)
• modules/pickup/items/HealthPickup.cc (modified) (1 diff)
• modules/pickup/items/InvisiblePickup.cc (modified) (1 diff)
• modules/pickup/items/MetaPickup.cc (modified) (1 diff)
• modules/pickup/items/ShieldPickup.cc (modified) (1 diff)
• modules/pickup/items/ShrinkPickup.cc (modified) (1 diff)
• modules/pickup/items/SpeedPickup.cc (modified) (1 diff)
• modules/pong/Pong.cc (modified) (1 diff)
• modules/pong/PongAI.cc (modified) (1 diff)
• modules/pong/PongBall.cc (modified) (1 diff)
• modules/pong/PongBat.cc (modified) (1 diff)
• modules/pong/PongBot.cc (modified) (1 diff)
• modules/pong/PongCenterpoint.cc (modified) (1 diff)
• modules/pong/PongScore.cc (modified) (1 diff)
• modules/portals/PortalEndPoint.cc (modified) (1 diff)
• modules/portals/PortalLink.cc (modified) (1 diff)
• modules/questsystem/GlobalQuest.cc (modified) (1 diff)
• modules/questsystem/LocalQuest.cc (modified) (1 diff)
• modules/questsystem/QuestDescription.cc (modified) (1 diff)
• modules/questsystem/QuestEffectBeacon.cc (modified) (1 diff)
• modules/questsystem/QuestHint.cc (modified) (1 diff)
• modules/questsystem/QuestItem.cc (modified) (1 diff)
• modules/questsystem/QuestListener.cc (modified) (1 diff)
• modules/questsystem/effects/AddQuest.cc (modified) (1 diff)
• modules/questsystem/effects/AddQuestHint.cc (modified) (1 diff)
• modules/questsystem/effects/AddReward.cc (modified) (1 diff)
• modules/questsystem/effects/CompleteQuest.cc (modified) (1 diff)
• modules/questsystem/effects/FailQuest.cc (modified) (1 diff)
• modules/tetris/Tetris.cc (modified) (1 diff)
• modules/tetris/TetrisBrick.cc (modified) (1 diff)
• modules/tetris/TetrisCenterpoint.cc (modified) (1 diff)
• modules/tetris/TetrisScore.cc (modified) (1 diff)
• modules/tetris/TetrisStone.cc (modified) (1 diff)
• modules/towerdefense/Tower.cc (modified) (1 diff)
• modules/towerdefense/TowerDefense.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseController.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseHUDController.cc (modified) (1 diff)
• modules/weapons/MuzzleFlash.cc (modified) (1 diff)
• modules/weapons/munitions/FusionMunition.cc (modified) (1 diff)
• modules/weapons/munitions/LaserMunition.cc (modified) (1 diff)
• modules/weapons/munitions/ReplenishingMunition.cc (modified) (1 diff)
• modules/weapons/munitions/RocketMunition.cc (modified) (1 diff)
• modules/weapons/projectiles/BillboardProjectile.cc (modified) (1 diff)
• modules/weapons/projectiles/LightningGunProjectile.cc (modified) (1 diff)
• modules/weapons/projectiles/ParticleProjectile.cc (modified) (1 diff)
• modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)
• modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• orxonox/Level.cc (modified) (1 diff)
• orxonox/LevelInfo.cc (modified) (1 diff)
• orxonox/Scene.cc (modified) (1 diff)
• orxonox/Test.cc (modified) (1 diff)
• orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• orxonox/controllers/AIController.cc (modified) (1 diff)
• orxonox/controllers/Controller.cc (modified) (1 diff)
• orxonox/controllers/DroneController.cc (modified) (1 diff)
• orxonox/controllers/HumanController.cc (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (1 diff)
• orxonox/controllers/ScriptController.cc (modified) (1 diff)
• orxonox/controllers/WaypointController.cc (modified) (1 diff)
• orxonox/controllers/WaypointPatrolController.cc (modified) (1 diff)
• orxonox/gametypes/Asteroids.cc (modified) (1 diff)
• orxonox/gametypes/Deathmatch.cc (modified) (1 diff)
• orxonox/gametypes/Dynamicmatch.cc (modified) (1 diff)
• orxonox/gametypes/Gametype.cc (modified) (1 diff)
• orxonox/gametypes/LastManStanding.cc (modified) (1 diff)
• orxonox/gametypes/LastTeamStanding.cc (modified) (1 diff)
• orxonox/gametypes/Mission.cc (modified) (1 diff)
• orxonox/gametypes/TeamBaseMatch.cc (modified) (1 diff)
• orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)
• orxonox/gametypes/TeamGametype.cc (modified) (1 diff)
• orxonox/gametypes/UnderAttack.cc (modified) (1 diff)
• orxonox/graphics/AnimatedModel.cc (modified) (1 diff)
• orxonox/graphics/Backlight.cc (modified) (1 diff)
• orxonox/graphics/Billboard.cc (modified) (1 diff)
• orxonox/graphics/BlinkingBillboard.cc (modified) (1 diff)
• orxonox/graphics/Camera.cc (modified) (1 diff)
• orxonox/graphics/FadingBillboard.cc (modified) (1 diff)
• orxonox/graphics/GlobalShader.cc (modified) (1 diff)
• orxonox/graphics/Light.cc (modified) (1 diff)
• orxonox/graphics/MeshLodInformation.cc (modified) (1 diff)
• orxonox/graphics/Model.cc (modified) (1 diff)
• orxonox/graphics/ParticleEmitter.cc (modified) (1 diff)
• orxonox/graphics/ParticleSpawner.cc (modified) (1 diff)
• orxonox/infos/Bot.cc (modified) (1 diff)
• orxonox/infos/GametypeInfo.cc (modified) (1 diff)
• orxonox/infos/HumanPlayer.cc (modified) (1 diff)
• orxonox/items/Engine.cc (modified) (1 diff)
• orxonox/items/MultiStateEngine.cc (modified) (1 diff)
• orxonox/overlays/GUISheet.cc (modified) (1 diff)
• orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• orxonox/sound/WorldAmbientSound.cc (modified) (1 diff)
• orxonox/sound/WorldSound.cc (modified) (1 diff)
• orxonox/weaponsystem/DefaultWeaponmodeLink.cc (modified) (1 diff)
• orxonox/weaponsystem/Munition.cc (modified) (1 diff)
• orxonox/weaponsystem/Weapon.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponPack.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponSet.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponSlot.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)
• orxonox/worldentities/BigExplosion.cc (modified) (1 diff)
• orxonox/worldentities/CameraPosition.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)
• orxonox/worldentities/Drone.cc (modified) (1 diff)
• orxonox/worldentities/EffectContainer.cc (modified) (1 diff)
• orxonox/worldentities/ExplosionChunk.cc (modified) (1 diff)
• orxonox/worldentities/MovableEntity.cc (modified) (1 diff)
• orxonox/worldentities/SpawnPoint.cc (modified) (1 diff)
• orxonox/worldentities/StaticEntity.cc (modified) (1 diff)
• orxonox/worldentities/TeamSpawnPoint.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Destroyer.cc (modified) (1 diff)
• orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Spectator.cc (modified) (1 diff)
• orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) (1 diff)

code/branches/core6/src/libraries/core/BaseObject.cc

@@ -50 +50 @@
 namespace orxonox
 {
-    CreateFactory(BaseObject);
+    RegisterClass(BaseObject);
 
     /**

code/branches/core6/src/libraries/core/CoreIncludes.h

@@ -28 +28 @@
 
 /**
-    @defgroup Factory RegisterObject() and CreateFactory()
+    @defgroup Factory RegisterObject() and RegisterClass()
     @ingroup Object
 */
@@ -35 +35 @@
     @file
     @ingroup Object Factory Class Identifier
-    @brief Defines several very important macros used to register objects, create factories, and to work with identifiers.
+    @brief Defines several very important macros used to register objects, register classes, and to work with identifiers.
 
     Every class needs the @c RegisterObject(class) macro in its constructor. If the class is an interface
     or the @c BaseObject itself, it needs the macro @c RegisterRootObject(class) instead.
 
-    To allow the object being created through the factory, use the @c CreateFactory(class) macro outside
-    of the class implementation, so it gets executed statically before @c main(). This will at the same time
-    register @a class in the class-hierarchy. If you don't want @a class to be loadable, but still
-    register it, call @c CreateUnloadableFactory(class).
+    To register @a class in the class-hierarchy, use the @c RegisterClass(class) macro outside of the class implementation,
+    so it gets executed statically before @c main(). If you don't want @a class to be loadable, but still register it, call
+    @c RegisterUnloadableClass(class).
 
     Example:
     @code
-    // Create the factory for MyClass
-    CreateFactory(MyClass);
+    // register MyClass
+    RegisterClass(MyClass);
 
     // Constructor:
@@ -83 +82 @@
 #include "object/ObjectList.h"
 
+// resolve macro conflict on windows
+#if defined(ORXONOX_PLATFORM_WINDOWS)
+#   include <windows.h>
+#   undef RegisterClass
+#endif
+
 
 /**
@@ -96 +101 @@
 
 /**
-    @brief Registers a newly created object in the core. Has to be called at the beginning of the constructor of @a ClassName.
+    @brief Registers a newly created object in the framework. Has to be called at the beginning of the constructor of @a ClassName.
     @param ClassName The name of the class
 */
@@ -103 +108 @@
 
 /**
-    @brief Registers a newly created object in the core. Has to be called at the beginning of the constructor of @a ClassName.
+    @brief Registers a newly created object in the framework. Has to be called at the beginning of the constructor of @a ClassName.
     @param ClassName The name of the class
 
@@ -113 +118 @@
 
 /**
-    @brief Creates and registers the Factory.
-    @param ClassName The name of the class
-*/
-#define CreateFactory(ClassName) \
-    RegisterFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), true)
-
-/**
-    @brief Creates and registers the Factory for classes which should not be loaded through XML.
-    @param ClassName The name of the class
-*/
-#define CreateUnloadableFactory(ClassName) \
-    RegisterFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), false)
-
-/**
-    @brief Registers a given Factory.
-    @param ClassName The name of the class
-*/
-#define RegisterFactory(ClassName, FactoryInstance, bLoadable) \
+    @brief Registers the class in the framework.
+    @param ClassName The name of the class
+*/
+#define RegisterClass(ClassName) \
+    RegisterClassWithFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), true)
+
+/**
+    @brief Registers the class in the framework (for classes which should not be loaded through XML).
+    @param ClassName The name of the class
+*/
+#define RegisterUnloadableClass(ClassName) \
+    RegisterClassWithFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), false)
+
+/**
+    @brief Registers the class in the framework with a given Factory.
+    @param ClassName The name of the class
+*/
+#define RegisterClassWithFactory(ClassName, FactoryInstance, bLoadable) \
     Identifier* _##ClassName##Identifier = orxonox::registerClass<ClassName>(#ClassName, FactoryInstance, bLoadable)
 

code/branches/core6/src/libraries/core/Namespace.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(Namespace);
+    RegisterClass(Namespace);
 
     Namespace::Namespace(Context* context) : BaseObject(context), Context(context),

code/branches/core6/src/libraries/core/Template.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(Template);
+    RegisterClass(Template);
 
     Template::Template(Context* context) : BaseObject(context)

code/branches/core6/src/libraries/tools/ResourceCollection.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(ResourceCollection);
+    RegisterClass(ResourceCollection);
 
     ResourceCollection::ResourceCollection(Context* context)

code/branches/core6/src/libraries/tools/ResourceLocation.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(ResourceLocation);
+    RegisterClass(ResourceLocation);
 
     ResourceLocation::ResourceLocation(Context* context)

code/branches/core6/src/modules/designtools/CreateStars.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(CreateStars);
+    RegisterClass(CreateStars);
 
     CreateStars::CreateStars(Context* context) : BaseObject(context)

code/branches/core6/src/modules/docking/Dock.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(Dock);
+    RegisterClass(Dock);
 
     SetConsoleCommand("Dock", "dock",    &Dock::cmdDock).addShortcut().setAsInputCommand();

code/branches/core6/src/modules/docking/DockToShip.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(DockToShip);
+    RegisterClass(DockToShip);
 
     DockToShip::DockToShip(Context* context) : DockingEffect(context)

code/branches/core6/src/modules/docking/DockingController.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(DockingController);
+    RegisterClass(DockingController);
 
     DockingController::DockingController(Context* context) : ArtificialController(context)

code/branches/core6/src/modules/docking/DockingTarget.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(DockingTarget);
+    RegisterClass(DockingTarget);
 
     DockingTarget::DockingTarget(Context* context) : StaticEntity(context)

code/branches/core6/src/modules/docking/MoveToDockingTarget.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(MoveToDockingTarget);
+    RegisterClass(MoveToDockingTarget);
 
     MoveToDockingTarget::MoveToDockingTarget(Context* context) : DockingAnimation(context)

code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(OldRaceCheckPoint);
+    RegisterClass(OldRaceCheckPoint);
 
     OldRaceCheckPoint::OldRaceCheckPoint(Context* context): DistanceTrigger(context), RadarViewable(this, static_cast<WorldEntity*>(this))

code/branches/core6/src/modules/gametypes/OldSpaceRace.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(OldSpaceRace);
+    RegisterUnloadableClass(OldSpaceRace);
 
     OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)

code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(RaceCheckPoint);
+    RegisterClass(RaceCheckPoint);
 
     RaceCheckPoint::RaceCheckPoint(Context* context) : DistanceMultiTrigger(context),

code/branches/core6/src/modules/gametypes/SpaceRace.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(SpaceRace);
+    RegisterUnloadableClass(SpaceRace);
 
     SpaceRace::SpaceRace(Context* context) : Gametype(context)

code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc

@@ -29 +29 @@
 namespace orxonox
 {
-    CreateFactory(SpaceRaceBot);
+    RegisterClass(SpaceRaceBot);
 
     SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){

code/branches/core6/src/modules/gametypes/SpaceRaceController.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(SpaceRaceController);
+    RegisterClass(SpaceRaceController);
 
     const int ADJUSTDISTANCE = 500;

code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(SpaceRaceManager);
+    RegisterClass(SpaceRaceManager);
 
     SpaceRaceManager::SpaceRaceManager(Context* context) :

code/branches/core6/src/modules/notifications/NotificationDispatcher.cc

@@ -48 +48 @@
 {
 
-    CreateUnloadableFactory(NotificationDispatcher);
+    RegisterUnloadableClass(NotificationDispatcher);
 
     registerMemberNetworkFunction(NotificationDispatcher, broadcastHelper);

code/branches/core6/src/modules/notifications/NotificationQueue.cc

@@ -44 +44 @@
 {
 
-    CreateFactory(NotificationQueue);
+    RegisterClass(NotificationQueue);
 
     /**

code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.cc

@@ -46 +46 @@
 {
 
-    CreateFactory(NotificationQueueCEGUI);
+    RegisterClass(NotificationQueueCEGUI);
 
     /*static*/ const std::string NotificationQueueCEGUI::NOTIFICATION_LAYER("NotificationLayer");

code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.cc

@@ -44 +44 @@
 namespace orxonox {
 
-    CreateFactory(CommandNotification);
+    RegisterClass(CommandNotification);
 
     /**

code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.cc

@@ -39 +39 @@
 namespace orxonox {
 
-    CreateFactory(SimpleNotification);
+    RegisterClass(SimpleNotification);
 
     /**

code/branches/core6/src/modules/objects/Attacher.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(Attacher);
+    RegisterClass(Attacher);
 
     Attacher::Attacher(Context* context) : StaticEntity(context)

code/branches/core6/src/modules/objects/ForceField.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(ForceField);
+    RegisterClass(ForceField);
 
     /*static*/ const std::string ForceField::modeTube_s = "tube";

code/branches/core6/src/modules/objects/Planet.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(Planet);
+    RegisterClass(Planet);
 
     /**

code/branches/core6/src/modules/objects/Script.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(Script);
+    RegisterClass(Script);
 
     registerStaticNetworkFunction(Script::executeHelper);

code/branches/core6/src/modules/objects/SpaceBoundaries.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(SpaceBoundaries);
+    RegisterClass(SpaceBoundaries);
 
     SpaceBoundaries::SpaceBoundaries(Context* context) : StaticEntity(context)

code/branches/core6/src/modules/objects/Turret.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(Turret);
+    RegisterClass(Turret);
 
     /**

code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(BoxCollisionShape);
+    RegisterClass(BoxCollisionShape);
 
     /**

code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(ConeCollisionShape);
+    RegisterClass(ConeCollisionShape);
 
     /**

code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(PlaneCollisionShape);
+    RegisterClass(PlaneCollisionShape);
 
     /**

code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(SphereCollisionShape);
+    RegisterClass(SphereCollisionShape);
 
     /**

code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(EventDispatcher);
+    RegisterClass(EventDispatcher);
 
     EventDispatcher::EventDispatcher(Context* context) : BaseObject(context)

code/branches/core6/src/modules/objects/eventsystem/EventFilter.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(EventFilter);
+    RegisterClass(EventFilter);
 
     EventFilter::EventFilter(Context* context) : BaseObject(context)

code/branches/core6/src/modules/objects/eventsystem/EventListener.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(EventListener);
+    RegisterClass(EventListener);
 
     EventListener::EventListener(Context* context) : BaseObject(context)

code/branches/core6/src/modules/objects/eventsystem/EventName.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    CreateFactory(EventName);
+    RegisterClass(EventName);
 
     EventName::EventName(Context* context) : BaseObject(context)

code/branches/core6/src/modules/objects/eventsystem/EventTarget.cc

@@ -33 +33 @@
 namespace orxonox
 {
-    CreateFactory(EventTarget);
+    RegisterClass(EventTarget);
 
     EventTarget::EventTarget(Context* context) : BaseObject(context)

code/branches/core6/src/modules/objects/triggers/CheckPoint.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(CheckPoint);
+    RegisterClass(CheckPoint);
 
     CheckPoint::CheckPoint(Context* context)

code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -47 +47 @@
     /*static*/ const std::string DistanceMultiTrigger::beaconModeExlcude_s = "exclude";
     
-    CreateFactory(DistanceMultiTrigger);
+    RegisterClass(DistanceMultiTrigger);
 
     /**

code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc

@@ -49 +49 @@
     /*static*/ const std::string DistanceTrigger::beaconModeExlcude_s = "exclude";
 
-    CreateFactory(DistanceTrigger);
+    RegisterClass(DistanceTrigger);
 
     /**

code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc

@@ -40 +40 @@
 {
 
-    CreateFactory(DistanceTriggerBeacon);
+    RegisterClass(DistanceTriggerBeacon);
 
     /**

code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc

@@ -43 +43 @@
 {
 
-    CreateFactory(EventMultiTrigger);
+    RegisterClass(EventMultiTrigger);
 
     /**

code/branches/core6/src/modules/objects/triggers/EventTrigger.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(EventTrigger);
+    RegisterClass(EventTrigger);
 
     /**

code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc

@@ -43 +43 @@
 {
 
-    CreateFactory(MultiTrigger);
+    RegisterClass(MultiTrigger);
 
     /**

code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc

@@ -42 +42 @@
 {
 
-    CreateUnloadableFactory(MultiTriggerContainer);
+    RegisterUnloadableClass(MultiTriggerContainer);
 
     /**

code/branches/core6/src/modules/objects/triggers/Trigger.cc

@@ -47 +47 @@
     SetConsoleCommand("Trigger", "debugFlares", &Trigger::debugFlares).defaultValues(false);
 
-    CreateFactory(Trigger);
+    RegisterClass(Trigger);
 
     /**

code/branches/core6/src/modules/objects/triggers/TriggerBase.cc

@@ -46 +46 @@
     /*static*/ const std::string TriggerBase::xor_s = "xor";
 
-    CreateFactory(TriggerBase);
+    RegisterClass(TriggerBase);
 
     /**

code/branches/core6/src/modules/overlays/FadeoutText.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(FadeoutText);
+    RegisterClass(FadeoutText);
 
     FadeoutText::FadeoutText(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/GUIOverlay.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(GUIOverlay);
+    RegisterClass(GUIOverlay);
 
     GUIOverlay::GUIOverlay(Context* context) : OrxonoxOverlay(context)

code/branches/core6/src/modules/overlays/OverlayText.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(OverlayText);
+    RegisterClass(OverlayText);
 
     BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left   == (int)OverlayText::Left);

code/branches/core6/src/modules/overlays/debugging/DebugFPSText.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(DebugFPSText);
+    RegisterClass(DebugFPSText);
 
     DebugFPSText::DebugFPSText(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/debugging/DebugRTRText.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(DebugRTRText);
+    RegisterClass(DebugRTRText);
 
     DebugRTRText::DebugRTRText(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(AnnounceMessage);
+    RegisterClass(AnnounceMessage);
 
     AnnounceMessage::AnnounceMessage(Context* context) : FadeoutText(context)

code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(ChatOverlay);
+    RegisterClass(ChatOverlay);
 
     ChatOverlay::ChatOverlay(Context* context)

code/branches/core6/src/modules/overlays/hud/DeathMessage.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(DeathMessage);
+    RegisterClass(DeathMessage);
 
     DeathMessage::DeathMessage(Context* context) : FadeoutText(context)

code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(GametypeFadingMessage);
+    RegisterClass(GametypeFadingMessage);
 
     GametypeFadingMessage::GametypeFadingMessage(Context* context) : FadeoutText(context)

code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(GametypeStaticMessage);
+    RegisterClass(GametypeStaticMessage);
 
 

code/branches/core6/src/modules/overlays/hud/HUDBar.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(BarColour);
+    RegisterClass(BarColour);
 
     BarColour::BarColour(Context* context)

code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(HUDBoostBar);
+    RegisterClass(HUDBoostBar);
 
     HUDBoostBar::HUDBoostBar(Context* context)

code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(HUDEnemyHealthBar);
+    RegisterClass(HUDEnemyHealthBar);
 
     HUDEnemyHealthBar::HUDEnemyHealthBar(Context* context) : HUDHealthBar(context)

code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(HUDHealthBar);
+    RegisterClass(HUDHealthBar);
 
     HUDHealthBar::HUDHealthBar(Context* context) : HUDBar(context)

code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc

@@ -67 +67 @@
         return a.second < b.second;
     }
-    CreateFactory ( HUDNavigation );
+    RegisterClass ( HUDNavigation );
 
     HUDNavigation* HUDNavigation::localHUD_s = 0;

code/branches/core6/src/modules/overlays/hud/HUDRadar.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(HUDRadar);
+    RegisterClass(HUDRadar);
 
     HUDRadar::HUDRadar(Context* context)

code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(HUDSpeedBar);
+    RegisterClass(HUDSpeedBar);
 
     HUDSpeedBar::HUDSpeedBar(Context* context)

code/branches/core6/src/modules/overlays/hud/HUDTimer.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(HUDTimer);
+    RegisterClass(HUDTimer);
 
     HUDTimer::HUDTimer(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/hud/KillMessage.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(KillMessage);
+    RegisterClass(KillMessage);
 
     KillMessage::KillMessage(Context* context) : FadeoutText(context)

code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(LastManStandingInfos);
+    RegisterClass(LastManStandingInfos);
 
     LastManStandingInfos::LastManStandingInfos(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(LastTeamStandingInfos);
+    RegisterClass(LastTeamStandingInfos);
 
     LastTeamStandingInfos::LastTeamStandingInfos(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/hud/PauseNotice.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(PauseNotice);
+    RegisterClass(PauseNotice);
 
     PauseNotice::PauseNotice(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(TeamBaseMatchScore);
+    RegisterClass(TeamBaseMatchScore);
 
     TeamBaseMatchScore::TeamBaseMatchScore(Context* context) : OverlayText(context)

code/branches/core6/src/modules/overlays/stats/Scoreboard.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(Scoreboard);
+    RegisterClass(Scoreboard);
 
     /**

code/branches/core6/src/modules/overlays/stats/Stats.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(Stats);
+    RegisterClass(Stats);
 
     /**

code/branches/core6/src/modules/pickup/Pickup.cc

@@ -48 +48 @@
     /*static*/ const std::string Pickup::durationTypeContinuous_s = "continuous";
 
-    CreateUnloadableFactory(Pickup);
+    RegisterUnloadableClass(Pickup);
 
     /**

code/branches/core6/src/modules/pickup/PickupCollection.cc

@@ -45 +45 @@
 {
 
-    CreateFactory(PickupCollection);
+    RegisterClass(PickupCollection);
 
     /**

code/branches/core6/src/modules/pickup/PickupRepresentation.cc

@@ -45 +45 @@
 {
 
-    CreateFactory(PickupRepresentation);
+    RegisterClass(PickupRepresentation);
 
     /**

code/branches/core6/src/modules/pickup/PickupSpawner.cc

@@ -47 +47 @@
 {
 
-    CreateFactory(PickupSpawner);
+    RegisterClass(PickupSpawner);
 
     /**

code/branches/core6/src/modules/pickup/items/DamageBoostPickup.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(DamageBoostPickup);
+    RegisterClass(DamageBoostPickup);
 
     /**

code/branches/core6/src/modules/pickup/items/DronePickup.cc

@@ -45 +45 @@
 {
 
-    CreateFactory(DronePickup);
+    RegisterClass(DronePickup);
 
     /**

code/branches/core6/src/modules/pickup/items/HealthPickup.cc

@@ -47 +47 @@
     /*static*/ const std::string HealthPickup::healthTypePermanent_s = "permanent";
 
-    CreateFactory(HealthPickup);
+    RegisterClass(HealthPickup);
 
     /**

code/branches/core6/src/modules/pickup/items/InvisiblePickup.cc

@@ -45 +45 @@
 {
 
-    CreateFactory(InvisiblePickup);
+    RegisterClass(InvisiblePickup);
 
     /**

code/branches/core6/src/modules/pickup/items/MetaPickup.cc

@@ -42 +42 @@
 namespace orxonox {
 
-    CreateFactory(MetaPickup);
+    RegisterClass(MetaPickup);
 
     //! Setting the static variables to their values.

code/branches/core6/src/modules/pickup/items/ShieldPickup.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(ShieldPickup);
+    RegisterClass(ShieldPickup);
 
     /**

code/branches/core6/src/modules/pickup/items/ShrinkPickup.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(ShrinkPickup);
+    RegisterClass(ShrinkPickup);
 
     /**

code/branches/core6/src/modules/pickup/items/SpeedPickup.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(SpeedPickup);
+    RegisterClass(SpeedPickup);
 
     /**

code/branches/core6/src/modules/pong/Pong.cc

@@ -53 +53 @@
     CreateEventName(PongCenterpoint, left);
 
-    CreateUnloadableFactory(Pong);
+    RegisterUnloadableClass(Pong);
 
     /**

code/branches/core6/src/modules/pong/PongAI.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(PongAI);
+    RegisterUnloadableClass(PongAI);
 
     const static float MAX_REACTION_TIME = 0.4f;

code/branches/core6/src/modules/pong/PongBall.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    CreateFactory(PongBall);
+    RegisterClass(PongBall);
 
     const float PongBall::MAX_REL_Z_VELOCITY = 1.5;

code/branches/core6/src/modules/pong/PongBat.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(PongBat);
+    RegisterClass(PongBat);
 
     /**

code/branches/core6/src/modules/pong/PongBot.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(PongBot);
+    RegisterClass(PongBot);
 
     /**

code/branches/core6/src/modules/pong/PongCenterpoint.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(PongCenterpoint);
+    RegisterClass(PongCenterpoint);
 
     /**

code/branches/core6/src/modules/pong/PongScore.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(PongScore);
+    RegisterClass(PongScore);
 
     /**

code/branches/core6/src/modules/portals/PortalEndPoint.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(PortalEndPoint);
+    RegisterClass(PortalEndPoint);
 
     /*static*/ const std::string PortalEndPoint::EVENTFUNCTIONNAME = "execute";

code/branches/core6/src/modules/portals/PortalLink.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(PortalLink);
+    RegisterClass(PortalLink);
 
     std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s;

code/branches/core6/src/modules/questsystem/GlobalQuest.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(GlobalQuest);
+    RegisterClass(GlobalQuest);
 
     /**

code/branches/core6/src/modules/questsystem/LocalQuest.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(LocalQuest);
+    RegisterClass(LocalQuest);
 
     /**

code/branches/core6/src/modules/questsystem/QuestDescription.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(QuestDescription);
+    RegisterClass(QuestDescription);
 
     /*static*/ const std::string QuestDescription::SENDER = "questsystem";

code/branches/core6/src/modules/questsystem/QuestEffectBeacon.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(QuestEffectBeacon);
+    RegisterClass(QuestEffectBeacon);
 
     /**

code/branches/core6/src/modules/questsystem/QuestHint.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    CreateFactory(QuestHint);
+    RegisterClass(QuestHint);
 
     /**

code/branches/core6/src/modules/questsystem/QuestItem.cc

@@ -42 +42 @@
 {
 
-    CreateUnloadableFactory(QuestItem);
+    RegisterUnloadableClass(QuestItem);
 
     /**

code/branches/core6/src/modules/questsystem/QuestListener.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(QuestListener);
+    RegisterClass(QuestListener);
 
     // Initialization of the static variables for the modes as strings.

code/branches/core6/src/modules/questsystem/effects/AddQuest.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    CreateFactory(AddQuest);
+    RegisterClass(AddQuest);
 
     /**

code/branches/core6/src/modules/questsystem/effects/AddQuestHint.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(AddQuestHint);
+    RegisterClass(AddQuestHint);
 
     /**

code/branches/core6/src/modules/questsystem/effects/AddReward.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(AddReward);
+    RegisterClass(AddReward);
 
     /**

code/branches/core6/src/modules/questsystem/effects/CompleteQuest.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(CompleteQuest);
+    RegisterClass(CompleteQuest);
 
     /**

code/branches/core6/src/modules/questsystem/effects/FailQuest.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(FailQuest);
+    RegisterClass(FailQuest);
 
     /**

code/branches/core6/src/modules/tetris/Tetris.cc

@@ -54 +54 @@
 {
 
-    CreateUnloadableFactory(Tetris);
+    RegisterUnloadableClass(Tetris);
 
     /**

code/branches/core6/src/modules/tetris/TetrisBrick.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(TetrisBrick);
+    RegisterClass(TetrisBrick);
 
     /**

code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(TetrisCenterpoint);
+    RegisterClass(TetrisCenterpoint);
 
     /**

code/branches/core6/src/modules/tetris/TetrisScore.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(TetrisScore);
+    RegisterClass(TetrisScore);
 
     /**

code/branches/core6/src/modules/tetris/TetrisStone.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(TetrisStone);
+    RegisterClass(TetrisStone);
 
     /**

code/branches/core6/src/modules/towerdefense/Tower.cc

@@ -16 +16 @@
 namespace orxonox
 {
-    CreateFactory(Tower);
+    RegisterClass(Tower);
 
     /**

code/branches/core6/src/modules/towerdefense/TowerDefense.cc

@@ -94 +94 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TowerDefense);
+    RegisterUnloadableClass(TowerDefense);
 
     TowerDefense::TowerDefense(Context* context) : Deathmatch(context)

code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(TowerDefenseCenterpoint);
+    RegisterClass(TowerDefenseCenterpoint);
 
     /**

code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(TowerDefenseController);
+    RegisterClass(TowerDefenseController);
 
     TowerDefenseController::TowerDefenseController(Context* context) : WaypointController(context)

code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(TowerDefenseHUDController);
+    RegisterClass(TowerDefenseHUDController);
 
     TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context)

code/branches/core6/src/modules/weapons/MuzzleFlash.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(MuzzleFlash);
+    RegisterClass(MuzzleFlash);
 
     MuzzleFlash::MuzzleFlash(Context* context) : Billboard(context)

code/branches/core6/src/modules/weapons/munitions/FusionMunition.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(FusionMunition);
+    RegisterClass(FusionMunition);
 
     FusionMunition::FusionMunition(Context* context) : Munition(context)

code/branches/core6/src/modules/weapons/munitions/LaserMunition.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(LaserMunition);
+    RegisterClass(LaserMunition);
 
     LaserMunition::LaserMunition(Context* context) : ReplenishingMunition(context)

code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(ReplenishingMunition);
+    RegisterClass(ReplenishingMunition);
 
     ReplenishingMunition::ReplenishingMunition(Context* context) : Munition(context)

code/branches/core6/src/modules/weapons/munitions/RocketMunition.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(RocketMunition);
+    RegisterClass(RocketMunition);
 
     RocketMunition::RocketMunition(Context* context) : Munition(context)

code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(BillboardProjectile);
+    RegisterClass(BillboardProjectile);
 
     BillboardProjectile::BillboardProjectile(Context* context) : Projectile(context)

code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(LightningGunProjectile);
+    RegisterClass(LightningGunProjectile);
 
     LightningGunProjectile::LightningGunProjectile(Context* context) : BillboardProjectile(context)

code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(ParticleProjectile);
+    RegisterClass(ParticleProjectile);
 
     ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context)

code/branches/core6/src/modules/weapons/projectiles/Projectile.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(Projectile);
+    RegisterClass(Projectile);
 
     Projectile::Projectile(Context* context) : MovableEntity(context), BasicProjectile()

code/branches/core6/src/modules/weapons/projectiles/Rocket.cc

@@ -51 +51 @@
 namespace orxonox
 {
-    CreateFactory(Rocket);
+    RegisterClass(Rocket);
 
     /**

code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -52 +52 @@
 namespace orxonox
 {
-    CreateFactory(SimpleRocket);
+    RegisterClass(SimpleRocket);
 
     const float SimpleRocket::FUEL_PERCENTAGE = 0.8f;

code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -49 +49 @@
 namespace orxonox
 {
-    CreateFactory(EnergyDrink);
+    RegisterClass(EnergyDrink);
 
     EnergyDrink::EnergyDrink(Context* context) : WeaponMode(context)

code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(FusionFire);
+    RegisterClass(FusionFire);
 
     FusionFire::FusionFire(Context* context) : WeaponMode(context)

code/branches/core6/src/modules/weapons/weaponmodes/HsW01.cc

@@ -50 +50 @@
 namespace orxonox
 {
-    CreateFactory(HsW01);
+    RegisterClass(HsW01);
 
     HsW01::HsW01(Context* context) : WeaponMode(context)

code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(LaserFire);
+    RegisterClass(LaserFire);
 
     LaserFire::LaserFire(Context* context) : WeaponMode(context)

code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(LightningGun);
+    RegisterClass(LightningGun);
 
     LightningGun::LightningGun(Context* context) : WeaponMode(context)

code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(RocketFire);
+    RegisterClass(RocketFire);
 
     RocketFire::RocketFire(Context* context) : WeaponMode(context)

code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -50 +50 @@
 {
 
-    CreateFactory(SimpleRocketFire);
+    RegisterClass(SimpleRocketFire);
 
     SimpleRocketFire::SimpleRocketFire(Context* context) : WeaponMode(context)

code/branches/core6/src/orxonox/Level.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    CreateFactory(Level);
+    RegisterClass(Level);
 
     Level::Level(Context* context) : BaseObject(context), Synchronisable(context), Context(context)

code/branches/core6/src/orxonox/LevelInfo.cc

@@ -242 +242 @@
     // LevelInfo
 
-    CreateFactory(LevelInfo);
+    RegisterClass(LevelInfo);
 
     /**

code/branches/core6/src/orxonox/Scene.cc

@@ -51 +51 @@
 namespace orxonox
 {
-    CreateFactory(Scene);
+    RegisterClass(Scene);
 
     Scene::Scene(Context* context) : BaseObject(context), Synchronisable(context), Context(context)

code/branches/core6/src/orxonox/Test.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory ( Test );
+    RegisterClass ( Test );
 
     SetConsoleCommand("Test", "printV1", &Test::printV1).addShortcut();

code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(CompoundCollisionShape);
+    RegisterClass(CompoundCollisionShape);
 
     /**

code/branches/core6/src/orxonox/controllers/AIController.cc

@@ -39 +39 @@
     const float AIController::ACTION_INTERVAL = 1.0f;
 
-    CreateFactory(AIController);
+    RegisterClass(AIController);
 
     AIController::AIController(Context* context) : ArtificialController(context)

code/branches/core6/src/orxonox/controllers/Controller.cc

@@ -33 +33 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Controller);
+    RegisterUnloadableClass(Controller);
 
     Controller::Controller(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/controllers/DroneController.cc

@@ -41 +41 @@
         Constructor.
     */
-    CreateFactory(DroneController);
+    RegisterClass(DroneController);
 
     const float DroneController::ACTION_INTERVAL = 1.0f;

code/branches/core6/src/orxonox/controllers/HumanController.cc

@@ -66 +66 @@
     SetConsoleCommand("HumanController", "myposition",             &HumanController::myposition    ).addShortcut();
 
-    CreateUnloadableFactory(HumanController);
+    RegisterUnloadableClass(HumanController);
 
     HumanController* HumanController::localController_s = 0;

code/branches/core6/src/orxonox/controllers/NewHumanController.cc

@@ -56 +56 @@
     SetConsoleCommand("NewHumanController", "unfire",     &NewHumanController::unfire    ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
-    CreateUnloadableFactory(NewHumanController);
+    RegisterUnloadableClass(NewHumanController);
 
     NewHumanController* NewHumanController::localController_s = 0;

code/branches/core6/src/orxonox/controllers/ScriptController.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    CreateFactory(ScriptController);
+    RegisterClass(ScriptController);
 
     ScriptController::ScriptController(Context* context) : ArtificialController(context)

code/branches/core6/src/orxonox/controllers/WaypointController.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(WaypointController);
+    RegisterClass(WaypointController);
 
     WaypointController::WaypointController(Context* context) : ArtificialController(context)

code/branches/core6/src/orxonox/controllers/WaypointPatrolController.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(WaypointPatrolController);
+    RegisterClass(WaypointPatrolController);
 
     WaypointPatrolController::WaypointPatrolController(Context* context) : WaypointController(context)

code/branches/core6/src/orxonox/gametypes/Asteroids.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Asteroids);
+    RegisterUnloadableClass(Asteroids);
 
     Asteroids::Asteroids(Context* context) : Gametype(context)

code/branches/core6/src/orxonox/gametypes/Deathmatch.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Deathmatch);
+    RegisterUnloadableClass(Deathmatch);
 
     Deathmatch::Deathmatch(Context* context) : Gametype(context)

code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc

@@ -62 +62 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Dynamicmatch);
+    RegisterUnloadableClass(Dynamicmatch);
 
     Dynamicmatch::Dynamicmatch(Context* context) : Gametype(context)

code/branches/core6/src/orxonox/gametypes/Gametype.cc

@@ -47 +47 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Gametype);
+    RegisterUnloadableClass(Gametype);
 
     Gametype::Gametype(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/gametypes/LastManStanding.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(LastManStanding);
+    RegisterUnloadableClass(LastManStanding);
 
     LastManStanding::LastManStanding(Context* context) : Deathmatch(context)

code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(LastTeamStanding);
+    RegisterUnloadableClass(LastTeamStanding);
 
     LastTeamStanding::LastTeamStanding(Context* context) : TeamDeathmatch(context)

code/branches/core6/src/orxonox/gametypes/Mission.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Mission);
+    RegisterUnloadableClass(Mission);
 
     Mission::Mission(Context* context) : TeamGametype(context)

code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamBaseMatch);
+    RegisterUnloadableClass(TeamBaseMatch);
 
     TeamBaseMatch::TeamBaseMatch(Context* context) : TeamDeathmatch(context)

code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamDeathmatch);
+    RegisterUnloadableClass(TeamDeathmatch);
 
     TeamDeathmatch::TeamDeathmatch(Context* context) : TeamGametype(context)

code/branches/core6/src/orxonox/gametypes/TeamGametype.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamGametype);
+    RegisterUnloadableClass(TeamGametype);
 
     TeamGametype::TeamGametype(Context* context) : Gametype(context)

code/branches/core6/src/orxonox/gametypes/UnderAttack.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(UnderAttack);
+    RegisterUnloadableClass(UnderAttack);
 
     UnderAttack::UnderAttack(Context* context) : TeamDeathmatch(context)

code/branches/core6/src/orxonox/graphics/AnimatedModel.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(AnimatedModel);
+    RegisterClass(AnimatedModel);
 
     AnimatedModel::AnimatedModel(Context* context) : Model(context)

code/branches/core6/src/orxonox/graphics/Backlight.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(Backlight);
+    RegisterClass(Backlight);
 
     Backlight::Backlight(Context* context) : FadingBillboard(context)

code/branches/core6/src/orxonox/graphics/Billboard.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(Billboard);
+    RegisterClass(Billboard);
 
     Billboard::Billboard(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(BlinkingBillboard);
+    RegisterClass(BlinkingBillboard);
 
     BlinkingBillboard::BlinkingBillboard(Context* context) : Billboard(context)

code/branches/core6/src/orxonox/graphics/Camera.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(Camera);
+    RegisterClass(Camera);
 
     Camera::Camera(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/graphics/FadingBillboard.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(FadingBillboard);
+    RegisterClass(FadingBillboard);
 
     FadingBillboard::FadingBillboard(Context* context) : Billboard(context)

code/branches/core6/src/orxonox/graphics/GlobalShader.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(GlobalShader);
+    RegisterClass(GlobalShader);
 
     GlobalShader::GlobalShader(Context* context) : BaseObject(context), Synchronisable(context)

code/branches/core6/src/orxonox/graphics/Light.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(Light);
+    RegisterClass(Light);
 
     // Be sure we don't do bad conversions

code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(MeshLodInformation);
+    RegisterClass(MeshLodInformation);
 
     MeshLodInformation::MeshLodInformation(Context* context)

code/branches/core6/src/orxonox/graphics/Model.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(Model);
+    RegisterClass(Model);
 
     Model::Model(Context* context) :

code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    CreateFactory(ParticleEmitter);
+    RegisterClass(ParticleEmitter);
 
     ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(ParticleSpawner);
+    RegisterClass(ParticleSpawner);
 
     ParticleSpawner::ParticleSpawner(Context* context) : ParticleEmitter(context)

code/branches/core6/src/orxonox/infos/Bot.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(Bot);
+    RegisterClass(Bot);
 
     Bot::Bot(Context* context) : PlayerInfo(context)

code/branches/core6/src/orxonox/infos/GametypeInfo.cc

@@ -48 +48 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(GametypeInfo);
+    RegisterUnloadableClass(GametypeInfo);
 
     registerMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage);

code/branches/core6/src/orxonox/infos/HumanPlayer.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(HumanPlayer);
+    RegisterUnloadableClass(HumanPlayer);
 
     HumanPlayer::HumanPlayer(Context* context) : PlayerInfo(context)

code/branches/core6/src/orxonox/items/Engine.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(Engine);
+    RegisterClass(Engine);
 
     /**

code/branches/core6/src/orxonox/items/MultiStateEngine.cc

@@ -49 +49 @@
     static const float MAX_VELOCITY_BOOST = 221;
 
-    CreateFactory(MultiStateEngine);
+    RegisterClass(MultiStateEngine);
 
     MultiStateEngine::MultiStateEngine(Context* context) : Engine(context)

code/branches/core6/src/orxonox/overlays/GUISheet.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(GUISheet);
+    RegisterClass(GUISheet);
 
     GUISheet::GUISheet(Context* context)

code/branches/core6/src/orxonox/overlays/OverlayGroup.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(OverlayGroup);
+    RegisterClass(OverlayGroup);
 
     SetConsoleCommand("OverlayGroup", "toggleVisibility", &OverlayGroup::toggleVisibility);

code/branches/core6/src/orxonox/sound/WorldAmbientSound.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(WorldAmbientSound);
+    RegisterClass(WorldAmbientSound);
 
     WorldAmbientSound::WorldAmbientSound(Context* context) : BaseObject(context), Synchronisable(context)

code/branches/core6/src/orxonox/sound/WorldSound.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(WorldSound);
+    RegisterClass(WorldSound);
 
     WorldSound::WorldSound(Context* context)

code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(DefaultWeaponmodeLink);
+    RegisterClass(DefaultWeaponmodeLink);
 
     DefaultWeaponmodeLink::DefaultWeaponmodeLink(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/weaponsystem/Munition.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(Munition);
+    RegisterClass(Munition);
 
     Munition::Munition(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/weaponsystem/Weapon.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(Weapon);
+    RegisterClass(Weapon);
 
     Weapon::Weapon(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/weaponsystem/WeaponPack.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(WeaponPack);
+    RegisterClass(WeaponPack);
 
     WeaponPack::WeaponPack(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/weaponsystem/WeaponSet.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(WeaponSet);
+    RegisterClass(WeaponSet);
 
     WeaponSet::WeaponSet(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(WeaponSlot);
+    RegisterClass(WeaponSlot);
 
     WeaponSlot::WeaponSlot(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(WeaponSystem);
+    RegisterClass(WeaponSystem);
 
     WeaponSystem::WeaponSystem(Context* context) : BaseObject(context)

code/branches/core6/src/orxonox/worldentities/BigExplosion.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(BigExplosion);
+    RegisterClass(BigExplosion);
 
     BigExplosion::BigExplosion(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/worldentities/CameraPosition.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(CameraPosition);
+    RegisterClass(CameraPosition);
 
     CameraPosition::CameraPosition(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc

@@ -47 +47 @@
 namespace orxonox
 {
-    CreateFactory(ControllableEntity);
+    RegisterClass(ControllableEntity);
 
     registerMemberNetworkFunction( ControllableEntity, fire );

code/branches/core6/src/orxonox/worldentities/Drone.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(Drone);
+    RegisterClass(Drone);
     /**
     @brief

code/branches/core6/src/orxonox/worldentities/EffectContainer.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    CreateFactory(EffectContainer);
+    RegisterClass(EffectContainer);
 
     EffectContainer::EffectContainer(Context* context)

code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    CreateFactory(ExplosionChunk);
+    RegisterClass(ExplosionChunk);
 
     ExplosionChunk::ExplosionChunk(Context* context) : MovableEntity(context)

code/branches/core6/src/orxonox/worldentities/MovableEntity.cc

@@ -41 +41 @@
     static const float CONTINUOUS_SYNCHRONIZATION_TIME = 10.0f;
 
-    CreateFactory(MovableEntity);
+    RegisterClass(MovableEntity);
 
     MovableEntity::MovableEntity(Context* context) : MobileEntity(context)

code/branches/core6/src/orxonox/worldentities/SpawnPoint.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(SpawnPoint);
+    RegisterClass(SpawnPoint);
 
     SpawnPoint::SpawnPoint(Context* context) : StaticEntity(context)

code/branches/core6/src/orxonox/worldentities/StaticEntity.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(StaticEntity);
+    RegisterClass(StaticEntity);
 
     StaticEntity::StaticEntity(Context* context) : WorldEntity(context)

code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(TeamSpawnPoint);
+    RegisterClass(TeamSpawnPoint);
 
     TeamSpawnPoint::TeamSpawnPoint(Context* context) : SpawnPoint(context)

code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(Destroyer);
+    RegisterClass(Destroyer);
 
     Destroyer::Destroyer(Context* context) : SpaceShip(context)

code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -53 +53 @@
     const float orientationGain_ = 100;
     const float jumpValue_ = 300;
-    CreateFactory(FpsPlayer);
+    RegisterClass(FpsPlayer);
 
     FpsPlayer::FpsPlayer(Context* context) : Pawn(context)

code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc

@@ -49 +49 @@
 namespace orxonox
 {
-    CreateFactory(Pawn);
+    RegisterClass(Pawn);
 
     Pawn::Pawn(Context* context)

code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(SpaceShip);
+    RegisterClass(SpaceShip);
 
     SpaceShip::SpaceShip(Context* context) : Pawn(context), boostBlur_(NULL)

code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc

@@ -45 +45 @@
     extern const std::string __CC_suicide_name;
 
-    CreateFactory(Spectator);
+    RegisterClass(Spectator);
 
     Spectator::Spectator(Context* context) : ControllableEntity(context)

code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(TeamBaseMatchBase);
+    RegisterClass(TeamBaseMatchBase);
 
     TeamBaseMatchBase::TeamBaseMatchBase(Context* context) : Pawn(context)