From 8d08f0195532c286b1053356d3580d7286bec9c1 Mon Sep 17 00:00:00 2001 From: John Cote Date: Tue, 14 Jan 2020 14:35:19 -0500 Subject: [PATCH] toonbase: get rid of the MIDI reset track --- toontown/parties/DistributedPartyJukeboxActivityBase.py | 1 - toontown/toonbase/ToonBase.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/toontown/parties/DistributedPartyJukeboxActivityBase.py b/toontown/parties/DistributedPartyJukeboxActivityBase.py index aa82ef0..d5d4fbf 100644 --- a/toontown/parties/DistributedPartyJukeboxActivityBase.py +++ b/toontown/parties/DistributedPartyJukeboxActivityBase.py @@ -169,7 +169,6 @@ class DistributedPartyJukeboxActivityBase(DistributedPartyActivity): if self.music: if self.__checkPartyValidity() and hasattr(base.cr.playGame.getPlace().loader, 'music') and base.cr.playGame.getPlace().loader.music: base.cr.playGame.getPlace().loader.music.stop() - base.resetMusic.play() self.music.setTime(0.0) self.music.setLoopCount(getMusicRepeatTimes(length)) self.music.play() diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py index 74a27e5..6075dc3 100644 --- a/toontown/toonbase/ToonBase.py +++ b/toontown/toonbase/ToonBase.py @@ -147,7 +147,6 @@ class ToonBase(OTPBase.OTPBase): self.canScreenShot = 1 self.glitchCount = 0 self.walking = 0 - self.resetMusic = self.loader.loadMusic('phase_3/audio/bgm/MIDI_Events_16channels.ogg') self.oldX = max(1, base.win.getXSize()) self.oldY = max(1, base.win.getYSize()) self.aspectRatio = float(self.oldX) / self.oldY @@ -398,7 +397,6 @@ class ToonBase(OTPBase.OTPBase): return (config.GetInt('shard-low-pop', ToontownGlobals.LOW_POP), config.GetInt('shard-mid-pop', ToontownGlobals.MID_POP), config.GetInt('shard-high-pop', ToontownGlobals.HIGH_POP)) def playMusic(self, music, looping = 0, interrupt = 1, volume = None, time = 0.0): - OTPBase.OTPBase.playMusic(self, self.resetMusic) OTPBase.OTPBase.playMusic(self, music, looping, interrupt, volume, time) def isMainWindowOpen(self):