diff --git a/dependencies/libpandadna.pyd b/dependencies/libpandadna.pyd index c3caaf7b..8d7a37bf 100755 Binary files a/dependencies/libpandadna.pyd and b/dependencies/libpandadna.pyd differ diff --git a/resources b/resources index bfab25e2..c6be26a1 160000 --- a/resources +++ b/resources @@ -1 +1 @@ -Subproject commit bfab25e2257e238f86e6b44767ef65c91d2fbbe5 +Subproject commit c6be26a15f5ed8d103aac4bbe3dc74a795ae571f diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py index ba86dacf..25d5bfa4 100644 --- a/toontown/toonbase/ToontownStart.py +++ b/toontown/toonbase/ToontownStart.py @@ -71,6 +71,15 @@ from direct.directnotify.DirectNotifyGlobal import directNotify notify = directNotify.newCategory('ToontownStart') notify.setInfo(True) +# The VirtualFileSystem, which has already initialized, doesn't see the mount +# directives in the config(s) yet. We have to force it to load those manually: +from panda3d.core import VirtualFileSystem, ConfigVariableList, Filename +vfs = VirtualFileSystem.getGlobalPtr() +mounts = ConfigVariableList('vfs-mount') +for mount in mounts: + mountfile, mountpoint = (mount.split(' ', 2) + [None, None, None])[:2] + vfs.mount(Filename(mountfile), Filename(mountpoint), 0) + from otp.settings.Settings import Settings from otp.otpbase import OTPGlobals