Changeset 7110 for code/branches/presentation3

Timestamp:

Jun 3, 2010, 9:36:41 AM (14 years ago)

Author:

scheusso

Message:

made pickupmanager network-friendly

File:

• code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) (2 diffs)

code/branches/presentation3/src/modules/pickup/PickupManager.cc

@@ -52 +52 @@
     DeclareToluaInterface(Pickup);
     
-    ManageScopedSingleton(PickupManager, ScopeID::Graphics, false);
+    ManageScopedSingleton(PickupManager, ScopeID::Root, false);
     
     /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
@@ -64 +64 @@
         RegisterRootObject(PickupManager);
 
-        GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
+        if( GameMode::showsGraphics() )
+        {
+            GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
+        }
         this->defaultRepresentation_ = new PickupRepresentation();