From f859cf502db836d14f092078ba1d620f15d37982 Mon Sep 17 00:00:00 2001 From: Abhishek Nath Date: Tue, 22 Dec 2009 03:10:40 +0000 Subject: [PATCH] Send a message when music has been enabled so that the game can appropriately choose what music to play --- direct/src/showbase/ShowBase.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 976f69c491..be2e4d1bea 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -1495,6 +1495,9 @@ class ShowBase(DirectObject.DirectObject): self.musicManager.setActive(bEnableMusic) self.musicActive = bEnableMusic if bEnableMusic: + # This is useful when we want to play different music + # from what the manager has queued + messenger.send("MusicEnabled") self.notify.debug("Enabling music") else: self.notify.debug("Disabling music") @@ -1597,7 +1600,7 @@ class ShowBase(DirectObject.DirectObject): # run the collision traversal if we have a # CollisionTraverser set. if self.shadowTrav: - self.shadowTrav.traverse(self.render) + self.shadowTrav.traverse(self.render) return Task.cont def __collisionLoop(self, state): @@ -1608,7 +1611,7 @@ class ShowBase(DirectObject.DirectObject): if self.appTrav: self.appTrav.traverse(self.render) if self.shadowTrav: - self.shadowTrav.traverse(self.render) + self.shadowTrav.traverse(self.render) messenger.send("collisionLoopFinished") return Task.cont