Changeset 9667 for code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.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/FpsPlayer.cc (modified) (2 diffs)

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

@@ -38 +38 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/Template.h"
 #include "core/XMLPort.h"
@@ -53 +53 @@
     const float orientationGain_ = 100;
     const float jumpValue_ = 300;
-    CreateFactory(FpsPlayer);
-
-    FpsPlayer::FpsPlayer(BaseObject* creator) : Pawn(creator)
+    RegisterClass(FpsPlayer);
+
+    FpsPlayer::FpsPlayer(Context* context) : Pawn(context)
     {
         RegisterObject(FpsPlayer);