*** empty log message ***

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
+

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

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')