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

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/towerdefense

Files:

• Tower.cc (modified) (1 diff)
• Tower.h (modified) (1 diff)
• TowerDefense.cc (modified) (2 diffs)
• TowerDefense.h (modified) (1 diff)
• TowerDefenseCenterpoint.cc (modified) (1 diff)
• TowerDefenseCenterpoint.h (modified) (1 diff)
• TowerDefenseController.cc (modified) (1 diff)
• TowerDefenseController.h (modified) (1 diff)
• TowerDefenseHUDController.cc (modified) (1 diff)
• TowerDefenseHUDController.h (modified) (1 diff)

code/branches/core6/src/modules/towerdefense/Tower.cc

@@ -22 +22 @@
         Constructor. Registers and initializes the object.
     */
-    Tower::Tower(BaseObject* creator) : Pawn(creator)
+    Tower::Tower(Context* context) : Pawn(context)
     {
         RegisterObject(Tower);

code/branches/core6/src/modules/towerdefense/Tower.h

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

code/branches/core6/src/modules/towerdefense/TowerDefense.cc

@@ -96 +96 @@
     CreateUnloadableFactory(TowerDefense);
 
-    TowerDefense::TowerDefense(BaseObject* creator) : Deathmatch(creator)
+    TowerDefense::TowerDefense(Context* context) : Deathmatch(context)
     {
         RegisterObject(TowerDefense);
@@ -190 +190 @@
 
         // Create tower
-        Tower* newTower = new Tower(this->center_);
+        Tower* newTower = new Tower(this->center_->getContext());
         newTower->addTemplate(this->center_->getTowerTemplate());
 

code/branches/core6/src/modules/towerdefense/TowerDefense.h

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

code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.cc

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

code/branches/core6/src/modules/towerdefense/TowerDefenseCenterpoint.h

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

code/branches/core6/src/modules/towerdefense/TowerDefenseController.cc

@@ -38 +38 @@
     CreateFactory(TowerDefenseController);
 
-    TowerDefenseController::TowerDefenseController(BaseObject* creator) : WaypointController(creator)
+    TowerDefenseController::TowerDefenseController(Context* context) : WaypointController(context)
     {
         RegisterObject(TowerDefenseController);

code/branches/core6/src/modules/towerdefense/TowerDefenseController.h

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

code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -37 +37 @@
     CreateFactory(TowerDefenseHUDController);
 
-    TowerDefenseHUDController::TowerDefenseHUDController(BaseObject* creator) : OverlayText(creator)
+    TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context)
     {
         RegisterObject(TowerDefenseHUDController);

code/branches/core6/src/modules/towerdefense/TowerDefenseHUDController.h

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