[Orxonox-commit 5592] r10254 - in code/branches/storymodeHS14: data/gui/scripts src/orxonox/gametypes

[landauf at orxonox.net]

Author: landauf
Date: 2015-02-03 23:43:42 +0100 (Tue, 03 Feb 2015)
New Revision: 10254

Modified:
   code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua
   code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc
Log:
cleanup

Modified: code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua	2015-02-03 22:38:07 UTC (rev 10253)
+++ code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua	2015-02-03 22:43:42 UTC (rev 10254)
@@ -18,12 +18,11 @@
     P.createFilterTab("Presentations", "presentation")
     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"),
             ["callback"]  = P.SingleplayerStartButton_clicked
@@ -38,7 +37,8 @@
             ["button"] = winMgr:getWindow("orxonox/SingleplayerBackButton"),
             ["callback"]  = P.SingleplayerBackButton_clicked
     })
-    P:setButton(1, 4,{
+
+    P:setButton(2, 2,{
             ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
             ["callback"] = P.CampaignButton_clicked
     })

Modified: code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc
===================================================================
--- code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc	2015-02-03 22:38:07 UTC (rev 10253)
+++ code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc	2015-02-03 22:43:42 UTC (rev 10254)
@@ -28,14 +28,11 @@
 
 #include "Mission.h"
 
-#include <boost/filesystem.hpp>
-
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
 
 #include "core/CoreIncludes.h"
 #include "core/command/ConsoleCommand.h"
-#include "core/config/ConfigValueIncludes.h"
 #include "infos/PlayerInfo.h"
 #include "network/Host.h"
 #include "worldentities/pawns/Pawn.h"
@@ -81,27 +78,22 @@
 
     void Mission::start()
     {
-        std::fstream myfile;
-
         Gametype::start();
         this->setTeams();
-        //just for testing
-        //this->missionAccomplished_=true;
         this->gtinfo_->sendAnnounceMessage("Your mission has started!");
     }
 
     void Mission::end()
     {
-
         if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
         {
             this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
 
             LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
         }
-
         else if (!this->gtinfo_->hasEnded())
             this->gtinfo_->sendAnnounceMessage("Mission failed!");
+
         Gametype::end();
     }
 
@@ -121,7 +113,6 @@
         { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
             it->setMissionAccomplished(accomplished);
             it->end();
-
         }
     }
 
@@ -132,5 +123,4 @@
             it->setLives(amount);
         }
     }
-
 }