[Orxonox-commit 2502] r7209 - code/trunk/src/modules/pickup

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-08-24 10:59:12 +0200 (Tue, 24 Aug 2010)
New Revision: 7209

Modified:
   code/trunk/src/modules/pickup/PickupManager.cc
Log:
Fixed little "bug", will have to be reviewed, when the pickup module is made network-ready.


Modified: code/trunk/src/modules/pickup/PickupManager.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupManager.cc	2010-08-24 07:49:54 UTC (rev 7208)
+++ code/trunk/src/modules/pickup/PickupManager.cc	2010-08-24 08:59:12 UTC (rev 7209)
@@ -52,7 +52,7 @@
     // Register tolua_open function when loading the library
     DeclareToluaInterface(Pickup);
 
-    ManageScopedSingleton(PickupManager, ScopeID::Root, false);
+    ManageScopedSingleton(PickupManager, ScopeID::Graphics, false);
 
     /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
 
@@ -64,11 +64,8 @@
     {
         RegisterRootObject(PickupManager);
 
-        //TODO: This doesn't work, yet.
-        if( GameMode::showsGraphics() )
-        {
-            GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
-        }
+        GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
+
         this->defaultRepresentation_ = new PickupRepresentation();
 
         COUT(3) << "PickupManager created." << std::endl;