Browse Source

Changed upondDeath assignments to call setUponDeath

Gyedo Jeon 17 years ago
parent
commit
cc76379b27

+ 1 - 1
direct/src/directdevices/DirectJoybox.py

@@ -214,7 +214,7 @@ class DirectJoybox(DirectObject):
         # Update display
         self.readout.setText(modeText)
         t = taskMgr.doMethodLater(3.0, hideText, self.name + '-showMode')
-        t.uponDeath = hideText
+        t.setUponDeath(hideText)
 
     def acceptUprightCameraEvent(self, button = L_UPPER):
         self.accept(self.getEventName(button),

+ 1 - 1
direct/src/extensions/NodePath-extensions.py

@@ -352,7 +352,7 @@
         lerpTask.functorFunc = functorFunc
         lerpTask.duration = duration
         lerpTask.blendType = LerpBlendHelpers.getBlend(blendType)
-        lerpTask.uponDeath = lerpUponDeath
+        lerpTask.setUponDeath(lerpUponDeath)
 
         if (taskName == None):
             # don't spawn a task, return one instead

+ 1 - 1
direct/src/extensions_native/NodePath_extensions.py

@@ -448,7 +448,7 @@ def __lerp(self, functorFunc, duration, blendType, taskName=None):
         lerpTask.functorFunc = functorFunc
         lerpTask.duration = duration
         lerpTask.blendType = LerpBlendHelpers.getBlend(blendType)
-        lerpTask.uponDeath = lerpUponDeath
+        lerpTask.setUponDeath(lerpUponDeath)
 
         if (taskName == None):
             # don't spawn a task, return one instead

+ 1 - 1
direct/src/leveleditor/LevelEditor.py

@@ -2499,7 +2499,7 @@ class LevelEditor(NodePath, DirectObject):
                 t.deltaPos = deltaPos
                 t.deltaHpr = deltaHpr
                 t.selectedNode = selectedNode
-                t.uponDeath = self.autoPositionCleanup
+                t.setUponDeath(self.autoPositionCleanup)
             else:
                 base.direct.grid.setPosHpr(selectedNode, deltaPos, deltaHpr)
 

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

@@ -2132,7 +2132,7 @@ class ShowBase(DirectObject.DirectObject):
         t.numFrames = int(duration * fps)
         t.source = source
         t.outputString = namePrefix + '_%0' + `sd` + 'd.' + format
-        t.uponDeath = lambda state: globalClock.setMode(ClockObject.MNormal)
+        t.setUponDeath(lambda state: globalClock.setMode(ClockObject.MNormal))
 
     def _movieTask(self, state):
         if state.frameIndex != 0: