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

battle: Fix battle sounds search path

Browse source
This commit is contained in:
John Cote 2021-07-06 15:34:43 -04:00
parent a7551ada6a
commit 20ee51972c
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
toontown/battle/BattleSounds.py
View file

@ -1,7 +1,5 @@
from pandac.PandaModules import * from pandac.PandaModules import *
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from direct.showbase import AppRunnerGlobal
import os
class BattleSounds: class BattleSounds:
notify = DirectNotifyGlobal.directNotify.newCategory('BattleSounds') notify = DirectNotifyGlobal.directNotify.newCategory('BattleSounds')
@ -19,20 +17,12 @@ class BattleSounds:
def setupSearchPath(self): def setupSearchPath(self):
self.sfxSearchPath = DSearchPath() self.sfxSearchPath = DSearchPath()
if AppRunnerGlobal.appRunner: if __debug__:
self.sfxSearchPath.appendDirectory(Filename.expandFrom('$TT_3_ROOT/phase_3/audio/sfx')) # In the dev environment, it will always be here:
self.sfxSearchPath.appendDirectory(Filename.expandFrom('$TT_3_5_ROOT/phase_3.5/audio/sfx')) self.sfxSearchPath.appendDirectory(Filename('resources/phase_3/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename.expandFrom('$TT_4_ROOT/phase_4/audio/sfx')) self.sfxSearchPath.appendDirectory(Filename('resources/phase_3.5/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename.expandFrom('$TT_5_ROOT/phase_5/audio/sfx')) self.sfxSearchPath.appendDirectory(Filename('resources/phase_4/audio/sfx'))
else: self.sfxSearchPath.appendDirectory(Filename('resources/phase_5/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename('phase_3/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename('phase_3.5/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename('phase_4/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename('phase_5/audio/sfx'))
self.sfxSearchPath.appendDirectory(Filename.fromOsSpecific(os.path.expandvars('$TTMODELS/built/phase_3/audio/sfx')))
self.sfxSearchPath.appendDirectory(Filename.fromOsSpecific(os.path.expandvars('$TTMODELS/built/phase_3.5/audio/sfx')))
self.sfxSearchPath.appendDirectory(Filename.fromOsSpecific(os.path.expandvars('$TTMODELS/built/phase_4/audio/sfx')))
self.sfxSearchPath.appendDirectory(Filename.fromOsSpecific(os.path.expandvars('$TTMODELS/built/phase_5/audio/sfx')))
def clear(self): def clear(self):
if self.isValid: if self.isValid: