Changeset 11901

Timestamp:

Apr 24, 2018, 1:36:15 PM (6 years ago)

Author:

adamc

Message:

scriptablecontroller fixed respawn reexecution

Location:

code/branches/ScriptableController_FS18/src/orxonox

Files:

• infos/GametypeInfo.cc (modified) (3 diffs)
• scriptablecontroller/scriptable_controller_api.cc (modified) (2 diffs)

code/branches/ScriptableController_FS18/src/orxonox/infos/GametypeInfo.cc

@@ -299 +299 @@
             this->setReadyToSpawnHelper(player, false);
             this->setSpawnedHelper(player, false);
+
         }
     }
@@ -317 +318 @@
 
         // TODO We might want to handle the subsequent spawns as well somehow
-        if(player->isHumanPlayer() && player->isLocalPlayer() && this->isFirstSpawn_)
+        if(player->isHumanPlayer() && player->isLocalPlayer()) //&& this->isFirstSpawn_)
         {
             this->isFirstSpawn_ = false;
@@ -360 +361 @@
             {
                 // Display "Press [Fire] to start the match" if the game has not yet ended.
-                if(!this->hasEnded())
+                if(!this->hasEnded()){
                     NotificationListener::sendNotification("Press [Fire] to start the match", GametypeInfo::NOTIFICATION_SENDER, NotificationMessageType::info, NotificationSendMode::network, player->getClientID());
+                
+                    //this->getLevel()->getScriptableController()->setPlayer(player);
+
+                    // This handles paths relative to the 'level' directory
+                    //std::string script = this->getLevel()->getScript();
+                    //if(script.at(0) != '/')
+                    //script = "../levels/" + script; // Not very dynamic
+                    //this->getLevel()->getScriptableController()->runScript(script);
+                }
                 // Else display "Game has ended".
                 else

code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc

@@ -152 +152 @@
         {
             orxout(user_warning) << "Script tried to spawn an object that is neither a WorldEntity, nor a PlayerInfo" << std::endl;
+            
             return;
         }
@@ -361 +362 @@
     }
 
+    //void ScriptableControllerAPI::moveEntity(std::string id, double x, double y, double z)
+
 }