Update Resources, LibPandaDna (broken) and fix the missing resources on the client.

This commit is contained in:
Alexander 2015-08-08 10:12:50 -04:00
parent d93a8e5e60
commit 504c178acc
3 changed files with 10 additions and 1 deletions

Binary file not shown.

@ -1 +1 @@
Subproject commit bfab25e2257e238f86e6b44767ef65c91d2fbbe5
Subproject commit c6be26a15f5ed8d103aac4bbe3dc74a795ae571f

View file

@ -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