From ee5365e11c093568466ceb0fc48b0322a632c6bf Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Fri, 27 Sep 2002 19:47:23 +0000
Subject: [PATCH] remove audiomgr valid check

---
 direct/src/showbase/ShowBase.py | 9 +++------
 direct/src/showbase/Sources.pp  | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index 2d9b7398dd..70712b6fa4 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -561,12 +561,10 @@ class ShowBase:
         self.notify.debug("Enabling audio")
 
     def loadSfx(self, name):
-        # showbase's sfxManager should always be at front of list
-        if(not self.sfxManagerIsValidList[0]):
-            # dont print a warning if mgr invalid, since they should already know
-            return None
+        # should return a valid sound obj even if soundMgr is invalid
         sound = None
         if (name):
+            # showbase-created sfxManager should always be at front of list
             sound=self.sfxManagerList[0].getSound(name)
         if sound == None:
             self.notify.warning("Could not load sound file %s." % name)
@@ -574,8 +572,7 @@ class ShowBase:
 
 
     def loadMusic(self, name):
-        if(not self.musicManagerIsValid):
-            return None
+        # should return a valid sound obj even if musicMgr is invalid
         sound = None
         if (name):
             sound=self.musicManager.getSound(name)
diff --git a/direct/src/showbase/Sources.pp b/direct/src/showbase/Sources.pp
index a822c64c33..4076ce2f8a 100644
--- a/direct/src/showbase/Sources.pp
+++ b/direct/src/showbase/Sources.pp
@@ -6,7 +6,7 @@
     linmath:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool
 
   #define SOURCES \
-    showBase.cxx showBase.h mersenne.cxx mersenne.h
+    showBase.cxx showBase.h mersenne.cxx mersenne.h projectionScreen.h projectionScreen.I projectionScreen.cxx
 
   #define IGATESCAN all
 #end lib_target