fix imports

[skip ci]
This commit is contained in:
Open Toontown 2023-03-26 20:50:24 -04:00
parent d01de89bed
commit e5124f7e77
3 changed files with 12 additions and 3 deletions

View File

@ -12,7 +12,12 @@ from direct.distributed.CRDataCache import CRDataCache
from direct.distributed.ConnectionRepository import ConnectionRepository
from direct.showbase.PythonUtil import safeRepr, itype, makeList
from direct.showbase.MessengerGlobal import messenger
from .MsgTypes import CLIENT_ENTER_OBJECT_REQUIRED_OTHER, MsgId2Names
from .MsgTypes import MsgId2Names
if ConfigVariableBool('astron-support', True):
from .MsgTypes import CLIENT_ENTER_OBJECT_REQUIRED_OTHER
else:
from .MsgTypes import CLIENT_CREATE_OBJECT_REQUIRED_OTHER
from . import CRCache
from . import ParentMgr
from . import RelatedObjectMgr

View File

@ -8,7 +8,10 @@ p.s. A great deal of this code is just code moved from ClientRepository.py.
"""
from panda3d.core import ConfigVariableBool
from .MsgTypes import CLIENT_ADD_INTEREST, CLIENT_ADD_INTEREST_MULTIPLE, CLIENT_REMOVE_INTEREST
from .MsgTypes import CLIENT_ADD_INTEREST, CLIENT_REMOVE_INTEREST
if ConfigVariableBool('astron-support', True):
from .MsgTypes import CLIENT_ADD_INTEREST_MULTIPLE
from direct.showbase import DirectObject
from direct.showbase.MessengerGlobal import messenger
from .PyDatagram import PyDatagram

View File

@ -27,7 +27,8 @@ from panda3d.direct import (
)
# Import the type numbers
from direct.distributed.MsgTypes import CONTROL_CHANNEL
if ConfigVariableBool('astron-support', True):
from direct.distributed.MsgTypes import CONTROL_CHANNEL
class PyDatagram(Datagram):