- Timestamp:
- Apr 12, 2018, 2:07:03 PM (6 years ago)
- Location:
- code/branches/ScriptableController_FS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ScriptableController_FS18
- Property svn:mergeinfo changed
/code/branches/ScriptableController_HS17 (added) merged: 11462,11518-11519,11549,11552,11562,11583,11606,11638,11662,11673-11674,11684,11852,11854
- Property svn:mergeinfo changed
-
code/branches/ScriptableController_FS18/src/orxonox/infos/GametypeInfo.cc
r11099 r11855 43 43 #include "interfaces/GametypeMessageListener.h" 44 44 #include "interfaces/NotificationListener.h" 45 #include "scriptablecontroller/scriptable_controller.h" 46 #include "Level.h" 45 47 46 48 #include "PlayerInfo.h" … … 76 78 this->spawned_ = false; 77 79 this->readyToSpawn_ = false; 80 this->isFirstSpawn_ = true; 78 81 79 82 this->registerVariables(); … … 310 313 { 311 314 if(this->hasStarted() && !this->hasEnded()) 312 313 315 this->setSpawnedHelper(player, true); 316 } 317 318 // TODO We might want to handle the subsequent spawns as well somehow 319 if(player->isHumanPlayer() && player->isLocalPlayer() && this->isFirstSpawn_) 320 { 321 this->isFirstSpawn_ = false; 322 this->getLevel()->getScriptableController()->setPlayer(player); 323 324 // This handles paths relative to the 'level' directory 325 std::string script = this->getLevel()->getScript(); 326 if(script.at(0) != '/') 327 script = "../levels/" + script; // Not very dynamic 328 this->getLevel()->getScriptableController()->runScript(script); 314 329 } 315 330 }
Note: See TracChangeset
for help on using the changeset viewer.