Changeset 10118 for code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h

Timestamp:

Nov 12, 2014, 3:58:59 PM (11 years ago)

Author:

sriedel

Message:

Working atm. including function after function.

File:

• code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified) (3 diffs)

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h

@@ -38 +38 @@
 #include "dodgerace2/DodgeRacePrereqs.h"
 
-//#include "DodgeRaceCenterPoint.h"
+#include "DodgeRaceCenterPoint.h" // Necessary for WeakPointer??
+//#include "DodgeRaceShip.h" // DO NOT include in Header. Will cause forward declaration issues
+
 //#include "DodgeRaceHUDinfo.h"
-//#include "DodgeRaceShip.h"
+
+
+#include "core/CoreIncludes.h"
+#include "core/EventIncludes.h"
+#include "core/command/Executor.h"
+#include "core/config/ConfigValueIncludes.h"
+
+#include "gamestates/GSLevel.h"
+#include "chat/ChatManager.h"
+
+// ! HACK
+#include "infos/PlayerInfo.h"
+
+#include "core/command/ConsoleCommand.h"
+#include "worldentities/BigExplosion.h"
 
 #include "gametypes/Deathmatch.h"
@@ -48 +64 @@
 {
 
-    class DodgeRace : public Deathmatch
+    class _DodgeRaceExport DodgeRace : public Deathmatch
     {
-        public:
+       public:
             DodgeRace(Context* context);
 
+            void init();
+
             virtual void start();
-            virtual void end();
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+            //virtual void end();
 
-            //void spawnEnemy();
-
-            void setCenterpoint(DodgeRaceCenterPoint* center)
-            { this->center_ = center; }
+            void levelUp();
 
             int getLives(){return this->lives;}
@@ -67 +81 @@
             int getMultiplier(){return this->multiplier;}
 
-            void costLife();
-            void levelUp();
-            void addPoints(int numPoints);
+            void setCenterpoint(DodgeRaceCenterPoint* center)
+                       { this->center_ = center; }
 
             // checks if multiplier should be reset.
             void comboControll();
-            void init();
+
+            bool bEndGame;
+            bool bShowLevel;
             int lives;
             int multiplier;
-            bool bEndGame;
-            bool bShowLevel;
-        private:
+
+       private:
+            WeakPtr<DodgeRaceShip> getPlayer();
+            WeakPtr<DodgeRaceShip> player;
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
-            WeakPtr<DodgeRaceShip> getPlayer();
+            void addPoints(int numPoints);
+
             WeakPtr<DodgeRaceCenterPoint> center_;
-            WeakPtr<DodgeRaceShip> player;
-
-            Timer enemySpawnTimer;
-            Timer comboTimer;
-            Timer showLevelTimer;
-            //Context* context;
             int level;
             int point;
             bool b_combo;
+
+            Timer enemySpawnTimer;
+                        Timer comboTimer;
+                        Timer showLevelTimer;
+
+
+         /* virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+
+            //void spawnEnemy();
+
+
+
+
+
+            void costLife();
+
+
+
+
+
+
+        private:
+
+
+
+
+            //Context* context;
+            */
     };
 }