add support for builds of panda with libtoontown baked in

Author: drewc5131

otp/avatar/Avatar.py

@@ -1,8 +1,6 @@
 """Avatar Module: contains the avatar class"""
 
 from panda3d.core import *
-from libotp import Nametag, NametagGroup
-from libotp import CFSpeech, CFThought, CFTimeout, CFPageButton, CFNoQuitButton, CFQuitButton
 
 from direct.actor.Actor import Actor
 from direct.distributed import ClockDelta

otp/avatar/DistributedAvatar.py

@@ -8,8 +8,6 @@
 from direct.task import Task
 from direct.showbase import PythonUtil
 
-from libotp import Nametag
-
 import random
 
 from .Avatar import Avatar

otp/avatar/LocalAvatar.py

@@ -1,7 +1,6 @@
 """LocalAvatar module: contains the LocalAvatar class"""
 
 from panda3d.core import *
-from libotp import Nametag, WhisperPopup
 from direct.gui.DirectGui import *
 from direct.showbase.PythonUtil import *
 from direct.interval.IntervalGlobal import *

ttle.py

@@ -195,8 +195,13 @@ def __checkForFiles(self):
     def __importMainLibs(self):
         builtin_dict = builtins.__dict__
         builtin_dict.update(__import__('panda3d.core', fromlist = ['*']).__dict__)
-        builtin_dict.update(__import__('libotp', fromlist = ['*']).__dict__)
-        builtin_dict.update(__import__('libtoontown', fromlist = ['*']).__dict__)
+        try:
+            # detect if using a panda with libtoontown baked in
+            builtin_dict.update(__import__('panda3d.toontown', fromlist = ['*']).__dict__)
+        except:
+            # using open-source version
+            builtin_dict.update(__import__('libotp', fromlist = ['*']).__dict__)
+            builtin_dict.update(__import__('libtoontown', fromlist = ['*']).__dict__)
 
     def __createTk(self):
         tkroot = Tk()