[Orxonox-commit 2395] r7110 - code/branches/presentation3/src/modules/pickup

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-06-03 09:36:41 +0200 (Thu, 03 Jun 2010)
New Revision: 7110

Modified:
   code/branches/presentation3/src/modules/pickup/PickupManager.cc
Log:
made pickupmanager network-friendly ;)


Modified: code/branches/presentation3/src/modules/pickup/PickupManager.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupManager.cc	2010-06-03 07:34:13 UTC (rev 7109)
+++ code/branches/presentation3/src/modules/pickup/PickupManager.cc	2010-06-03 07:36:41 UTC (rev 7110)
@@ -51,7 +51,7 @@
     // Register tolua_open function when loading the library
     DeclareToluaInterface(Pickup);
     
-    ManageScopedSingleton(PickupManager, ScopeID::Graphics, false);
+    ManageScopedSingleton(PickupManager, ScopeID::Root, false);
     
     /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
     
@@ -63,7 +63,10 @@
     {
         RegisterRootObject(PickupManager);
 
-        GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
+        if( GameMode::showsGraphics() )
+        {
+            GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
+        }
         this->defaultRepresentation_ = new PickupRepresentation();
         
         COUT(3) << "PickupManager created." << std::endl;