Changeset 9629 for code/branches/core6/src/orxonox/infos/PlayerInfo.cc

Timestamp:

Aug 9, 2013, 9:26:46 PM (12 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

File:

• code/branches/core6/src/orxonox/infos/PlayerInfo.cc (modified) (2 diffs)

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

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