Changeset 11673 for code/branches/ScriptableController_HS17/src/orxonox/infos

Timestamp:

Dec 14, 2017, 4:04:14 PM (7 years ago)

Author:

kohlia

Message:

The ScriptableController should work now. A demo level called scriptableControllerTest exists as well.

Location:

code/branches/ScriptableController_HS17/src/orxonox/infos

Files:

• GametypeInfo.cc (modified) (2 diffs)
• GametypeInfo.h (modified) (2 diffs)

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

@@ -78 +78 @@
         this->spawned_ = false;
         this->readyToSpawn_ = false;
+        this->isFirstSpawn_ = true;
 
         this->registerVariables();
@@ -315 +316 @@
         }
 
-        if(player->isHumanPlayer() && player->isLocalPlayer())
-        {
+        // TODO We might want to handle the subsequent spawns as well somehow
+        if(player->isHumanPlayer() && player->isLocalPlayer() && this->isFirstSpawn_)
+        {
+            this->isFirstSpawn_ = false;
             this->getLevel()->getScriptableController()->setPlayer(player);
 
+            // This handles paths relative to the 'level' directory
             std::string script = this->getLevel()->getScript();
             if(script.at(0) != '/')

code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.h

@@ -83 +83 @@
             inline bool isStartCountdownRunning() const
                 { return this->bStartCountdownRunning_; }
-            
+
             void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
 
@@ -168 +168 @@
             bool spawned_; //!< Whether the local Player is currently spawned.
             bool readyToSpawn_; //!< Whether the local Player is ready to spawn.
+            bool isFirstSpawn_;
     };
 }