diff --git a/toontown/suit/Suit.py b/toontown/suit/Suit.py index df88037..2062895 100644 --- a/toontown/suit/Suit.py +++ b/toontown/suit/Suit.py @@ -170,7 +170,7 @@ HeadModelDict = {'a': ('/models/char/suitA-', 4), 'c': ('/models/char/suitC-', 3.5)} def loadTutorialSuit(): - loader.loadModelNode('phase_3.5/models/char/suitC-mod') + loader.loadModel('phase_3.5/models/char/suitC-mod').node() loadDialog(1) @@ -195,10 +195,10 @@ def loadSuitModelsAndAnims(level, flag = 0): if base.config.GetBool('want-new-cogs', 0): filepath = 'phase_3.5' + model + 'zero' if cogExists(model + 'zero.bam'): - loader.loadModelNode(filepath) + loader.loadModel(filepath).node() else: - loader.loadModelNode('phase_3.5' + model + 'mod') - loader.loadModelNode('phase_' + str(headPhase) + headModel + 'heads') + loader.loadModel('phase_3.5' + model + 'mod').node() + loader.loadModel('phase_' + str(headPhase) + headModel + 'heads').node() else: if base.config.GetBool('want-new-cogs', 0): filepath = 'phase_3.5' + model + 'zero' @@ -239,7 +239,7 @@ def loadSuitAnims(suit, flag = 1): filePrefix = ModelDict[bodyType][0] animName = filePrefix + anim[1] if flag: - loader.loadModelNode(animName) + loader.loadModel(animName).node() else: loader.unloadModel(animName) diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index cabd2f2..e644a63 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -215,30 +215,30 @@ def loadModels(): for key in LegDict.keys(): fileRoot = LegDict[key] - model = loader.loadModelNode('phase_3' + fileRoot + '1000') + model = loader.loadModel('phase_3' + fileRoot + '1000').node() Preloaded.append(model) - model = loader.loadModelNode('phase_3' + fileRoot + '500') + model = loader.loadModel('phase_3' + fileRoot + '500').node() Preloaded.append(model) - model = loader.loadModelNode('phase_3' + fileRoot + '250') + model = loader.loadModel('phase_3' + fileRoot + '250').node() Preloaded.append(model) for key in TorsoDict.keys(): fileRoot = TorsoDict[key] - model = loader.loadModelNode('phase_3' + fileRoot + '1000') + model = loader.loadModel('phase_3' + fileRoot + '1000').node() Preloaded.append(model) if len(key) > 1: - model = loader.loadModelNode('phase_3' + fileRoot + '500') + model = loader.loadModel('phase_3' + fileRoot + '500').node() Preloaded.append(model) - model = loader.loadModelNode('phase_3' + fileRoot + '250') + model = loader.loadModel('phase_3' + fileRoot + '250').node() Preloaded.append(model) for key in HeadDict.keys(): fileRoot = HeadDict[key] - model = loader.loadModelNode('phase_3' + fileRoot + '1000') + model = loader.loadModel('phase_3' + fileRoot + '1000').node() Preloaded.append(model) - model = loader.loadModelNode('phase_3' + fileRoot + '500') + model = loader.loadModel('phase_3' + fileRoot + '500').node() Preloaded.append(model) - model = loader.loadModelNode('phase_3' + fileRoot + '250') + model = loader.loadModel('phase_3' + fileRoot + '250').node() Preloaded.append(model) diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py index 4d6074c..d2476d4 100644 --- a/toontown/toonbase/ToonBase.py +++ b/toontown/toonbase/ToonBase.py @@ -249,9 +249,9 @@ class ToonBase(OTPBase.OTPBase): def initNametagGlobals(self): arrow = loader.loadModel('phase_3/models/props/arrow') card = loader.loadModel('phase_3/models/props/panel') - speech3d = ChatBalloon(loader.loadModelNode('phase_3/models/props/chatbox')) - thought3d = ChatBalloon(loader.loadModelNode('phase_3/models/props/chatbox_thought_cutout')) - speech2d = ChatBalloon(loader.loadModelNode('phase_3/models/props/chatbox_noarrow')) + speech3d = ChatBalloon(loader.loadModel('phase_3/models/props/chatbox').node()) + thought3d = ChatBalloon(loader.loadModel('phase_3/models/props/chatbox_thought_cutout').node()) + speech2d = ChatBalloon(loader.loadModel('phase_3/models/props/chatbox_noarrow').node()) chatButtonGui = loader.loadModel('phase_3/models/gui/chat_button_gui') NametagGlobals.setCamera(self.cam) NametagGlobals.setArrowModel(arrow)