Merge branch 'develop' into friends

This commit is contained in:
Little Cat 2023-01-12 21:40:17 -04:00
commit 8ebfc87aa7
2 changed files with 7 additions and 6 deletions

View File

@ -10,9 +10,9 @@ Secondly, you would have to install and use a specific version of Panda3D, which
You can install Panda3D SDK through the 32-bit (x86) or 64-bit (x86_64) installers here:
[Panda3D SDK for Windows (Python 3.9, x86)](https://drive.google.com/file/d/1sF4QLDl6h5ZRX-LMAftslDNpkJ-pF9SR/view?usp=sharing)
[Panda3D SDK for Windows (Python 3.9, x86, Last Updated: January 11, 2023)](https://mega.nz/file/6UsARa7R#pg5KgxW0NgkHEl_k0fK6NbBK8LfdEcDGZ6NsVeWwDKM)
[Panda3D SDK for Windows (Python 3.9, x86_64)](https://drive.google.com/file/d/1TEdJ6D3W9ZUf883dg1FWDDPCInepImiz/view?usp=sharing)
[Panda3D SDK for Windows (Python 3.9, x86_64, Last Updated: January 11, 2023)](https://mega.nz/file/uAMxEKqL#yQfS9UPpYHzKYDR5vq-LF5gxxLa6HUmxLUp65uzneVo)
If you install Panda3D outside the default directory (or use the x86 installer), you may have to change the `PPYTHON_PATH` file located in the root directory and change it to your install directory.

View File

@ -264,10 +264,11 @@ class QuietZoneState(StateData.StateData):
self.fsm.request('waitForSetZoneResponse')
def gotZoneRedirect(self, zoneId):
self.notify.info('Redirecting to zone %s.' % zoneId)
base.cr.handlerArgs['zoneId'] = zoneId
base.cr.handlerArgs['hoodId'] = ZoneUtil.getHoodId(zoneId)
self.fsm.request('waitForSetZoneResponse')
if hasattr(self, 'fsm'):
self.notify.info('Redirecting to zone %s.' % zoneId)
base.cr.handlerArgs['zoneId'] = zoneId
base.cr.handlerArgs['hoodId'] = ZoneUtil.getHoodId(zoneId)
self.fsm.request('waitForSetZoneResponse')
def exitWaitForZoneRedirect(self):
self.notify.debug('exitWaitForZoneRedirect()')