[Orxonox-commit 4969] r9638 - in code/branches/core6: src/libraries/core src/libraries/tools src/modules/designtools src/modules/docking src/modules/gametypes src/modules/notifications src/modules/notifications/dispatchers src/modules/objects src/modules/objects/collisionshapes src/modules/objects/eventsystem src/modules/objects/triggers src/modules/overlays src/modules/overlays/debugging src/modules/overlays/hud src/modules/overlays/stats src/modules/pickup src/modules/pickup/items src/modules/pong src/modules/portals src/modules/questsystem src/modules/questsystem/effects src/modules/tetris src/modules/towerdefense src/modules/weapons src/modules/weapons/munitions src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox src/orxonox/collisionshapes src/orxonox/controllers src/orxonox/gametypes src/orxonox/graphics src/orxonox/infos src/orxonox/items src/orxonox/overlays src/orxonox/sound src/orxonox/weaponsystem src/orxonox/worldentities src/orxonox/worldentities/pawns test/core/class

landauf at orxonox.net landauf at orxonox.net
Sun Aug 11 17:52:30 CEST 2013 

Author: landauf
Date: 2013-08-11 17:52:29 +0200 (Sun, 11 Aug 2013)
New Revision: 9638

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

Modified: code/branches/core6/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/core6/src/libraries/core/BaseObject.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/libraries/core/BaseObject.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -49,7 +49,7 @@
 
 namespace orxonox
 {
-    CreateFactory(BaseObject);
+    RegisterClass(BaseObject);
 
     /**
         @brief Constructor: Registers the object in the BaseObject-list.

Modified: code/branches/core6/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/core6/src/libraries/core/CoreIncludes.h	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/libraries/core/CoreIncludes.h	2013-08-11 15:52:29 UTC (rev 9638)
@@ -27,27 +27,26 @@
  */
 
 /**
-    @defgroup Factory RegisterObject() and CreateFactory()
+    @defgroup Factory RegisterObject() and RegisterClass()
     @ingroup Object
 */
 
 /**
     @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:
     MyClass::MyClass()
@@ -82,7 +81,13 @@
 #include "object/ClassFactory.h"
 #include "object/ObjectList.h"
 
+// resolve macro conflict on windows
+#if defined(ORXONOX_PLATFORM_WINDOWS)
+#   include <windows.h>
+#   undef RegisterClass
+#endif
 
+
 /**
     @brief Intern macro, containing the common parts of @c RegisterObject and @c RegisterRootObject.
     @param ClassName The name of the class
@@ -95,14 +100,14 @@
         ((void)0)
 
 /**
-    @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
 */
 #define RegisterObject(ClassName) \
     InternRegisterObject(ClassName, false)
 
 /**
-    @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
 
     In contrast to RegisterObject, this is used for classes that inherit directly from
@@ -112,24 +117,24 @@
     InternRegisterObject(ClassName, true)
 
 /**
-    @brief Creates and registers the Factory.
+    @brief Registers the class in the framework.
     @param ClassName The name of the class
 */
-#define CreateFactory(ClassName) \
-    RegisterFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), true)
+#define RegisterClass(ClassName) \
+    RegisterClassWithFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), true)
 
 /**
-    @brief Creates and registers the Factory for classes which should not be loaded through XML.
+    @brief Registers the class in the framework (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)
+#define RegisterUnloadableClass(ClassName) \
+    RegisterClassWithFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(), false)
 
 /**
-    @brief Registers a given Factory.
+    @brief Registers the class in the framework with a given Factory.
     @param ClassName The name of the class
 */
-#define RegisterFactory(ClassName, FactoryInstance, bLoadable) \
+#define RegisterClassWithFactory(ClassName, FactoryInstance, bLoadable) \
     Identifier* _##ClassName##Identifier = orxonox::registerClass<ClassName>(#ClassName, FactoryInstance, bLoadable)
 
 /**

Modified: code/branches/core6/src/libraries/core/Namespace.cc
===================================================================
--- code/branches/core6/src/libraries/core/Namespace.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/libraries/core/Namespace.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Namespace);
+    RegisterClass(Namespace);
 
     Namespace::Namespace(Context* context) : BaseObject(context), Context(context),
       bAutogeneratedFileRootNamespace_(false),

Modified: code/branches/core6/src/libraries/core/Template.cc
===================================================================
--- code/branches/core6/src/libraries/core/Template.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/libraries/core/Template.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Template);
+    RegisterClass(Template);
 
     Template::Template(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/libraries/tools/ResourceCollection.cc
===================================================================
--- code/branches/core6/src/libraries/tools/ResourceCollection.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/libraries/tools/ResourceCollection.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ResourceCollection);
+    RegisterClass(ResourceCollection);
 
     ResourceCollection::ResourceCollection(Context* context)
         : BaseObject(context)

Modified: code/branches/core6/src/libraries/tools/ResourceLocation.cc
===================================================================
--- code/branches/core6/src/libraries/tools/ResourceLocation.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/libraries/tools/ResourceLocation.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ResourceLocation);
+    RegisterClass(ResourceLocation);
 
     ResourceLocation::ResourceLocation(Context* context)
         : BaseObject(context)

Modified: code/branches/core6/src/modules/designtools/CreateStars.cc
===================================================================
--- code/branches/core6/src/modules/designtools/CreateStars.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/designtools/CreateStars.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(CreateStars);
+    RegisterClass(CreateStars);
 
     CreateStars::CreateStars(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/modules/docking/Dock.cc
===================================================================
--- code/branches/core6/src/modules/docking/Dock.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/docking/Dock.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Dock);
+    RegisterClass(Dock);
 
     SetConsoleCommand("Dock", "dock",    &Dock::cmdDock).addShortcut().setAsInputCommand();
     SetConsoleCommand("Dock", "undock",  &Dock::cmdUndock).addShortcut().setAsInputCommand();

Modified: code/branches/core6/src/modules/docking/DockToShip.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockToShip.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/docking/DockToShip.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DockToShip);
+    RegisterClass(DockToShip);
 
     DockToShip::DockToShip(Context* context) : DockingEffect(context)
     {

Modified: code/branches/core6/src/modules/docking/DockingController.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/docking/DockingController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DockingController);
+    RegisterClass(DockingController);
 
     DockingController::DockingController(Context* context) : ArtificialController(context)
     {

Modified: code/branches/core6/src/modules/docking/DockingTarget.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingTarget.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/docking/DockingTarget.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DockingTarget);
+    RegisterClass(DockingTarget);
 
     DockingTarget::DockingTarget(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/modules/docking/MoveToDockingTarget.cc
===================================================================
--- code/branches/core6/src/modules/docking/MoveToDockingTarget.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/docking/MoveToDockingTarget.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(MoveToDockingTarget);
+    RegisterClass(MoveToDockingTarget);
 
     MoveToDockingTarget::MoveToDockingTarget(Context* context) : DockingAnimation(context)
     {

Modified: code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(OldRaceCheckPoint);
+    RegisterClass(OldRaceCheckPoint);
 
     OldRaceCheckPoint::OldRaceCheckPoint(Context* context): DistanceTrigger(context), RadarViewable(this, static_cast<WorldEntity*>(this))
     {

Modified: code/branches/core6/src/modules/gametypes/OldSpaceRace.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/OldSpaceRace.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/OldSpaceRace.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(OldSpaceRace);
+    RegisterUnloadableClass(OldSpaceRace);
 
     OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
     {

Modified: code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(RaceCheckPoint);
+    RegisterClass(RaceCheckPoint);
 
     RaceCheckPoint::RaceCheckPoint(Context* context) : DistanceMultiTrigger(context),
             RadarViewable(this, static_cast<WorldEntity*> (this))

Modified: code/branches/core6/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/SpaceRace.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/SpaceRace.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(SpaceRace);
+    RegisterUnloadableClass(SpaceRace);
 
     SpaceRace::SpaceRace(Context* context) : Gametype(context)
     {

Modified: code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -28,7 +28,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpaceRaceBot);
+    RegisterClass(SpaceRaceBot);
 
     SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){
         RegisterObject(SpaceRaceBot);

Modified: code/branches/core6/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/SpaceRaceController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/SpaceRaceController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpaceRaceController);
+    RegisterClass(SpaceRaceController);
 
     const int ADJUSTDISTANCE = 500;
     const int MINDISTANCE = 5;

Modified: code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpaceRaceManager);
+    RegisterClass(SpaceRaceManager);
 
     SpaceRaceManager::SpaceRaceManager(Context* context) :
         BaseObject(context)

Modified: code/branches/core6/src/modules/notifications/NotificationDispatcher.cc
===================================================================
--- code/branches/core6/src/modules/notifications/NotificationDispatcher.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/notifications/NotificationDispatcher.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -47,7 +47,7 @@
 namespace orxonox
 {
 
-    CreateUnloadableFactory(NotificationDispatcher);
+    RegisterUnloadableClass(NotificationDispatcher);
 
     registerMemberNetworkFunction(NotificationDispatcher, broadcastHelper);
     registerMemberNetworkFunction(NotificationDispatcher, dispatch);

Modified: code/branches/core6/src/modules/notifications/NotificationQueue.cc
===================================================================
--- code/branches/core6/src/modules/notifications/NotificationQueue.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/notifications/NotificationQueue.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 namespace orxonox
 {
 
-    CreateFactory(NotificationQueue);
+    RegisterClass(NotificationQueue);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.cc
===================================================================
--- code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/notifications/NotificationQueueCEGUI.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 namespace orxonox
 {
 
-    CreateFactory(NotificationQueueCEGUI);
+    RegisterClass(NotificationQueueCEGUI);
 
     /*static*/ const std::string NotificationQueueCEGUI::NOTIFICATION_LAYER("NotificationLayer");
 

Modified: code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.cc
===================================================================
--- code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/notifications/dispatchers/CommandNotification.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox {
 
-    CreateFactory(CommandNotification);
+    RegisterClass(CommandNotification);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.cc
===================================================================
--- code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/notifications/dispatchers/SimpleNotification.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox {
 
-    CreateFactory(SimpleNotification);
+    RegisterClass(SimpleNotification);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/Attacher.cc
===================================================================
--- code/branches/core6/src/modules/objects/Attacher.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/Attacher.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Attacher);
+    RegisterClass(Attacher);
 
     Attacher::Attacher(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/modules/objects/ForceField.cc
===================================================================
--- code/branches/core6/src/modules/objects/ForceField.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/ForceField.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ForceField);
+    RegisterClass(ForceField);
 
     /*static*/ const std::string ForceField::modeTube_s = "tube";
     /*static*/ const std::string ForceField::modeSphere_s = "sphere";

Modified: code/branches/core6/src/modules/objects/Planet.cc
===================================================================
--- code/branches/core6/src/modules/objects/Planet.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/Planet.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Planet);
+    RegisterClass(Planet);
 
     /**
      * @brief Constructor

Modified: code/branches/core6/src/modules/objects/Script.cc
===================================================================
--- code/branches/core6/src/modules/objects/Script.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/Script.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Script);
+    RegisterClass(Script);
 
     registerStaticNetworkFunction(Script::executeHelper);
 

Modified: code/branches/core6/src/modules/objects/SpaceBoundaries.cc
===================================================================
--- code/branches/core6/src/modules/objects/SpaceBoundaries.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/SpaceBoundaries.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpaceBoundaries);
+    RegisterClass(SpaceBoundaries);
 
     SpaceBoundaries::SpaceBoundaries(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/modules/objects/Turret.cc
===================================================================
--- code/branches/core6/src/modules/objects/Turret.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/Turret.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Turret);
+    RegisterClass(Turret);
 
     /**
      * @brief Constructor

Modified: code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.cc
===================================================================
--- code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/collisionshapes/BoxCollisionShape.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(BoxCollisionShape);
+    RegisterClass(BoxCollisionShape);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.cc
===================================================================
--- code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/collisionshapes/ConeCollisionShape.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ConeCollisionShape);
+    RegisterClass(ConeCollisionShape);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
===================================================================
--- code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/collisionshapes/PlaneCollisionShape.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PlaneCollisionShape);
+    RegisterClass(PlaneCollisionShape);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.cc
===================================================================
--- code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/collisionshapes/SphereCollisionShape.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SphereCollisionShape);
+    RegisterClass(SphereCollisionShape);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.cc
===================================================================
--- code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/eventsystem/EventDispatcher.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EventDispatcher);
+    RegisterClass(EventDispatcher);
 
     EventDispatcher::EventDispatcher(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/modules/objects/eventsystem/EventFilter.cc
===================================================================
--- code/branches/core6/src/modules/objects/eventsystem/EventFilter.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/eventsystem/EventFilter.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EventFilter);
+    RegisterClass(EventFilter);
 
     EventFilter::EventFilter(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/modules/objects/eventsystem/EventListener.cc
===================================================================
--- code/branches/core6/src/modules/objects/eventsystem/EventListener.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/eventsystem/EventListener.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EventListener);
+    RegisterClass(EventListener);
 
     EventListener::EventListener(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/modules/objects/eventsystem/EventName.cc
===================================================================
--- code/branches/core6/src/modules/objects/eventsystem/EventName.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/eventsystem/EventName.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -31,7 +31,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EventName);
+    RegisterClass(EventName);
 
     EventName::EventName(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/modules/objects/eventsystem/EventTarget.cc
===================================================================
--- code/branches/core6/src/modules/objects/eventsystem/EventTarget.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/eventsystem/EventTarget.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -32,7 +32,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EventTarget);
+    RegisterClass(EventTarget);
 
     EventTarget::EventTarget(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/modules/objects/triggers/CheckPoint.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/CheckPoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/CheckPoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(CheckPoint);
+    RegisterClass(CheckPoint);
 
     CheckPoint::CheckPoint(Context* context)
         : DistanceTrigger(context)

Modified: code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -46,7 +46,7 @@
     /*static*/ const std::string DistanceMultiTrigger::beaconModeIdentify_s = "identify";
     /*static*/ const std::string DistanceMultiTrigger::beaconModeExlcude_s = "exclude";
     
-    CreateFactory(DistanceMultiTrigger);
+    RegisterClass(DistanceMultiTrigger);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -48,7 +48,7 @@
     /*static*/ const std::string DistanceTrigger::beaconModeIdentify_s = "identify";
     /*static*/ const std::string DistanceTrigger::beaconModeExlcude_s = "exclude";
 
-    CreateFactory(DistanceTrigger);
+    RegisterClass(DistanceTrigger);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 namespace orxonox
 {
 
-    CreateFactory(DistanceTriggerBeacon);
+    RegisterClass(DistanceTriggerBeacon);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 namespace orxonox
 {
 
-    CreateFactory(EventMultiTrigger);
+    RegisterClass(EventMultiTrigger);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/EventTrigger.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/EventTrigger.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/EventTrigger.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EventTrigger);
+    RegisterClass(EventTrigger);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 namespace orxonox
 {
 
-    CreateFactory(MultiTrigger);
+    RegisterClass(MultiTrigger);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 namespace orxonox
 {
 
-    CreateUnloadableFactory(MultiTriggerContainer);
+    RegisterUnloadableClass(MultiTriggerContainer);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/Trigger.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/Trigger.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -46,7 +46,7 @@
 
     SetConsoleCommand("Trigger", "debugFlares", &Trigger::debugFlares).defaultValues(false);
 
-    CreateFactory(Trigger);
+    RegisterClass(Trigger);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/objects/triggers/TriggerBase.cc
===================================================================
--- code/branches/core6/src/modules/objects/triggers/TriggerBase.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/objects/triggers/TriggerBase.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
     /*static*/ const std::string TriggerBase::or_s = "or";
     /*static*/ const std::string TriggerBase::xor_s = "xor";
 
-    CreateFactory(TriggerBase);
+    RegisterClass(TriggerBase);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/overlays/FadeoutText.cc
===================================================================
--- code/branches/core6/src/modules/overlays/FadeoutText.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/FadeoutText.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(FadeoutText);
+    RegisterClass(FadeoutText);
 
     FadeoutText::FadeoutText(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/GUIOverlay.cc
===================================================================
--- code/branches/core6/src/modules/overlays/GUIOverlay.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/GUIOverlay.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(GUIOverlay);
+    RegisterClass(GUIOverlay);
 
     GUIOverlay::GUIOverlay(Context* context) : OrxonoxOverlay(context)
     {

Modified: code/branches/core6/src/modules/overlays/OverlayText.cc
===================================================================
--- code/branches/core6/src/modules/overlays/OverlayText.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/OverlayText.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(OverlayText);
+    RegisterClass(OverlayText);
 
     BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left   == (int)OverlayText::Left);
     BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Center);

Modified: code/branches/core6/src/modules/overlays/debugging/DebugFPSText.cc
===================================================================
--- code/branches/core6/src/modules/overlays/debugging/DebugFPSText.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/debugging/DebugFPSText.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DebugFPSText);
+    RegisterClass(DebugFPSText);
 
     DebugFPSText::DebugFPSText(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/debugging/DebugRTRText.cc
===================================================================
--- code/branches/core6/src/modules/overlays/debugging/DebugRTRText.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/debugging/DebugRTRText.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DebugRTRText);
+    RegisterClass(DebugRTRText);
 
     DebugRTRText::DebugRTRText(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(AnnounceMessage);
+    RegisterClass(AnnounceMessage);
 
     AnnounceMessage::AnnounceMessage(Context* context) : FadeoutText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ChatOverlay);
+    RegisterClass(ChatOverlay);
 
     ChatOverlay::ChatOverlay(Context* context)
         : OverlayText(context)

Modified: code/branches/core6/src/modules/overlays/hud/DeathMessage.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/DeathMessage.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/DeathMessage.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DeathMessage);
+    RegisterClass(DeathMessage);
 
     DeathMessage::DeathMessage(Context* context) : FadeoutText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(GametypeFadingMessage);
+    RegisterClass(GametypeFadingMessage);
 
     GametypeFadingMessage::GametypeFadingMessage(Context* context) : FadeoutText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(GametypeStaticMessage);
+    RegisterClass(GametypeStaticMessage);
 
 
     GametypeStaticMessage::GametypeStaticMessage(Context* context) : OverlayText(context)

Modified: code/branches/core6/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDBar.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDBar.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateFactory(BarColour);
+    RegisterClass(BarColour);
 
     BarColour::BarColour(Context* context)
         : BaseObject(context)

Modified: code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HUDBoostBar);
+    RegisterClass(HUDBoostBar);
 
     HUDBoostBar::HUDBoostBar(Context* context)
         : HUDBar(context)

Modified: code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HUDEnemyHealthBar);
+    RegisterClass(HUDEnemyHealthBar);
 
     HUDEnemyHealthBar::HUDEnemyHealthBar(Context* context) : HUDHealthBar(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HUDHealthBar);
+    RegisterClass(HUDHealthBar);
 
     HUDHealthBar::HUDHealthBar(Context* context) : HUDBar(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -66,7 +66,7 @@
     {
         return a.second < b.second;
     }
-    CreateFactory ( HUDNavigation );
+    RegisterClass ( HUDNavigation );
 
     HUDNavigation* HUDNavigation::localHUD_s = 0;
 

Modified: code/branches/core6/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDRadar.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDRadar.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HUDRadar);
+    RegisterClass(HUDRadar);
 
     HUDRadar::HUDRadar(Context* context)
         : OrxonoxOverlay(context)

Modified: code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HUDSpeedBar);
+    RegisterClass(HUDSpeedBar);
 
     HUDSpeedBar::HUDSpeedBar(Context* context)
         : HUDBar(context)

Modified: code/branches/core6/src/modules/overlays/hud/HUDTimer.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDTimer.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/HUDTimer.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HUDTimer);
+    RegisterClass(HUDTimer);
 
     HUDTimer::HUDTimer(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/KillMessage.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/KillMessage.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/KillMessage.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(KillMessage);
+    RegisterClass(KillMessage);
 
     KillMessage::KillMessage(Context* context) : FadeoutText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LastManStandingInfos);
+    RegisterClass(LastManStandingInfos);
 
     LastManStandingInfos::LastManStandingInfos(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LastTeamStandingInfos);
+    RegisterClass(LastTeamStandingInfos);
 
     LastTeamStandingInfos::LastTeamStandingInfos(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/PauseNotice.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/PauseNotice.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/PauseNotice.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PauseNotice);
+    RegisterClass(PauseNotice);
 
     PauseNotice::PauseNotice(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TeamBaseMatchScore);
+    RegisterClass(TeamBaseMatchScore);
 
     TeamBaseMatchScore::TeamBaseMatchScore(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/overlays/stats/Scoreboard.cc
===================================================================
--- code/branches/core6/src/modules/overlays/stats/Scoreboard.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/stats/Scoreboard.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Scoreboard);
+    RegisterClass(Scoreboard);
 
     /**
         @brief Constructor: Creates the scoreboard.

Modified: code/branches/core6/src/modules/overlays/stats/Stats.cc
===================================================================
--- code/branches/core6/src/modules/overlays/stats/Stats.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/overlays/stats/Stats.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Stats);
+    RegisterClass(Stats);
 
     /**
         @brief Constructor: Creates and initializes the Stats panel.

Modified: code/branches/core6/src/modules/pickup/Pickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/Pickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/Pickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -47,7 +47,7 @@
     /*static*/ const std::string Pickup::durationTypeOnce_s = "once";
     /*static*/ const std::string Pickup::durationTypeContinuous_s = "continuous";
 
-    CreateUnloadableFactory(Pickup);
+    RegisterUnloadableClass(Pickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/PickupCollection.cc
===================================================================
--- code/branches/core6/src/modules/pickup/PickupCollection.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/PickupCollection.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 namespace orxonox
 {
 
-    CreateFactory(PickupCollection);
+    RegisterClass(PickupCollection);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/PickupRepresentation.cc
===================================================================
--- code/branches/core6/src/modules/pickup/PickupRepresentation.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/PickupRepresentation.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 namespace orxonox
 {
 
-    CreateFactory(PickupRepresentation);
+    RegisterClass(PickupRepresentation);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/branches/core6/src/modules/pickup/PickupSpawner.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/PickupSpawner.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -46,7 +46,7 @@
 namespace orxonox
 {
 
-    CreateFactory(PickupSpawner);
+    RegisterClass(PickupSpawner);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/DamageBoostPickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/DamageBoostPickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/DamageBoostPickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DamageBoostPickup);
+    RegisterClass(DamageBoostPickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/DronePickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/DronePickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/DronePickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 namespace orxonox
 {
 
-    CreateFactory(DronePickup);
+    RegisterClass(DronePickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/HealthPickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/HealthPickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -46,7 +46,7 @@
     /*static*/ const std::string HealthPickup::healthTypeTemporary_s = "temporary";
     /*static*/ const std::string HealthPickup::healthTypePermanent_s = "permanent";
 
-    CreateFactory(HealthPickup);
+    RegisterClass(HealthPickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/InvisiblePickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/InvisiblePickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 namespace orxonox
 {
 
-    CreateFactory(InvisiblePickup);
+    RegisterClass(InvisiblePickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/MetaPickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/MetaPickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox {
 
-    CreateFactory(MetaPickup);
+    RegisterClass(MetaPickup);
 
     //! Setting the static variables to their values.
     /*static*/ const std::string MetaPickup::metaTypeNone_s = "none";

Modified: code/branches/core6/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/ShieldPickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/ShieldPickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ShieldPickup);
+    RegisterClass(ShieldPickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/ShrinkPickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/ShrinkPickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/ShrinkPickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ShrinkPickup);
+    RegisterClass(ShrinkPickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/items/SpeedPickup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pickup/items/SpeedPickup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpeedPickup);
+    RegisterClass(SpeedPickup);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pong/Pong.cc
===================================================================
--- code/branches/core6/src/modules/pong/Pong.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/Pong.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -52,7 +52,7 @@
     CreateEventName(PongCenterpoint, right);
     CreateEventName(PongCenterpoint, left);
 
-    CreateUnloadableFactory(Pong);
+    RegisterUnloadableClass(Pong);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pong/PongAI.cc
===================================================================
--- code/branches/core6/src/modules/pong/PongAI.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/PongAI.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(PongAI);
+    RegisterUnloadableClass(PongAI);
 
     const static float MAX_REACTION_TIME = 0.4f;
 

Modified: code/branches/core6/src/modules/pong/PongBall.cc
===================================================================
--- code/branches/core6/src/modules/pong/PongBall.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/PongBall.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PongBall);
+    RegisterClass(PongBall);
 
     const float PongBall::MAX_REL_Z_VELOCITY = 1.5;
 

Modified: code/branches/core6/src/modules/pong/PongBat.cc
===================================================================
--- code/branches/core6/src/modules/pong/PongBat.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/PongBat.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PongBat);
+    RegisterClass(PongBat);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pong/PongBot.cc
===================================================================
--- code/branches/core6/src/modules/pong/PongBot.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/PongBot.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PongBot);
+    RegisterClass(PongBot);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pong/PongCenterpoint.cc
===================================================================
--- code/branches/core6/src/modules/pong/PongCenterpoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/PongCenterpoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PongCenterpoint);
+    RegisterClass(PongCenterpoint);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/pong/PongScore.cc
===================================================================
--- code/branches/core6/src/modules/pong/PongScore.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/pong/PongScore.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PongScore);
+    RegisterClass(PongScore);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/portals/PortalEndPoint.cc
===================================================================
--- code/branches/core6/src/modules/portals/PortalEndPoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/portals/PortalEndPoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PortalEndPoint);
+    RegisterClass(PortalEndPoint);
 
     /*static*/ const std::string PortalEndPoint::EVENTFUNCTIONNAME = "execute";
 

Modified: code/branches/core6/src/modules/portals/PortalLink.cc
===================================================================
--- code/branches/core6/src/modules/portals/PortalLink.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/portals/PortalLink.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(PortalLink);
+    RegisterClass(PortalLink);
 
     std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s;
 

Modified: code/branches/core6/src/modules/questsystem/GlobalQuest.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/GlobalQuest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/GlobalQuest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(GlobalQuest);
+    RegisterClass(GlobalQuest);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/LocalQuest.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/LocalQuest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/LocalQuest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LocalQuest);
+    RegisterClass(LocalQuest);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/QuestDescription.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestDescription.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/QuestDescription.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(QuestDescription);
+    RegisterClass(QuestDescription);
 
     /*static*/ const std::string QuestDescription::SENDER = "questsystem";
 

Modified: code/branches/core6/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestEffectBeacon.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/QuestEffectBeacon.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateFactory(QuestEffectBeacon);
+    RegisterClass(QuestEffectBeacon);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/QuestHint.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestHint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/QuestHint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 
 namespace orxonox
 {
-    CreateFactory(QuestHint);
+    RegisterClass(QuestHint);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/QuestItem.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestItem.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/QuestItem.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 namespace orxonox
 {
 
-    CreateUnloadableFactory(QuestItem);
+    RegisterUnloadableClass(QuestItem);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/QuestListener.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestListener.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/QuestListener.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(QuestListener);
+    RegisterClass(QuestListener);
 
     // Initialization of the static variables for the modes as strings.
     /*static*/ const std::string QuestListener::ALL = "all";

Modified: code/branches/core6/src/modules/questsystem/effects/AddQuest.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/effects/AddQuest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/effects/AddQuest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 
 namespace orxonox
 {
-    CreateFactory(AddQuest);
+    RegisterClass(AddQuest);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/effects/AddQuestHint.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/effects/AddQuestHint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/effects/AddQuestHint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(AddQuestHint);
+    RegisterClass(AddQuestHint);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/effects/AddReward.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/effects/AddReward.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/effects/AddReward.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(AddReward);
+    RegisterClass(AddReward);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/effects/CompleteQuest.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/effects/CompleteQuest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/effects/CompleteQuest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(CompleteQuest);
+    RegisterClass(CompleteQuest);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/questsystem/effects/FailQuest.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/effects/FailQuest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/questsystem/effects/FailQuest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(FailQuest);
+    RegisterClass(FailQuest);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/core6/src/modules/tetris/Tetris.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/tetris/Tetris.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -53,7 +53,7 @@
 namespace orxonox
 {
 
-    CreateUnloadableFactory(Tetris);
+    RegisterUnloadableClass(Tetris);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/tetris/TetrisBrick.cc
===================================================================
--- code/branches/core6/src/modules/tetris/TetrisBrick.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/tetris/TetrisBrick.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TetrisBrick);
+    RegisterClass(TetrisBrick);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc
===================================================================
--- code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TetrisCenterpoint);
+    RegisterClass(TetrisCenterpoint);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/tetris/TetrisScore.cc
===================================================================
--- code/branches/core6/src/modules/tetris/TetrisScore.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/tetris/TetrisScore.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TetrisScore);
+    RegisterClass(TetrisScore);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/tetris/TetrisStone.cc
===================================================================
--- code/branches/core6/src/modules/tetris/TetrisStone.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/tetris/TetrisStone.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TetrisStone);
+    RegisterClass(TetrisStone);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/towerdefense/Tower.cc
===================================================================
--- code/branches/core6/src/modules/towerdefense/Tower.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/towerdefense/Tower.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -15,7 +15,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Tower);
+    RegisterClass(Tower);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/core6/src/modules/towerdefense/TowerDefense.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/towerdefense/TowerDefense.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -93,7 +93,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(TowerDefense);
+    RegisterUnloadableClass(TowerDefense);
 
     TowerDefense::TowerDefense(Context* context) : Deathmatch(context)
     {

Modified: code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc
===================================================================
--- code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TowerDefenseCenterpoint);
+    RegisterClass(TowerDefenseCenterpoint);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc
===================================================================
--- code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TowerDefenseController);
+    RegisterClass(TowerDefenseController);
 
     TowerDefenseController::TowerDefenseController(Context* context) : WaypointController(context)
     {

Modified: code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc
===================================================================
--- code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TowerDefenseHUDController);
+    RegisterClass(TowerDefenseHUDController);
 
     TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context)
     {

Modified: code/branches/core6/src/modules/weapons/MuzzleFlash.cc
===================================================================
--- code/branches/core6/src/modules/weapons/MuzzleFlash.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/MuzzleFlash.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(MuzzleFlash);
+    RegisterClass(MuzzleFlash);
 
     MuzzleFlash::MuzzleFlash(Context* context) : Billboard(context)
     {

Modified: code/branches/core6/src/modules/weapons/munitions/FusionMunition.cc
===================================================================
--- code/branches/core6/src/modules/weapons/munitions/FusionMunition.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/munitions/FusionMunition.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(FusionMunition);
+    RegisterClass(FusionMunition);
 
     FusionMunition::FusionMunition(Context* context) : Munition(context)
     {

Modified: code/branches/core6/src/modules/weapons/munitions/LaserMunition.cc
===================================================================
--- code/branches/core6/src/modules/weapons/munitions/LaserMunition.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/munitions/LaserMunition.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LaserMunition);
+    RegisterClass(LaserMunition);
 
     LaserMunition::LaserMunition(Context* context) : ReplenishingMunition(context)
     {

Modified: code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.cc
===================================================================
--- code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/munitions/ReplenishingMunition.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ReplenishingMunition);
+    RegisterClass(ReplenishingMunition);
 
     ReplenishingMunition::ReplenishingMunition(Context* context) : Munition(context)
     {

Modified: code/branches/core6/src/modules/weapons/munitions/RocketMunition.cc
===================================================================
--- code/branches/core6/src/modules/weapons/munitions/RocketMunition.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/munitions/RocketMunition.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(RocketMunition);
+    RegisterClass(RocketMunition);
 
     RocketMunition::RocketMunition(Context* context) : Munition(context)
     {

Modified: code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/projectiles/BillboardProjectile.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(BillboardProjectile);
+    RegisterClass(BillboardProjectile);
 
     BillboardProjectile::BillboardProjectile(Context* context) : Projectile(context)
     {

Modified: code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/projectiles/LightningGunProjectile.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LightningGunProjectile);
+    RegisterClass(LightningGunProjectile);
 
     LightningGunProjectile::LightningGunProjectile(Context* context) : BillboardProjectile(context)
     {

Modified: code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ParticleProjectile);
+    RegisterClass(ParticleProjectile);
 
     ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context)
     {

Modified: code/branches/core6/src/modules/weapons/projectiles/Projectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/Projectile.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/projectiles/Projectile.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Projectile);
+    RegisterClass(Projectile);
 
     Projectile::Projectile(Context* context) : MovableEntity(context), BasicProjectile()
     {

Modified: code/branches/core6/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/Rocket.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/projectiles/Rocket.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -50,7 +50,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Rocket);
+    RegisterClass(Rocket);
 
     /**
     @brief

Modified: code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/projectiles/SimpleRocket.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -51,7 +51,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SimpleRocket);
+    RegisterClass(SimpleRocket);
 
     const float SimpleRocket::FUEL_PERCENTAGE = 0.8f;
 

Modified: code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -48,7 +48,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EnergyDrink);
+    RegisterClass(EnergyDrink);
 
     EnergyDrink::EnergyDrink(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(FusionFire);
+    RegisterClass(FusionFire);
 
     FusionFire::FusionFire(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/HsW01.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/HsW01.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -49,7 +49,7 @@
 
 namespace orxonox
 {
-    CreateFactory(HsW01);
+    RegisterClass(HsW01);
 
     HsW01::HsW01(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LaserFire);
+    RegisterClass(LaserFire);
 
     LaserFire::LaserFire(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -43,7 +43,7 @@
 
 namespace orxonox
 {
-    CreateFactory(LightningGun);
+    RegisterClass(LightningGun);
 
     LightningGun::LightningGun(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(RocketFire);
+    RegisterClass(RocketFire);
 
     RocketFire::RocketFire(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -49,7 +49,7 @@
 namespace orxonox
 {
 
-    CreateFactory(SimpleRocketFire);
+    RegisterClass(SimpleRocketFire);
 
     SimpleRocketFire::SimpleRocketFire(Context* context) : WeaponMode(context)
     {

Modified: code/branches/core6/src/orxonox/Level.cc
===================================================================
--- code/branches/core6/src/orxonox/Level.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/Level.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Level);
+    RegisterClass(Level);
 
     Level::Level(Context* context) : BaseObject(context), Synchronisable(context), Context(context)
     {

Modified: code/branches/core6/src/orxonox/LevelInfo.cc
===================================================================
--- code/branches/core6/src/orxonox/LevelInfo.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/LevelInfo.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -241,7 +241,7 @@
 
     // LevelInfo
 
-    CreateFactory(LevelInfo);
+    RegisterClass(LevelInfo);
 
     /**
     @brief

Modified: code/branches/core6/src/orxonox/Scene.cc
===================================================================
--- code/branches/core6/src/orxonox/Scene.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/Scene.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -50,7 +50,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Scene);
+    RegisterClass(Scene);
 
     Scene::Scene(Context* context) : BaseObject(context), Synchronisable(context), Context(context)
     {

Modified: code/branches/core6/src/orxonox/Test.cc
===================================================================
--- code/branches/core6/src/orxonox/Test.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/Test.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory ( Test );
+    RegisterClass ( Test );
 
     SetConsoleCommand("Test", "printV1", &Test::printV1).addShortcut();
     SetConsoleCommand("Test", "printV2", &Test::printV2).addShortcut();

Modified: code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(CompoundCollisionShape);
+    RegisterClass(CompoundCollisionShape);
 
     /**
     @brief

Modified: code/branches/core6/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/AIController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/AIController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 {
     const float AIController::ACTION_INTERVAL = 1.0f;
 
-    CreateFactory(AIController);
+    RegisterClass(AIController);
 
     AIController::AIController(Context* context) : ArtificialController(context)
     {

Modified: code/branches/core6/src/orxonox/controllers/Controller.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/Controller.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/Controller.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -32,7 +32,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(Controller);
+    RegisterUnloadableClass(Controller);
 
     Controller::Controller(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/controllers/DroneController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/DroneController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/DroneController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
     @brief
         Constructor.
     */
-    CreateFactory(DroneController);
+    RegisterClass(DroneController);
 
     const float DroneController::ACTION_INTERVAL = 1.0f;
 

Modified: code/branches/core6/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/HumanController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/HumanController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -65,7 +65,7 @@
     SetConsoleCommand("HumanController", "releaseNavigationFocus", &HumanController::releaseNavigationFocus).addShortcut();
     SetConsoleCommand("HumanController", "myposition",             &HumanController::myposition    ).addShortcut();
 
-    CreateUnloadableFactory(HumanController);
+    RegisterUnloadableClass(HumanController);
 
     HumanController* HumanController::localController_s = 0;
     /*static*/ const float HumanController::BOOSTING_TIME = 0.1f;

Modified: code/branches/core6/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/NewHumanController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/NewHumanController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -55,7 +55,7 @@
     SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "unfire",     &NewHumanController::unfire    ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
-    CreateUnloadableFactory(NewHumanController);
+    RegisterUnloadableClass(NewHumanController);
 
     NewHumanController* NewHumanController::localController_s = 0;
 

Modified: code/branches/core6/src/orxonox/controllers/ScriptController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/ScriptController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/ScriptController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -31,7 +31,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ScriptController);
+    RegisterClass(ScriptController);
 
     ScriptController::ScriptController(Context* context) : ArtificialController(context)
     {

Modified: code/branches/core6/src/orxonox/controllers/WaypointController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/WaypointController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/WaypointController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WaypointController);
+    RegisterClass(WaypointController);
 
     WaypointController::WaypointController(Context* context) : ArtificialController(context)
     {

Modified: code/branches/core6/src/orxonox/controllers/WaypointPatrolController.cc
===================================================================
--- code/branches/core6/src/orxonox/controllers/WaypointPatrolController.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/controllers/WaypointPatrolController.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WaypointPatrolController);
+    RegisterClass(WaypointPatrolController);
 
     WaypointPatrolController::WaypointPatrolController(Context* context) : WaypointController(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/Asteroids.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/Asteroids.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/Asteroids.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(Asteroids);
+    RegisterUnloadableClass(Asteroids);
 
     Asteroids::Asteroids(Context* context) : Gametype(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/Deathmatch.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/Deathmatch.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/Deathmatch.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(Deathmatch);
+    RegisterUnloadableClass(Deathmatch);
 
     Deathmatch::Deathmatch(Context* context) : Gametype(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -61,7 +61,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(Dynamicmatch);
+    RegisterUnloadableClass(Dynamicmatch);
 
     Dynamicmatch::Dynamicmatch(Context* context) : Gametype(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/Gametype.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/Gametype.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -46,7 +46,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(Gametype);
+    RegisterUnloadableClass(Gametype);
 
     Gametype::Gametype(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/LastManStanding.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/LastManStanding.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/LastManStanding.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(LastManStanding);
+    RegisterUnloadableClass(LastManStanding);
 
     LastManStanding::LastManStanding(Context* context) : Deathmatch(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(LastTeamStanding);
+    RegisterUnloadableClass(LastTeamStanding);
 
     LastTeamStanding::LastTeamStanding(Context* context) : TeamDeathmatch(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/Mission.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/Mission.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/Mission.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(Mission);
+    RegisterUnloadableClass(Mission);
 
     Mission::Mission(Context* context) : TeamGametype(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/TeamBaseMatch.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamBaseMatch);
+    RegisterUnloadableClass(TeamBaseMatch);
 
     TeamBaseMatch::TeamBaseMatch(Context* context) : TeamDeathmatch(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/TeamDeathmatch.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamDeathmatch);
+    RegisterUnloadableClass(TeamDeathmatch);
 
     TeamDeathmatch::TeamDeathmatch(Context* context) : TeamGametype(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/TeamGametype.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/TeamGametype.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/TeamGametype.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamGametype);
+    RegisterUnloadableClass(TeamGametype);
 
     TeamGametype::TeamGametype(Context* context) : Gametype(context)
     {

Modified: code/branches/core6/src/orxonox/gametypes/UnderAttack.cc
===================================================================
--- code/branches/core6/src/orxonox/gametypes/UnderAttack.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/gametypes/UnderAttack.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(UnderAttack);
+    RegisterUnloadableClass(UnderAttack);
 
     UnderAttack::UnderAttack(Context* context) : TeamDeathmatch(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/AnimatedModel.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/AnimatedModel.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/AnimatedModel.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(AnimatedModel);
+    RegisterClass(AnimatedModel);
 
     AnimatedModel::AnimatedModel(Context* context) : Model(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/Backlight.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/Backlight.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/Backlight.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Backlight);
+    RegisterClass(Backlight);
 
     Backlight::Backlight(Context* context) : FadingBillboard(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/Billboard.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/Billboard.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/Billboard.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Billboard);
+    RegisterClass(Billboard);
 
     Billboard::Billboard(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(BlinkingBillboard);
+    RegisterClass(BlinkingBillboard);
 
     BlinkingBillboard::BlinkingBillboard(Context* context) : Billboard(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/Camera.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/Camera.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/Camera.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Camera);
+    RegisterClass(Camera);
 
     Camera::Camera(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/FadingBillboard.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/FadingBillboard.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/FadingBillboard.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(FadingBillboard);
+    RegisterClass(FadingBillboard);
 
     FadingBillboard::FadingBillboard(Context* context) : Billboard(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/GlobalShader.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/GlobalShader.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/GlobalShader.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(GlobalShader);
+    RegisterClass(GlobalShader);
 
     GlobalShader::GlobalShader(Context* context) : BaseObject(context), Synchronisable(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/Light.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/Light.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/Light.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -41,7 +41,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Light);
+    RegisterClass(Light);
 
     // Be sure we don't do bad conversions
     BOOST_STATIC_ASSERT((int)Ogre::Light::LT_POINT       == (int)Light::Point);

Modified: code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(MeshLodInformation);
+    RegisterClass(MeshLodInformation);
 
     MeshLodInformation::MeshLodInformation(Context* context)
     : BaseObject(context), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f)

Modified: code/branches/core6/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/Model.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/Model.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Model);
+    RegisterClass(Model);
 
     Model::Model(Context* context) :
         StaticEntity(context), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f)

Modified: code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -42,7 +42,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ParticleEmitter);
+    RegisterClass(ParticleEmitter);
 
     ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc
===================================================================
--- code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ParticleSpawner);
+    RegisterClass(ParticleSpawner);
 
     ParticleSpawner::ParticleSpawner(Context* context) : ParticleEmitter(context)
     {

Modified: code/branches/core6/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/core6/src/orxonox/infos/Bot.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/infos/Bot.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Bot);
+    RegisterClass(Bot);
 
     Bot::Bot(Context* context) : PlayerInfo(context)
     {

Modified: code/branches/core6/src/orxonox/infos/GametypeInfo.cc
===================================================================
--- code/branches/core6/src/orxonox/infos/GametypeInfo.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/infos/GametypeInfo.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -47,7 +47,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(GametypeInfo);
+    RegisterUnloadableClass(GametypeInfo);
 
     registerMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage);
     registerMemberNetworkFunction(GametypeInfo, dispatchKillMessage);

Modified: code/branches/core6/src/orxonox/infos/HumanPlayer.cc
===================================================================
--- code/branches/core6/src/orxonox/infos/HumanPlayer.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/infos/HumanPlayer.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateUnloadableFactory(HumanPlayer);
+    RegisterUnloadableClass(HumanPlayer);
 
     HumanPlayer::HumanPlayer(Context* context) : PlayerInfo(context)
     {

Modified: code/branches/core6/src/orxonox/items/Engine.cc
===================================================================
--- code/branches/core6/src/orxonox/items/Engine.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/items/Engine.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Engine);
+    RegisterClass(Engine);
 
     /**
     @brief

Modified: code/branches/core6/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/core6/src/orxonox/items/MultiStateEngine.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/items/MultiStateEngine.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -48,7 +48,7 @@
     static const float MAX_VELOCITY_NORMAL = 111;
     static const float MAX_VELOCITY_BOOST = 221;
 
-    CreateFactory(MultiStateEngine);
+    RegisterClass(MultiStateEngine);
 
     MultiStateEngine::MultiStateEngine(Context* context) : Engine(context)
     {

Modified: code/branches/core6/src/orxonox/overlays/GUISheet.cc
===================================================================
--- code/branches/core6/src/orxonox/overlays/GUISheet.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/overlays/GUISheet.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(GUISheet);
+    RegisterClass(GUISheet);
 
     GUISheet::GUISheet(Context* context)
         : BaseObject(context)

Modified: code/branches/core6/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- code/branches/core6/src/orxonox/overlays/OverlayGroup.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/overlays/OverlayGroup.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(OverlayGroup);
+    RegisterClass(OverlayGroup);
 
     SetConsoleCommand("OverlayGroup", "toggleVisibility", &OverlayGroup::toggleVisibility);
     SetConsoleCommand("OverlayGroup", "show", &OverlayGroup::show);

Modified: code/branches/core6/src/orxonox/sound/WorldAmbientSound.cc
===================================================================
--- code/branches/core6/src/orxonox/sound/WorldAmbientSound.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/sound/WorldAmbientSound.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WorldAmbientSound);
+    RegisterClass(WorldAmbientSound);
 
     WorldAmbientSound::WorldAmbientSound(Context* context) : BaseObject(context), Synchronisable(context)
     {

Modified: code/branches/core6/src/orxonox/sound/WorldSound.cc
===================================================================
--- code/branches/core6/src/orxonox/sound/WorldSound.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/sound/WorldSound.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WorldSound);
+    RegisterClass(WorldSound);
 
     WorldSound::WorldSound(Context* context)
         : StaticEntity(context)

Modified: code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(DefaultWeaponmodeLink);
+    RegisterClass(DefaultWeaponmodeLink);
 
     DefaultWeaponmodeLink::DefaultWeaponmodeLink(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/Munition.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/Munition.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Munition);
+    RegisterClass(Munition);
 
     Munition::Munition(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/weaponsystem/Weapon.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/Weapon.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/Weapon.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Weapon);
+    RegisterClass(Weapon);
 
     Weapon::Weapon(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/weaponsystem/WeaponPack.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/WeaponPack.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/WeaponPack.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WeaponPack);
+    RegisterClass(WeaponPack);
 
     WeaponPack::WeaponPack(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/weaponsystem/WeaponSet.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/WeaponSet.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/WeaponSet.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WeaponSet);
+    RegisterClass(WeaponSet);
 
     WeaponSet::WeaponSet(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/WeaponSlot.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WeaponSlot);
+    RegisterClass(WeaponSlot);
 
     WeaponSlot::WeaponSlot(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/weaponsystem/WeaponSystem.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(WeaponSystem);
+    RegisterClass(WeaponSystem);
 
     WeaponSystem::WeaponSystem(Context* context) : BaseObject(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/BigExplosion.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/BigExplosion.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-    CreateFactory(BigExplosion);
+    RegisterClass(BigExplosion);
 
     BigExplosion::BigExplosion(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/CameraPosition.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/CameraPosition.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/CameraPosition.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -34,7 +34,7 @@
 
 namespace orxonox
 {
-    CreateFactory(CameraPosition);
+    RegisterClass(CameraPosition);
 
     CameraPosition::CameraPosition(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -46,7 +46,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ControllableEntity);
+    RegisterClass(ControllableEntity);
 
     registerMemberNetworkFunction( ControllableEntity, fire );
     registerMemberNetworkFunction( ControllableEntity, setTargetInternal );

Modified: code/branches/core6/src/orxonox/worldentities/Drone.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/Drone.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/Drone.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Drone);
+    RegisterClass(Drone);
     /**
     @brief
         Constructor. Registers the object and initializes some default values.

Modified: code/branches/core6/src/orxonox/worldentities/EffectContainer.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/EffectContainer.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/EffectContainer.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    CreateFactory(EffectContainer);
+    RegisterClass(EffectContainer);
 
     EffectContainer::EffectContainer(Context* context)
         : BaseObject(context)

Modified: code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-    CreateFactory(ExplosionChunk);
+    RegisterClass(ExplosionChunk);
 
     ExplosionChunk::ExplosionChunk(Context* context) : MovableEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/MovableEntity.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/MovableEntity.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/MovableEntity.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -40,7 +40,7 @@
     static const float MAX_RESYNCHRONIZE_TIME = 3.0f;
     static const float CONTINUOUS_SYNCHRONIZATION_TIME = 10.0f;
 
-    CreateFactory(MovableEntity);
+    RegisterClass(MovableEntity);
 
     MovableEntity::MovableEntity(Context* context) : MobileEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/SpawnPoint.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/SpawnPoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/SpawnPoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpawnPoint);
+    RegisterClass(SpawnPoint);
 
     SpawnPoint::SpawnPoint(Context* context) : StaticEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/StaticEntity.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/StaticEntity.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/StaticEntity.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(StaticEntity);
+    RegisterClass(StaticEntity);
 
     StaticEntity::StaticEntity(Context* context) : WorldEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/TeamSpawnPoint.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TeamSpawnPoint);
+    RegisterClass(TeamSpawnPoint);
 
     TeamSpawnPoint::TeamSpawnPoint(Context* context) : SpawnPoint(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/pawns/Destroyer.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -33,7 +33,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Destroyer);
+    RegisterClass(Destroyer);
 
     Destroyer::Destroyer(Context* context) : SpaceShip(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -52,7 +52,7 @@
 {
     const float orientationGain_ = 100;
     const float jumpValue_ = 300;
-    CreateFactory(FpsPlayer);
+    RegisterClass(FpsPlayer);
 
     FpsPlayer::FpsPlayer(Context* context) : Pawn(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -48,7 +48,7 @@
 
 namespace orxonox
 {
-    CreateFactory(Pawn);
+    RegisterClass(Pawn);
 
     Pawn::Pawn(Context* context)
         : ControllableEntity(context)

Modified: code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -45,7 +45,7 @@
 
 namespace orxonox
 {
-    CreateFactory(SpaceShip);
+    RegisterClass(SpaceShip);
 
     SpaceShip::SpaceShip(Context* context) : Pawn(context), boostBlur_(NULL)
     {

Modified: code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -44,7 +44,7 @@
     extern const std::string __CC_fire_name;
     extern const std::string __CC_suicide_name;
 
-    CreateFactory(Spectator);
+    RegisterClass(Spectator);
 
     Spectator::Spectator(Context* context) : ControllableEntity(context)
     {

Modified: code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    CreateFactory(TeamBaseMatchBase);
+    RegisterClass(TeamBaseMatchBase);
 
     TeamBaseMatchBase::TeamBaseMatchBase(Context* context) : Pawn(context)
     {

Modified: code/branches/core6/test/core/class/SubclassIdentifierTest.cc
===================================================================
--- code/branches/core6/test/core/class/SubclassIdentifierTest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/test/core/class/SubclassIdentifierTest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -20,8 +20,8 @@
                 TestSubclass(Context* context = NULL) { RegisterObject(TestSubclass); }
         };
 
-        CreateFactory(TestClass);
-        CreateFactory(TestSubclass);
+        RegisterClass(TestClass);
+        RegisterClass(TestSubclass);
     }
 
     TEST(SubclassIdentifierTest, CanCreateIdentifier)

Modified: code/branches/core6/test/core/class/SuperTest.cc
===================================================================
--- code/branches/core6/test/core/class/SuperTest.cc	2013-08-11 14:23:41 UTC (rev 9637)
+++ code/branches/core6/test/core/class/SuperTest.cc	2013-08-11 15:52:29 UTC (rev 9638)
@@ -61,8 +61,8 @@
                 XMLPort::Mode modeSubclass_;
         };
 
-        CreateFactory(TestClass);
-        CreateFactory(TestSubclass);
+        RegisterClass(TestClass);
+        RegisterClass(TestSubclass);
     }
 
     TEST(SuberTest, SuperCallWithoutArguments)

More information about the Orxonox-commit mailing list