Changeset 9207

Timestamp:

May 18, 2012, 3:34:50 PM (13 years ago)

Author:

mentzerf

Message:

+ Added new class 'TowerDefensePlayerStats' to manage stats

• Removed stats variables from TowerDefenseHUDController

Location:

code/branches/newlevel2012/src/modules/towerdefense

Files:

• CMakeLists.txt (modified) (1 diff)
• TowerDefense.cc (modified) (2 diffs)
• TowerDefense.h (modified) (2 diffs)
• TowerDefenseHUDController.cc (modified) (2 diffs)
• TowerDefenseHUDController.h (modified) (2 diffs)
• TowerDefensePlayerStats.cc (added)
• TowerDefensePlayerStats.h (added)
• TowerDefensePrereqs.h (modified) (1 diff)

code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt

@@ -4 +4 @@
   TowerDefenseCenterpoint.cc
   TowerDefenseHUDController.cc
+  TowerDefensePlayerStats.cc
 )
 

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

@@ -77 +77 @@
 #include "Tower.h"
 #include "TowerDefenseCenterpoint.h"
+#include "TowerDefensePlayerStats.h"
 
 #include "worldentities/SpawnPoint.h"
@@ -100 +101 @@
                 
         this->setHUDTemplate("TowerDefenseHUD");
+
+                this->stats_ = new TowerDefensePlayerStats();
 
                 /* Temporary hack to allow the player to add towers */

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

@@ -41 +41 @@
 #include "gametypes/Deathmatch.h"
                  
-
-
 namespace orxonox
 {
@@ -80 +78 @@
 //              WeakPtr<TowerDefenseCenterpoint> center_;
                 TowerDefenseCenterpoint *center_;
+                
+                /* handles stats */
+                TowerDefensePlayerStats *stats_;
         
                 bool hasTower(int x, int y);

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

@@ -37 +37 @@
         CreateFactory(TowerDefenseHUDController);
         
-        const int kDefaultCredit = 200;
-        
     TowerDefenseHUDController::TowerDefenseHUDController(BaseObject* creator) : OverlayText(creator)
         {
                 RegisterObject(TowerDefenseHUDController);
-                
-                this->credit_ = 200;
-                this->waveNumber_ = 0;
         }
         
@@ -55 +50 @@
         {
                 SUPER(TowerDefenseHUDController, tick, dt);
-                
-                credit_;
         }
         

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

@@ -29 +29 @@
  /**
          @brief
+         This subclass of OverlayText is used to display the stats of the player in the HUD
          
          @ingroup TowerDefense
@@ -54 +55 @@
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
                 virtual void changedOwner();
-                
-                inline int getCredit()
-                        { return credit_; }
-                
-                inline void setCredit(int credit)
-                        { credit_ = credit; }
-                
-                inline int getWaveNumber()
-                        { return waveNumber_; }
-                
-                inline void didLoadNextWave()
-                        { waveNumber_++; }
-                
-                
-                
-        private:
-                int credit_;
-                int waveNumber_;
-                //int baseHealth_;
     };
 }

code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h

@@ -68 +68 @@
         class Tower;
     class TowerDefenseCenterpoint;
+        class TowerDefenseHUDController;
         class TowerDefensePlayerStats;
 }