Changeset 11690 for code/branches/Presentation_HS17/src/orxonox/infos

Timestamp:

Dec 18, 2017, 12:40:00 PM (6 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

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

code/branches/Presentation_HS17/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"
@@ -78 +76 @@
         this->spawned_ = false;
         this->readyToSpawn_ = false;
-        this->isFirstSpawn_ = true;
 
         this->registerVariables();
@@ -313 +310 @@
         {
             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);
         }
     }

code/branches/Presentation_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_;
     };
 }

code/branches/Presentation_HS17/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