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

Timestamp:

Dec 12, 2016, 4:20:50 PM (9 years ago)

Author:

patricwi

Message:

finished version of HUD and PickupSystem. crash bug remaining

Location:

code/branches/HUD_HS16/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (2 diffs)
• 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
@@ -126 +127 @@
             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>