Changeset 8944
- Timestamp:
- Nov 23, 2011, 2:14:29 PM (13 years ago)
- Location:
- code/branches/spaceraceTwo
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc
r8940 r8944 46 46 RegisterObject(SpaceRace); 47 47 48 const std::string& message = "SpaceRace constructed"; 49 orxout()<< message << endl; 50 48 51 this->bTimeIsUp_ = false; 49 52 this->numberOfBots_ = 0; … … 52 55 for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it) 53 56 {this->checkpointReached_[it->first]=0;} 57 58 54 59 } 55 60 … … 92 97 93 98 void SpaceRace::start() 94 { 95 this->spawnPlayersIfRequested(); Gametype::checkStart(); 99 { 100 Gametype::start(); 101 this->spawnPlayersIfRequested(); //Gametype::checkStart(); 96 102 this->cantMove_=true; 97 103 -
code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc
r8940 r8944 45 45 { 46 46 RegisterObject(SpaceRaceManager); 47 47 48 const std::string& message = "SpaceRaceManager constructed"; 49 orxout()<< message << endl; 48 50 } 49 51 -
code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc
r8918 r8944 134 134 135 135 } 136 137 this->checkStart(); 136 137 const std::string& message = "Gametype should start"; 138 orxout()<< message << endl; 139 this->start(); 140 const std::string& message2 = "Gametype should have started"; 141 orxout()<< message2 << endl; 142 138 143 } 139 144 else if (!this->gtinfo_->hasEnded()) … … 144 149 145 150 void Gametype::start() 146 { 151 { const std::string& message = "Gametype starts"; 152 orxout()<< message << endl; 153 147 154 this->addBots(this->numberOfBots_); 148 155 … … 150 157 151 158 this->spawnPlayersIfRequested(); 159 160 152 161 } 153 162 -
code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc
r8898 r8944 164 164 { 165 165 if(this->bStarted_) 166 return; 166 {const std::string& message = "bStarted true"; 167 orxout()<< message << endl; return;} 167 168 168 169 this->bStarted_ = true; 169 170 this->changedStarted(); 171 172 const std::string& message = "bStarted true"; 173 orxout()<< message << endl; 170 174 } 171 175
Note: See TracChangeset
for help on using the changeset viewer.