Changeset 12028 for code/branches/mergeFS18/src/orxonox/infos

Timestamp:

Oct 10, 2018, 3:16:51 PM (6 years ago)

Author:

merholzl

Message:

added scriptable controller

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• src/orxonox/infos/GametypeInfo.cc (modified) (5 diffs)
• src/orxonox/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/infos/HumanPlayer.cc (modified) (1 diff)

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

@@ -43 +43 @@
 #include "interfaces/GametypeMessageListener.h"
 #include "interfaces/NotificationListener.h"
+#include "scriptablecontroller/scriptable_controller.h"
+#include "Level.h"
 
 #include "PlayerInfo.h"
@@ -76 +78 @@
         this->spawned_ = false;
         this->readyToSpawn_ = false;
+        this->isFirstSpawn_ = true;
 
         this->registerVariables();
@@ -296 +299 @@
             this->setReadyToSpawnHelper(player, false);
             this->setSpawnedHelper(player, false);
+
         }
     }
@@ -310 +314 @@
         {
             if(this->hasStarted() && !this->hasEnded())
-
                 this->setSpawnedHelper(player, true);
+        }
+
+        // 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) != '/')
+                script = "../levels/" + script; // Not very dynamic
+            this->getLevel()->getScriptableController()->runScript(script);
         }
     }
@@ -345 +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/mergeFS18/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.
 
@@ -166 +167 @@
             bool spawned_; //!< Whether the local Player is currently spawned.
             bool readyToSpawn_; //!< Whether the local Player is ready to spawn.
+            bool isFirstSpawn_;
     };
 }

code/branches/mergeFS18/src/orxonox/infos/HumanPlayer.cc

@@ -38 +38 @@
 #include "gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox