Changeset 9016 for code/trunk/src/orxonox/gametypes/Gametype.cc
- Timestamp:
- Feb 15, 2012, 11:51:58 PM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gametypes/Gametype.cc
r8858 r9016 123 123 if (this->gtinfo_->isStartCountdownRunning() && !this->gtinfo_->hasStarted()) 124 124 this->gtinfo_->countdownStartCountdown(dt); 125 125 126 126 if (!this->gtinfo_->hasStarted()) 127 127 { … … 131 131 if(it->first->isHumanPlayer() && it->first->isReadyToSpawn()) 132 132 this->gtinfo_->playerReadyToSpawn(it->first); 133 } 134 133 134 135 } 135 136 this->checkStart(); 136 137 } … … 143 144 void Gametype::start() 144 145 { 146 145 147 this->addBots(this->numberOfBots_); 146 148 … … 148 150 149 151 this->spawnPlayersIfRequested(); 152 153 150 154 } 151 155 … … 376 380 { 377 381 this->gtinfo_->stopStartCountdown(); 378 this->gtinfo_->setStartCountdown(0.0f); ;382 this->gtinfo_->setStartCountdown(0.0f); 379 383 this->start(); 380 384 } … … 397 401 hashumanplayers = true; 398 402 } 403 399 404 if (allplayersready && hashumanplayers) 400 405 { … … 408 413 } 409 414 } 415 410 416 } 411 417 } … … 439 445 if(player->isHumanPlayer()) 440 446 this->gtinfo_->playerSpawned(player); 441 447 442 448 this->playerPostSpawn(player); 443 449 }
Note: See TracChangeset
for help on using the changeset viewer.