Changeset 9629 for code/branches/core6/src/orxonox/infos

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 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

Location:

code/branches/core6/src/orxonox/infos

Files:

• Bot.cc (modified) (1 diff)
• Bot.h (modified) (1 diff)
• GametypeInfo.cc (modified) (1 diff)
• GametypeInfo.h (modified) (1 diff)
• HumanPlayer.cc (modified) (3 diffs)
• HumanPlayer.h (modified) (1 diff)
• Info.cc (modified) (1 diff)
• Info.h (modified) (1 diff)
• PlayerInfo.cc (modified) (2 diffs)
• PlayerInfo.h (modified) (1 diff)

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

@@ -40 +40 @@
     CreateFactory(Bot);
 
-    Bot::Bot(BaseObject* creator) : PlayerInfo(creator)
+    Bot::Bot(Context* context) : PlayerInfo(context)
     {
         RegisterObject(Bot);

code/branches/core6/src/orxonox/infos/Bot.h

@@ -40 +40 @@
     {
         public:
-            Bot(BaseObject* creator);
+            Bot(Context* context);
             virtual ~Bot();
 

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

@@ -65 +65 @@
         Registers and initializes the object.
     */
-    GametypeInfo::GametypeInfo(BaseObject* creator) : Info(creator)
+    GametypeInfo::GametypeInfo(Context* context) : Info(context)
     {
         RegisterObject(GametypeInfo);

code/branches/core6/src/orxonox/infos/GametypeInfo.h

@@ -58 +58 @@
 
         public:
-            GametypeInfo(BaseObject* creator);
+            GametypeInfo(Context* context);
             virtual ~GametypeInfo();
 

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

@@ -43 +43 @@
     CreateUnloadableFactory(HumanPlayer);
 
-    HumanPlayer::HumanPlayer(BaseObject* creator) : PlayerInfo(creator)
+    HumanPlayer::HumanPlayer(Context* context) : PlayerInfo(context)
     {
         RegisterObject(HumanPlayer);
@@ -183 +183 @@
         if (this->isLocalPlayer() && !this->humanHudTemplate_.empty() && GameMode::showsGraphics())
         {
-            this->humanHud_ = new OverlayGroup(this);
+            this->humanHud_ = new OverlayGroup(this->getContext());
             this->humanHud_->addTemplate(this->humanHudTemplate_);
             this->humanHud_->setOwner(this);
@@ -199 +199 @@
         if (this->isLocalPlayer() && !this->gametypeHudTemplate_.empty())
         {
-            this->gametypeHud_ = new OverlayGroup(this);
+            this->gametypeHud_ = new OverlayGroup(this->getContext());
             this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
             this->gametypeHud_->setOwner(this);

code/branches/core6/src/orxonox/infos/HumanPlayer.h

@@ -40 +40 @@
     {
         public:
-            HumanPlayer(BaseObject* creator);
+            HumanPlayer(Context* context);
             virtual ~HumanPlayer();
 

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

@@ -32 +32 @@
 namespace orxonox
 {
-    Info::Info(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    Info::Info(Context* context) : BaseObject(context), Synchronisable(context)
     {
         RegisterObject(Info);

code/branches/core6/src/orxonox/infos/Info.h

@@ -40 +40 @@
     {
         public:
-            Info(BaseObject* creator);
+            Info(Context* context);
             virtual ~Info() {}
     };

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);

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

@@ -41 +41 @@
     { // tolua_export
         public:
-            PlayerInfo(BaseObject* creator);
+            PlayerInfo(Context* context);
             virtual ~PlayerInfo();