Browse Source

*** empty log message ***

Jesse Schell 24 years ago
parent
commit
12aeeab34e
2 changed files with 4 additions and 3 deletions
  1. 1 1
      direct/src/showbase/Finder.py
  2. 3 2
      direct/src/showbase/Messenger.py

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

@@ -139,7 +139,7 @@ def copyFuncs(fromClass, toClass):
 def replaceMessengerFunc(oldFunc, newFunc):
 def replaceMessengerFunc(oldFunc, newFunc):
     res = messenger.replaceMethod(oldFunc, newFunc)
     res = messenger.replaceMethod(oldFunc, newFunc)
     if res:
     if res:
-        print ('replaced messenger function: ' + newFunc.__name__)
+        print 'replaced %d messenger functions: %s' % (res, newFunc.__name__)
 
 
 def replaceTaskMgrFunc(oldFunc, newFunc):
 def replaceTaskMgrFunc(oldFunc, newFunc):
     res = taskMgr.replaceMethod(oldFunc, newFunc)
     res = taskMgr.replaceMethod(oldFunc, newFunc)

+ 3 - 2
direct/src/showbase/Messenger.py

@@ -149,6 +149,7 @@ class Messenger:
         you redefine functions with Control-c-Control-v
         you redefine functions with Control-c-Control-v
         """
         """
         import new
         import new
+        retFlag = 0
         for entry in self.dict.items():
         for entry in self.dict.items():
             event, objectDict = entry
             event, objectDict = entry
             for objectEntry in objectDict.items():
             for objectEntry in objectDict.items():
@@ -168,9 +169,9 @@ class Messenger:
                                                    method.im_class)
                                                    method.im_class)
                     params[0] = newMethod
                     params[0] = newMethod
                     # Found it retrun true
                     # Found it retrun true
-                    return 1
+                    retFlag += 1
         # didnt find that method, return false
         # didnt find that method, return false
-        return 0
+        return retFlag
     
     
     def toggleVerbose(self):
     def toggleVerbose(self):
         Messenger.notify.setDebug(1 - Messenger.notify.getDebug())
         Messenger.notify.setDebug(1 - Messenger.notify.getDebug())