Changeset 9348 for code/trunk/src/modules/gametypes

Timestamp:

Aug 30, 2012, 11:08:17 PM (12 years ago)

Author:

landauf

Message:

merged branch presentation2012merge back to trunk

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/modules/gametypes/OldRaceCheckPoint.cc (modified) (1 diff, 1 prop)
• src/modules/gametypes/OldRaceCheckPoint.h (modified) (1 prop)
• src/modules/gametypes/OldSpaceRace.cc (modified) (4 diffs, 1 prop)
• src/modules/gametypes/OldSpaceRace.h (modified) (1 diff, 1 prop)
• src/modules/gametypes/RaceCheckPoint.cc (modified) (1 diff)
• src/modules/gametypes/SpaceRace.cc (modified) (5 diffs)
• src/modules/gametypes/SpaceRaceManager.cc (modified) (1 diff, 1 prop)
• src/modules/gametypes/SpaceRaceManager.h (modified) (1 prop)

code/trunk

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc

@@ -112 +112 @@
                 const std::string& message =  "You have " + multi_cast<std::string>(this->bTimeLimit_)
                             + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1);
-                const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
+                gametype->getGametypeInfo()->sendAnnounceMessage(message);
                 ChatManager::message(message);
             }

code/trunk/src/modules/gametypes/OldSpaceRace.cc

@@ -58 +58 @@
                         + "You didn't reach the check point " + multi_cast<std::string>(this->checkpointsReached_+1)
                         + " before the time limit. You lose!";
-            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+            this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
         }
@@ -68 +68 @@
             const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
                         + "." + multi_cast<std::string>(ms) + " seconds.";
-            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+            this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
 /*
@@ -85 +85 @@
 
         std::string message("The match has started! Reach the check points as quickly as possible!");
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
     }
@@ -98 +98 @@
                         + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
                         + " seconds.";
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
     }

code/trunk/src/modules/gametypes/OldSpaceRace.h

@@ -59 +59 @@
 
             virtual void newCheckpointReached();
+            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command.
+                                                        //<! This is only a temporary solution. Better: create racingBots.
 
             inline void setCheckpointsReached(int n)

code/trunk/src/modules/gametypes/RaceCheckPoint.cc

@@ -97 +97 @@
             std::string message =  "You have " + multi_cast<std::string>(this->timeLimit_)
                         + " seconds to reach the check point " + multi_cast<std::string>(this->checkpointIndex_ + 1);
-            const_cast<GametypeInfo*>(this->getGametype()->getGametypeInfo())->sendAnnounceMessage(message);
+            this->getGametype()->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
         }

code/trunk/src/modules/gametypes/SpaceRace.cc

@@ -23 +23 @@
  *     Mauro Salomon
  *   Co-authors:
- *      ...
+ *      Celine Egger
  *
  */
@@ -48 +48 @@
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
+        this->numberOfBots_ = 0; // quick fix: don't allow default-bots to enter the race
+                                 // remove this line, if a raceBot has been created.
     }
 
@@ -70 +72 @@
         }
 
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
     }
@@ -97 +99 @@
 
             std::string message = "The match has started! Reach the check points as quickly as possible!";
-            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+            this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
         }
@@ -112 +114 @@
         const std::string& message = "Checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1)
             + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
     }

code/trunk/src/modules/gametypes/SpaceRaceManager.cc

@@ -149 +149 @@
             }
             else
-                        {
+            {
                 // adjust the radarvisibility
                 gametype->newCheckpointReached(newCheckpoint, player);

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies