Browse Source

global init

Dave Schuyler 20 years ago
parent
commit
a5be208188
2 changed files with 4 additions and 6 deletions
  1. 3 5
      direct/src/distributed/ConnectionRepository.py
  2. 1 1
      direct/src/showbase/ShowBase.py

+ 3 - 5
direct/src/distributed/ConnectionRepository.py

@@ -80,11 +80,9 @@ class ConnectionRepository(
             # Update the required fields
             distObj.generateInit()  # Only called when constructed
             distObj.generate()
-            ## if wantOtpServer:
-                ## # TODO: ROGER: where should we get parentId and zoneId?
-                ## parentId = None
-                ## zoneId = None
-                ## distObj.setLocation(parentId, zoneId)
+            distObj.announceGenerate()
+            distObj.parentId = 0
+            distObj.zoneId = 0
             # updateRequiredFields calls announceGenerate
             return  distObj
 

+ 1 - 1
direct/src/showbase/ShowBase.py

@@ -239,7 +239,7 @@ class ShowBase(DirectObject.DirectObject):
         __builtins__["pandaSystem"] = PandaSystem.getGlobalPtr()
         __builtins__["__dev__"] = base.config.GetBool('want-dev', 0)
         __builtins__["wantOtpServer"] = base.config.GetBool('want-otp-server', 0)
-        __builtins__["wantGlobalManagers"] = base.config.GetBool("want-global-managers", 0)
+        __builtins__["wantGlobalManagers"] = base.config.GetBool("want-global-managers", 1)
         if __debug__:
             __builtins__["deltaProfiler"] = DeltaProfiler.DeltaProfiler("ShowBase")
         __builtins__["onScreenDebug"] = OnScreenDebug.OnScreenDebug()