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

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.cc (modified) (10 diffs)

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

@@ -33 +33 @@
 
 #include "DodgeRace.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 "DodgeRaceCenterPoint.h"
-#include "DodgeRaceShip.h"
-#include "DodgeRaceEnemy.h"
-#include "DodgeRaceEnemyShooter.h"
-*/
-#include "core/command/ConsoleCommand.h"
-#include "worldentities/BigExplosion.h"
+#include "DodgeRaceShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
 
 namespace orxonox
 {
-    RegisterClass(DodgeRace);
+    RegisterUnloadableClass(DodgeRace);
 
     DodgeRace::DodgeRace(Context* context) : Deathmatch(context)
     {
         RegisterObject(DodgeRace);
+        init();
         this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
-        this->center_ = NULL;
-        init();
-        this->setHUDTemplate("DodgeRaceHUD"); // !!!!!!!!!!!!!!!        change later
+        this->center_ = 0;
+        /*
+        this->setHUDTemplate("DodgeRaceHUD"); // !!!!!!!!!!!!!!!        change later*/
     }
 
@@ -75 +58 @@
         multiplier = 1;
         b_combo = false;
+
         // spawn enemy every 3.5 seconds
         //enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&DodgeRace::spawnEnemy, this)));
-        //comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
+        comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
     }
 
@@ -83 +67 @@
     {
         level++;
-        if (getPlayer() != NULL)
+       /* if (getPlayer() != NULL)
         {
             for (int i = 0; i < 7; i++)
@@ -92 +76 @@
                 chunk->setScale(20);
             }
-        }
+        }*/
         addPoints(multiplier * 42);
         multiplier *= 2;
@@ -110 +94 @@
         return player;
     }
-
-    /*void DodgeRace::spawnEnemy()
+/*
+    void DodgeRace::spawnEnemy()
     {
         if (getPlayer() == NULL)
@@ -134 +118 @@
             newPawn->setPosition(player->getPosition() + Vector3(500.f + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
         }
-    }*/
+    }
 
     void DodgeRace::costLife()
@@ -144 +128 @@
          //   enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&DodgeRace::end, this)));
     };
-
+*/
     void DodgeRace::comboControll()
     {
@@ -161 +145 @@
         this->bForceSpawn_ = true;
 
-        if (this->center_ == NULL)  // abandon mission!
+        /*if (this->center_ == NULL)  // abandon mission!
         {
             orxout(internal_error) << "DodgeRace: No Centerpoint specified." << endl;
             GSLevel::startMainMenu();
             return;
-        }
+        }*/
         // Call start for the parent class.
         Deathmatch::start();
@@ -178 +162 @@
         }
     }
-
+/*
     void DodgeRace::end()
     {
@@ -186 +170 @@
         // Instead startMainMenu, this won't crash.
         GSLevel::startMainMenu();
-    }
+    }*/
 }