Changeset 11502 for code/branches/HUD_HS16/src/orxonox/gamestates

Timestamp:

Oct 23, 2017, 3:14:56 PM (7 years ago)

Author:

patricwi

Message:

updated HUD by merging trunk into it

Location:

code/branches/HUD_HS16

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSLevel.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)

code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc

@@ -50 +50 @@
 #include "PlayerManager.h"
 #include "GSRoot.h"
-// #include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -127 +126 @@
             InputManager::getInstance().leaveState("game");
 
-        // HUDPickupSystem* pickupSystem;
-
-        // for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
-        //     pickupSystem = hud;
-
-        // pickupSystem->repaint=false;
-
         // disconnect all HumanPlayers
         PlayerManager::getInstance().disconnectAllClients();

code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-// #include "overlays/OverlaysPrereqs.h"
 
 #include <string>