From a5be208188c5494d0c69f5fd7fcc594eebf9829b Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Wed, 13 Jul 2005 02:36:06 +0000 Subject: [PATCH] global init --- direct/src/distributed/ConnectionRepository.py | 8 +++----- direct/src/showbase/ShowBase.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py index 4aa749d25d..56c0fed5ef 100644 --- a/direct/src/distributed/ConnectionRepository.py +++ b/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 diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index cbfbbd0cfc..5bd04c1493 100644 --- a/direct/src/showbase/ShowBase.py +++ b/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()