Changes to support new world order

direct/src/cluster/ClusterClient.py

@@ -20,7 +20,6 @@ class ClusterClient(DirectObject.DirectObject):
         if clusterDaemonClient == 'None':
             clusterDaemonClient = os.popen('uname -n').read()
             clusterDaemonClient = clusterDaemonClient.replace('\n', '')
-        print 'CLIENT', clusterDaemonClient
         # What daemon port are we using to communicate between client/servers
         clusterDaemonPort = base.config.GetInt(
             'cluster-daemon-port', CLUSTER_DAEMON_PORT)

direct/src/cluster/ClusterMsgs.py

@@ -36,7 +36,7 @@ SERVER_STARTUP_STRING = (
     '__builtin__.clusterSyncFlag = %d;' +
     '__builtin__.clusterDaemonClient = \'%s\';' +
     '__builtin__.clusterDaemonPort = %d;'
-    'from ShowBaseGlobal import *; run()"')
+    'from DirectStart import *; run()"')
 
 class ClusterMsgHandler:
     """ClusterMsgHandler: wrapper for PC clusters/multi-piping networking"""

direct/src/cluster/ClusterServer.py

@@ -148,6 +148,7 @@ class ClusterServer(DirectObject.DirectObject):
         if (type == CLUSTER_NONE):
             pass
         elif (type == CLUSTER_EXIT):
+            print 'GOT EXIT'
             import sys
             sys.exit()
         elif (type == CLUSTER_CAM_OFFSET):