From 6b2190a8d3d76f467017201f1b6bf9f21984e885 Mon Sep 17 00:00:00 2001
From: Joe Shochet <shochet@gmail.com>
Date: Wed, 23 Jan 2002 22:05:37 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/Package.pp               | 3 +--
 direct/src/ffi/genPyCode        | 6 ++++++
 direct/src/showbase/ShowBase.py | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/direct/Package.pp b/direct/Package.pp
index fbd9a7d4f9..f8838dd863 100644
--- a/direct/Package.pp
+++ b/direct/Package.pp
@@ -12,8 +12,6 @@
 // responsible for explicitly including all of the relevent Config.pp
 // files.
 
-
-
 // What is the name and version of this source tree?
 #if $[eq $[PACKAGE],]
   #define PACKAGE direct
@@ -57,3 +55,4 @@
 #endif
 
 #include $[PANDA_SOURCE]/Package.pp
+
diff --git a/direct/src/ffi/genPyCode b/direct/src/ffi/genPyCode
index 4a0c93e29e..35f13b7242 100755
--- a/direct/src/ffi/genPyCode
+++ b/direct/src/ffi/genPyCode
@@ -13,6 +13,12 @@ shift
 firstarg="$1"
 fi
 
+if [ "$firstarg" = "-b" ]; then
+extra_genPyCode_libs="libbartop"
+shift
+firstarg="$1"
+fi
+
 if [ "$firstarg" = "-v" ]; then
 extra_genPyCode_libs="libvrpn"
 shift
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index e3eb8b6a93..a88af8ed77 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -39,8 +39,8 @@ class ShowBase:
 
         # Store dconfig variables
         self.wantTk = self.config.GetBool('want-tk', 0)
-        self.sfxActive = self.config.GetBool('audio-sfx-active', Settings.getSfx())
-        self.musicActive = self.config.GetBool('audio-music-active', Settings.getMusic())
+        self.sfxActive = self.config.GetBool('audio-sfx-active', 1)
+        self.musicActive = self.config.GetBool('audio-music-active', 1)
         self.wantFog = self.config.GetBool('want-fog', 1)
 
         self.screenshotExtension = self.config.GetString('screenshot-extension', 'jpg')