Changeset 9436

Timestamp:

Nov 5, 2012, 4:21:40 PM (12 years ago)

Author:

purgham

Message:

working Version 5.11.2012 - Bots can be included after starting the level

Location:

code/branches/Racingbot/src/modules/gametypes

Files:

• SpaceRaceController.cc (modified) (6 diffs)
• SpaceRaceManager.cc (modified) (1 diff)

code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc

@@ -29 +29 @@
 #include "gametypes/SpaceRaceManager.h"
 
-// Von SpaceRaceManager points einlesen
-// Berechnungsklasse nextPoint zur verfuegung stellen
-// ^- aufrufen ueber tick (if ob noetig)
+// WEnn RAcer nach start erstellt wird fehler in Tick
+// Fuer beide Spieler wird next point angezeigt
 namespace orxonox
 {
@@ -43 +42 @@
     {
         RegisterObject(SpaceRaceController);
-
         std::vector<RaceCheckPoint*> checkpoints;
         for (ObjectList<SpaceRaceManager>::iterator it = ObjectList<SpaceRaceManager>::begin(); it!= ObjectList<SpaceRaceManager>::end(); ++it)
@@ -68 +66 @@
     RaceCheckPoint* SpaceRaceController::nextPointFind(RaceCheckPoint* raceCheckpoint)
     {
-        int distances[] = { -1, -1, -1 };
+        int distances[] =
+        {   -1, -1, -1};
         int temp_i = 0;
         for (std::set<int>::iterator it =raceCheckpoint->getNextCheckpoints().begin(); it!= raceCheckpoint->getNextCheckpoints().end(); ++it)
@@ -103 +102 @@
     {
         if (currentRaceCheckpoint_ == NULL) // no Adjust possible
+
         {
             return nextRaceCheckpoint_;
         }
         if ((currentRaceCheckpoint_->getNextCheckpoints()).size() == 1) // no Adjust possible
+
         {
             return nextRaceCheckpoint_;
@@ -141 +142 @@
     {
         std::map<RaceCheckPoint*, int> * zaehler = new std::map<
-                RaceCheckPoint*, int>(); // counts how many times the checkpoit was reached (for simulation)
+        RaceCheckPoint*, int>(); // counts how many times the checkpoit was reached (for simulation)
         for (unsigned int i = 0; i < allCheckpoints.size(); i++)
         {
@@ -203 +204 @@
     void SpaceRaceController::tick(float dt)
     {
+        if (this->getControllableEntity() ==  NULL || this->getControllableEntity()->getPlayer() == NULL ){orxout()<<this->getControllableEntity()<<endl; return;}
         if (nextRaceCheckpoint_->playerWasHere(this->getControllableEntity()->getPlayer()))
         {//Checkpoint erreicht

code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc

@@ -145 +145 @@
 
         RaceCheckPoint* oldCheckpoint = gametype->getCheckpointReached(player); // returns the last from player reached checkpoint
-        // % fixing
-        orxout() << "SpaceRaceManager.checkpointReached( "<<newCheckpoint->getCheckpointIndex()
-                 <<", "<< player->isHumanPlayer() << endl;
-        // % end fixing
+
         if (this->reachedValidCheckpoint(oldCheckpoint, newCheckpoint, player))
         {