sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toonbase: get rid of the MIDI reset track

Browse source
This commit is contained in:
John Cote 2020-01-14 14:35:19 -05:00
parent 259c505a1b
commit 8d08f01955
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
toontown/parties/DistributedPartyJukeboxActivityBase.py
View file

@ -169,7 +169,6 @@ class DistributedPartyJukeboxActivityBase(DistributedPartyActivity):
if self.music: if self.music:
if self.__checkPartyValidity() and hasattr(base.cr.playGame.getPlace().loader, 'music') and base.cr.playGame.getPlace().loader.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.cr.playGame.getPlace().loader.music.stop()
base.resetMusic.play()
self.music.setTime(0.0) self.music.setTime(0.0)
self.music.setLoopCount(getMusicRepeatTimes(length)) self.music.setLoopCount(getMusicRepeatTimes(length))
self.music.play() self.music.play()

2
toontown/toonbase/ToonBase.py
View file

@ -147,7 +147,6 @@ class ToonBase(OTPBase.OTPBase):
self.canScreenShot = 1 self.canScreenShot = 1
self.glitchCount = 0 self.glitchCount = 0
self.walking = 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.oldX = max(1, base.win.getXSize())
self.oldY = max(1, base.win.getYSize()) self.oldY = max(1, base.win.getYSize())
self.aspectRatio = float(self.oldX) / self.oldY 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)) 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): 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) OTPBase.OTPBase.playMusic(self, music, looping, interrupt, volume, time)
def isMainWindowOpen(self): def isMainWindowOpen(self):