Changeset 10117

Timestamp:

Nov 12, 2014, 2:27:50 PM (9 years ago)

Author:

sriedel

Message:

Bullshit

Location:

code/branches/surfaceraceHS14/src/modules/dodgerace2

Files:

• CMakeLists.txt (modified) (1 diff)
• DodgeRace.cc (modified) (4 diffs)
• DodgeRace.h (modified) (2 diffs)
• DodgeRaceCenterPoint.cc (modified) (1 diff)
• DodgeRaceCenterPoint.h (modified) (1 diff)
• DodgeRaceHUDinfo.cc (modified) (1 diff)
• DodgeRaceHUDinfo.h (modified) (1 diff)
• DodgeRacePrereqs.h (modified) (2 diffs)
• DodgeRaceShip.cc (added)
• DodgeRaceShip.h (added)

code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt

@@ -3 +3 @@
 DodgeRaceCenterPoint.cc
 DodgeRaceHUDinfo.cc
+DodgeRaceShip.cc
 )
 

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

@@ -45 +45 @@
 #include "infos/PlayerInfo.h"
 
-#include "DodgeRaceCenterPoint.h"
-/*#include "DodgeRaceShip.h"
+/*#include "DodgeRaceCenterPoint.h"
+#include "DodgeRaceShip.h"
 #include "DodgeRaceEnemy.h"
 #include "DodgeRaceEnemyShooter.h"
@@ -61 +61 @@
         RegisterObject(DodgeRace);
         this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
-        this->center_ = 0;
+        this->center_ = NULL;
         init();
         this->setHUDTemplate("DodgeRaceHUD"); // !!!!!!!!!!!!!!!        change later
@@ -82 +82 @@
     void DodgeRace::levelUp()
     {
-        level++;/*
+        level++;
         if (getPlayer() != NULL)
         {
@@ -96 +96 @@
         multiplier *= 2;
         toggleShowLevel();
-        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&DodgeRace::toggleShowLevel, this)));*/
+        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&DodgeRace::toggleShowLevel, this)));
     }
 
-    /*WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
+    WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
     {
         if (player == NULL)
         {
-            //for (ObjectList<DodgeRaceShip>::iterator it = ObjectList<DodgeRaceShip>::begin(); it != ObjectList<DodgeRaceShip>::end(); ++it)
-              //  player = *it;
+            for (ObjectList<DodgeRaceShip>::iterator it = ObjectList<DodgeRaceShip>::begin(); it != ObjectList<DodgeRaceShip>::end(); ++it)
+            {
+                player = *it;
+            }
         }
         return player;
     }
 
-    void DodgeRace::spawnEnemy()
+    /*void DodgeRace::spawnEnemy()
     {
         if (getPlayer() == NULL)

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

@@ -36 +36 @@
 #define _DodgeRace_H__
 
-//#include "dodgerace2/DodgeRacePrereqs.h"
+#include "dodgerace2/DodgeRacePrereqs.h"
 
-#include "DodgeRaceCenterPoint.h"
-#include "DodgeRaceHUDinfo.h"
+//#include "DodgeRaceCenterPoint.h"
+//#include "DodgeRaceHUDinfo.h"
+//#include "DodgeRaceShip.h"
 
 #include "gametypes/Deathmatch.h"
-
-#include "DodgeRaceCenterPoint.h"
-
 #include "tools/Timer.h"
 
@@ -82 +80 @@
         private:
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
-            //WeakPtr<DodgeRaceShip> getPlayer();
+            WeakPtr<DodgeRaceShip> getPlayer();
             WeakPtr<DodgeRaceCenterPoint> center_;
-            //WeakPtr<DodgeRaceShip> player;
+            WeakPtr<DodgeRaceShip> player;
 
             Timer enemySpawnTimer;

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 
-//#include "DodgeRace.h"
+#include "DodgeRace.h"
 
 namespace orxonox

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

@@ -36 +36 @@
 #define _DodgeRaceCenterPoint_H__
 
-//#include "dodgerace2/DodgeRacePrereqs.h"
-#include "DodgeRace.h"
-#include "DodgeRaceHUDinfo.h"
+#include "dodgerace2/DodgeRacePrereqs.h"
+
+//#include "DodgeRace.h"
+//#include "DodgeRaceHUDinfo.h"
 
 #include "worldentities/StaticEntity.h"

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc

@@ -30 +30 @@
 #include "core/XMLPort.h"
 #include "util/Convert.h"
-#include "DodgeRace.h"
+//#include "DodgeRace.h"
 
 namespace orxonox

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

@@ -28 +28 @@
 #define _DodgeRaceHUDinfo_H__
 
-//#include "DodgeRacePrereqs.h"
+//#include "DodgeRaceShip.h"
 #include "DodgeRace.h"
-#include "DodgeRaceCenterPoint.h"
+//#include "DodgeRaceCenterPoint.h"
+
+#include "dodgerace2/DodgeRacePrereqs.h"
 
 #include "tools/interfaces/Tickable.h"

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

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(INVADER_STATIC_BUILD)
-#  ifdef INVADER_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DODGERACE_STATIC_BUILD)
+#  ifdef DODGERACE_SHARED_BUILD
 #    define _DodgeRaceExport __declspec(dllexport)
 #  else
@@ -68 +68 @@
 namespace orxonox
 {
-    //class DodgeRace;
-    class DodgeRaceCenterPoint;/*
+    class DodgeRace;
+    class DodgeRaceCenterPoint;
     class DodgeRaceShip;
-    class DodgeRaceEnemy;
-    class DodgeRaceEnemyShooter;
-    class DodgeRaceWeapon;
-    class DodgeRaceWeaponEnemy;*/
+    //class DodgeRaceEnemy;
+    //class DodgeRaceEnemyShooter;
+    //class DodgeRaceWeapon;
+    //class DodgeRaceWeaponEnemy;
     class DodgeRaceHUDinfo;
 }
 
-#endif /* _DodgeRacePrereqs_H__ */
+#endif /* _DodgeRacePrereqs_H__*/