Changeset 10254 for code

Timestamp:

Feb 3, 2015, 11:43:42 PM (10 years ago)

Author:

landauf

Message:

cleanup

Location:

code/branches/storymodeHS14

Files:

• data/gui/scripts/SingleplayerMenu.lua (modified) (2 diffs)
• src/orxonox/gametypes/Mission.cc (modified) (7 diffs)

code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua

@@ -19 +19 @@
     P.createFilterTab("Tests", "test")
     P.createFilterTab("Show All", nil)
-   
 
     -- update description and screenshot boxes
     P.SingleplayerSelectionChanged()
 
-    --buttons are arranged in a 1x4 matrix
+    --buttons are arranged in a 2x3 matrix
     P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"),
@@ -39 +38 @@
             ["callback"]  = P.SingleplayerBackButton_clicked
     })
-    P:setButton(1, 4,{
+
+    P:setButton(2, 2,{
             ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
             ["callback"] = P.CampaignButton_clicked

code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc

@@ -29 +29 @@
 #include "Mission.h"
 
-#include <boost/filesystem.hpp>
-
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
@@ -36 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/command/ConsoleCommand.h"
-#include "core/config/ConfigValueIncludes.h"
 #include "infos/PlayerInfo.h"
 #include "network/Host.h"
@@ -82 +79 @@
     void Mission::start()
     {
-        std::fstream myfile;
-
         Gametype::start();
         this->setTeams();
-        //just for testing
-        //this->missionAccomplished_=true;
         this->gtinfo_->sendAnnounceMessage("Your mission has started!");
     }
@@ -93 +86 @@
     void Mission::end()
     {
-
         if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
         {
@@ -100 +92 @@
             LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
         }
-
         else if (!this->gtinfo_->hasEnded())
             this->gtinfo_->sendAnnounceMessage("Mission failed!");
+
         Gametype::end();
     }
@@ -122 +114 @@
             it->setMissionAccomplished(accomplished);
             it->end();
-
         }
     }
@@ -133 +124 @@
         }
     }
-
 }