Changeset 9629 for code/branches/core6/src/modules/pong

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/modules/pong

Files:

• Pong.cc (modified) (3 diffs)
• Pong.h (modified) (1 diff)
• PongAI.cc (modified) (1 diff)
• PongAI.h (modified) (1 diff)
• PongBall.cc (modified) (1 diff)
• PongBall.h (modified) (1 diff)
• PongBat.cc (modified) (1 diff)
• PongBat.h (modified) (1 diff)
• PongBot.cc (modified) (1 diff)
• PongBot.h (modified) (1 diff)
• PongCenterpoint.cc (modified) (1 diff)
• PongCenterpoint.h (modified) (1 diff)
• PongScore.cc (modified) (1 diff)
• PongScore.h (modified) (1 diff)

code/branches/core6/src/modules/pong/Pong.cc

@@ -59 +59 @@
         Constructor. Registers and initializes the object.
     */
-    Pong::Pong(BaseObject* creator) : Deathmatch(creator)
+    Pong::Pong(Context* context) : Deathmatch(context)
     {
         RegisterObject(Pong);
@@ -129 +129 @@
             if (this->ball_ == NULL) // If there is no ball, create a new ball.
             {
-                this->ball_ = new PongBall(this->center_);
+                this->ball_ = new PongBall(this->center_->getContext());
                 // Apply the template for the ball specified by the centerpoint.
                 this->ball_->addTemplate(this->center_->getBalltemplate());
@@ -147 +147 @@
                 if (this->bat_[i] == NULL)
                 {
-                    this->bat_[i] = new PongBat(this->center_);
+                    this->bat_[i] = new PongBat(this->center_->getContext());
                     this->bat_[i]->addTemplate(this->center_->getBattemplate());
                 }

code/branches/core6/src/modules/pong/Pong.h

@@ -65 +65 @@
     {
         public:
-            Pong(BaseObject* creator); //!< Constructor. Registers and initializes the object.
+            Pong(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~Pong(); //!< Destructor. Cleans up, if initialized.
 

code/branches/core6/src/modules/pong/PongAI.cc

@@ -53 +53 @@
         Constructor. Registers and initializes the object.
     */
-    PongAI::PongAI(BaseObject* creator) : Controller(creator)
+    PongAI::PongAI(Context* context) : Controller(context)
     {
         RegisterObject(PongAI);

code/branches/core6/src/modules/pong/PongAI.h

@@ -61 +61 @@
     {
         public:
-            PongAI(BaseObject* creator); //!< Constructor. Registers and initializes the object.
+            PongAI(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~PongAI();
 

code/branches/core6/src/modules/pong/PongBall.cc

@@ -51 +51 @@
         Constructor. Registers and initializes the object.
     */
-    PongBall::PongBall(BaseObject* creator)
-        : MovableEntity(creator)
+    PongBall::PongBall(Context* context)
+        : MovableEntity(context)
     {
         RegisterObject(PongBall);

code/branches/core6/src/modules/pong/PongBall.h

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

code/branches/core6/src/modules/pong/PongBat.cc

@@ -45 +45 @@
         Constructor. Registers and initializes the object.
     */
-    PongBat::PongBat(BaseObject* creator) : ControllableEntity(creator)
+    PongBat::PongBat(Context* context) : ControllableEntity(context)
     {
         RegisterObject(PongBat);

code/branches/core6/src/modules/pong/PongBat.h

@@ -57 +57 @@
     {
         public:
-            PongBat(BaseObject* creator); //!< Constructor. Registers and initializes the object.
+            PongBat(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~PongBat() {}
 

code/branches/core6/src/modules/pong/PongBot.cc

@@ -45 +45 @@
         Constructor. Registers the object and creates a PongAI controller.
     */
-    PongBot::PongBot(BaseObject* creator) : Bot(creator)
+    PongBot::PongBot(Context* context) : Bot(context)
     {
         RegisterObject(PongBot);

code/branches/core6/src/modules/pong/PongBot.h

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

code/branches/core6/src/modules/pong/PongCenterpoint.cc

@@ -47 +47 @@
         Constructor. Registers and initializes the object and checks whether the gametype is actually Pong.
     */
-    PongCenterpoint::PongCenterpoint(BaseObject* creator) : StaticEntity(creator)
+    PongCenterpoint::PongCenterpoint(Context* context) : StaticEntity(context)
     {
         RegisterObject(PongCenterpoint);

code/branches/core6/src/modules/pong/PongCenterpoint.h

@@ -121 +121 @@
     {
         public:
-            PongCenterpoint(BaseObject* creator); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Pong.
+            PongCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Pong.
             virtual ~PongCenterpoint() {}
 

code/branches/core6/src/modules/pong/PongScore.cc

@@ -50 +50 @@
         Constructor. Registers and initializes the object.
     */
-    PongScore::PongScore(BaseObject* creator) : OverlayText(creator)
+    PongScore::PongScore(Context* context) : OverlayText(context)
     {
         RegisterObject(PongScore);

code/branches/core6/src/modules/pong/PongScore.h

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