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

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

Files:

• OldRaceCheckPoint.cc (modified) (1 diff)
• OldRaceCheckPoint.h (modified) (1 diff)
• OldSpaceRace.cc (modified) (1 diff)
• OldSpaceRace.h (modified) (1 diff)
• RaceCheckPoint.cc (modified) (1 diff)
• RaceCheckPoint.h (modified) (1 diff)
• SpaceRace.cc (modified) (1 diff)
• SpaceRace.h (modified) (1 diff)
• SpaceRaceBot.cc (modified) (1 diff)
• SpaceRaceBot.h (modified) (1 diff)
• SpaceRaceController.cc (modified) (1 diff)
• SpaceRaceController.h (modified) (1 diff)
• SpaceRaceManager.cc (modified) (1 diff)
• SpaceRaceManager.h (modified) (1 diff)

code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.cc

@@ -40 +40 @@
     CreateFactory(OldRaceCheckPoint);
 
-    OldRaceCheckPoint::OldRaceCheckPoint(BaseObject* creator): DistanceTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))
+    OldRaceCheckPoint::OldRaceCheckPoint(Context* context): DistanceTrigger(context), RadarViewable(this, static_cast<WorldEntity*>(this))
     {
         RegisterObject(OldRaceCheckPoint);

code/branches/core6/src/modules/gametypes/OldRaceCheckPoint.h

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

code/branches/core6/src/modules/gametypes/OldSpaceRace.cc

@@ -38 +38 @@
     CreateUnloadableFactory(OldSpaceRace);
 
-    OldSpaceRace::OldSpaceRace(BaseObject* creator) : Gametype(creator)
+    OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
     {
         RegisterObject(OldSpaceRace);

code/branches/core6/src/modules/gametypes/OldSpaceRace.h

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

code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc

@@ -43 +43 @@
     CreateFactory(RaceCheckPoint);
 
-    RaceCheckPoint::RaceCheckPoint(BaseObject* creator) : DistanceMultiTrigger(creator),
-            RadarViewable(creator, static_cast<WorldEntity*> (this))
+    RaceCheckPoint::RaceCheckPoint(Context* context) : DistanceMultiTrigger(context),
+            RadarViewable(this, static_cast<WorldEntity*> (this))
     {
         RegisterObject(RaceCheckPoint);

code/branches/core6/src/modules/gametypes/RaceCheckPoint.h

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

code/branches/core6/src/modules/gametypes/SpaceRace.cc

@@ -42 +42 @@
     CreateUnloadableFactory(SpaceRace);
 
-    SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
+    SpaceRace::SpaceRace(Context* context) : Gametype(context)
     {
         RegisterObject(SpaceRace);

code/branches/core6/src/modules/gametypes/SpaceRace.h

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

code/branches/core6/src/modules/gametypes/SpaceRaceBot.cc

@@ -31 +31 @@
     CreateFactory(SpaceRaceBot);
 
-    SpaceRaceBot::SpaceRaceBot(BaseObject* creator) : Bot(creator){
+    SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){
         RegisterObject(SpaceRaceBot);
         this->defaultController_ = Class(SpaceRaceController);// ClassByString("")

code/branches/core6/src/modules/gametypes/SpaceRaceBot.h

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

code/branches/core6/src/modules/gametypes/SpaceRaceController.cc

@@ -52 +52 @@
      * Idea: Find static Point (checkpoints the spaceship has to reach)
      */
-    SpaceRaceController::SpaceRaceController(BaseObject* creator) :
-        ArtificialController(creator)
+    SpaceRaceController::SpaceRaceController(Context* context) :
+        ArtificialController(context)
     {
         RegisterObject(SpaceRaceController)

code/branches/core6/src/modules/gametypes/SpaceRaceController.h

@@ -65 +65 @@
 
         public:
-            SpaceRaceController(BaseObject* creator);
+            SpaceRaceController(Context* context);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual ~SpaceRaceController();

code/branches/core6/src/modules/gametypes/SpaceRaceManager.cc

@@ -42 +42 @@
     CreateFactory(SpaceRaceManager);
 
-    SpaceRaceManager::SpaceRaceManager(BaseObject* creator) :
-        BaseObject(creator)
+    SpaceRaceManager::SpaceRaceManager(Context* context) :
+        BaseObject(context)
     {
         RegisterObject(SpaceRaceManager);

code/branches/core6/src/modules/gametypes/SpaceRaceManager.h

@@ -55 +55 @@
 
         public:
-            SpaceRaceManager(BaseObject* creator);
+            SpaceRaceManager(Context* context);
             virtual ~SpaceRaceManager() ;