Changeset 9667 for code/trunk/src/orxonox/infos/PlayerInfo.cc

Timestamp:

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

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/infos/PlayerInfo.cc (modified) (2 diffs)

code/trunk/src/orxonox/infos/PlayerInfo.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    PlayerInfo::PlayerInfo(BaseObject* creator) : Info(creator)
+    RegisterAbstractClass(PlayerInfo).inheritsFrom(Class(Info));
+
+    PlayerInfo::PlayerInfo(Context* context) : Info(context)
     {
         RegisterObject(PlayerInfo);
@@ -136 +138 @@
             this->controller_ = 0;
         }
-        this->controller_ = this->defaultController_.fabricate(this);
+        this->controller_ = this->defaultController_.fabricate(this->getContext());
         assert(this->controller_);
         this->controller_->setPlayer(this);