From 4306ac5cab474097c5dd77c10bb1f5b37a71c976 Mon Sep 17 00:00:00 2001
From: Cary Sandvig <frang@users.sourceforge.net>
Date: Thu, 19 Apr 2001 22:59:26 +0000
Subject: [PATCH] start one deeper

---
 direct/src/ffi/FFIOverload.py |  2 +-
 direct/src/gui/GuiGlobals.py  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/direct/src/ffi/FFIOverload.py b/direct/src/ffi/FFIOverload.py
index 7baacd5700..4c4c7add79 100644
--- a/direct/src/ffi/FFIOverload.py
+++ b/direct/src/ffi/FFIOverload.py
@@ -140,7 +140,7 @@ def getInheritanceLevel(type, checkNested = 1):
     #    if (len(type.parentTypes) == 0):
     #        return 0
     if type.isNested:
-        level = getInheritanceLevel(type.outerType, 0)
+        level = 1+getInheritanceLevel(type.outerType, 0)
     else:
         level = 0
     for parentType in type.parentTypes:
diff --git a/direct/src/gui/GuiGlobals.py b/direct/src/gui/GuiGlobals.py
index 1c01840bfa..5b67c145ac 100644
--- a/direct/src/gui/GuiGlobals.py
+++ b/direct/src/gui/GuiGlobals.py
@@ -33,3 +33,21 @@ def getDefaultDrawOrder():
 def setDefaultDrawOrder(newDrawOrder):
     global drawOrder
     drawOrder = newDrawOrder
+
+def getNewRolloverFunctor():
+    val = None
+    if base.wantSound:
+        roll = loader.loadSound("phase_3/audio/sfr/GUI_rollover.mp3")
+        val = AudioGuiFunctor(roll)
+    else:
+        val = AudioGuiFunctor()
+    return val
+
+def getNewClickFunctor():
+    val = None
+    if base.wantSound:
+        click = loader.loadSound("phase_3/audio/sfx/GUI_create_toon_fwd.mp3")
+        val = AudioGuiFunctor(click)
+    else:
+        val = AudioGuiFunctor()
+    return val