Changeset 11283 for code/branches/SpaceRace_HS16
- Timestamp:
- Nov 14, 2016, 2:34:29 PM (8 years ago)
- Location:
- code/branches/SpaceRace_HS16/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
r11281 r11283 79 79 { 80 80 Gametype::start(); 81 82 81 if (true) 83 82 { … … 138 137 139 138 140 // spawns the players when the countdown starts, but deactivates their engines139 /* // spawns the players when the countdown starts, but deactivates their engines 141 140 if (this->isStartCountdownRunning() && !this->cantMove_) 142 141 { … … 149 148 150 149 151 gt Info_->setStartCountdown(10.0);150 gtinfo_->setStartCountdown(50.0); 152 151 153 152 154 /*this->spawnPlayersIfRequested();155 this->cantMove_ = true;156 157 for (Engine* engine : ObjectList<Engine>()){158 engine->setActive(false);159 }160 161 162 163 std::string message("BE FAST BE FIRST");164 this->getGametypeInfo()->sendAnnounceMessage(message);165 ChatManager::message(message);166 167 Timer* countdownTimer = new Timer();168 countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));*/169 153 170 154 … … 187 171 this->getGametypeInfo()->sendAnnounceMessage(message); 188 172 ChatManager::message(message); 189 } 173 }*/ 190 174 191 175 } … … 199 183 int ms = this->clock_.getMilliseconds() % 1000; 200 184 201 const std::string& message = "Checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 202 + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds."; 203 this->getGametypeInfo()->sendAnnounceMessage(message); 204 ChatManager::message(message); 185 186 187 const std::string& message = player->getName() + "reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 188 + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds."; 189 this->getGametypeInfo()->sendAnnounceMessage(message); 190 ChatManager::message(message); 191 205 192 } 206 193 … … 215 202 for (Engine* engine : ObjectList<Engine>()) 216 203 engine->setActive(true); 204 205 217 206 218 207 } -
code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
r9667 r11283 68 68 static const std::string names[] = 69 69 { 70 "Berkay Berabi", 71 "Louis Meile" 70 72 "Dr. Julius No", 71 73 "Rosa Klebb", -
code/branches/SpaceRace_HS16/src/orxonox/infos/GametypeInfo.h
r11281 r11283 133 133 void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const; 134 134 void dispatchFadingMessage(const std::string& message) const; 135 void setStartCountdown(float countdown); // Set the start countdown to the input value. 136 135 137 136 138 protected: 137 139 void start(void); // Inform the GametypeInfo that the game has started. 138 140 void end(void); // Inform the GametypeInfo that the game has ended. 139 void setStartCountdown(float countdown); // Set the start countdown to the input value.140 141 void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value. 141 142 void countDown(); // Count down the start countdown counter.
Note: See TracChangeset
for help on using the changeset viewer.