Changeset 9667 for code/trunk/src/orxonox/worldentities/pawns/Spectator.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Spectator.cc (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/pawns/Spectator.cc

@@ -31 +31 @@
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/GameMode.h"
 #include "core/command/CommandExecutor.h"
@@ -45 +45 @@
     extern const std::string __CC_suicide_name;
 
-    CreateFactory(Spectator);
-
-    Spectator::Spectator(BaseObject* creator) : ControllableEntity(creator)
+    RegisterClass(Spectator);
+
+    Spectator::Spectator(Context* context) : ControllableEntity(context)
     {
         RegisterObject(Spectator);