Changeset 10117 for code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc

Timestamp:

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

Author:

sriedel

Message:

Bullshit

File:

• code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) (4 diffs)

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)