From 40e3822c8efdead02a5793dd3a46b8cf711338ff Mon Sep 17 00:00:00 2001
From: gregw <>
Date: Wed, 17 Jan 2001 21:01:14 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/actor/Actor.py                 | 23 ++++++++++-------------
 direct/src/showbase/AudioManagerGlobal.py |  4 ----
 2 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 direct/src/showbase/AudioManagerGlobal.py

diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index 3b30056921..acd3410b40 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -519,23 +519,20 @@ class Actor(PandaObject, NodePath):
         else:
             Actor.notify.warning("no part named %s!" % (partName))
             
-    def instance(self, partName, anotherPart, jointName, lodName="lodRoot"):
-        """instance(self, string, string, string, key="lodRoot")
-        Instance one actor part to another at a joint called jointName"""
+    def instance(self, path, part, jointName, lodName="lodRoot"):
+        """instance(self, NodePath, string, string, key="lodRoot")
+        Instance a nodePath to an actor part at a joint called jointName"""
         if (self.__partBundleDict.has_key(lodName)):
             partBundleDict = self.__partBundleDict[lodName]
-            if (partBundleDict.has_key(partName)):
-                if (partBundleDict.has_key(anotherPart)):
-                    joint = NodePath(partBundleDict[anotherPart],
-                                     "**/" + jointName)
-                    if (joint.isEmpty()):
-                        Actor.notify.warning("%s not found!" % (jointName))
-                    else:
-                        return partBundleDict[partName].instanceTo(joint)
+            if (partBundleDict.has_key(part)):
+                joint = NodePath(partBundleDict[part],
+                                 "**/" + jointName)
+                if (joint.isEmpty()):
+                    Actor.notify.warning("%s not found!" % (jointName))
                 else:
-                    Actor.notify.warning("no part named %s!" % (anotherPart))
+                    return path.instanceTo(joint)
             else:
-                Actor.notify.warning("no part named %s!" % (partName))
+                Actor.notify.warning("no part named %s!" % (part))
         else:
             Actor.notify.warning("no lod named %s!" % (lodName))
 
diff --git a/direct/src/showbase/AudioManagerGlobal.py b/direct/src/showbase/AudioManagerGlobal.py
deleted file mode 100644
index 817e5512f3..0000000000
--- a/direct/src/showbase/AudioManagerGlobal.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""AudioManagerGlobal module: contains the global audio manager"""
-import AudioManager
-
-audioMgr = AudioManager.AudioManager()