diff --git a/toontown/building/DistributedToonHallInterior.py b/toontown/building/DistributedToonHallInterior.py index cfbee85..1fb9d16 100644 --- a/toontown/building/DistributedToonHallInterior.py +++ b/toontown/building/DistributedToonHallInterior.py @@ -1,3 +1,4 @@ +from panda3d.core import * from panda3d.toontown import * from toontown.toonbase.ToonBaseGlobal import * from direct.interval.IntervalGlobal import * diff --git a/toontown/minigame/DistributedPhotoGame.py b/toontown/minigame/DistributedPhotoGame.py index 35e1cc2..bcf6096 100644 --- a/toontown/minigame/DistributedPhotoGame.py +++ b/toontown/minigame/DistributedPhotoGame.py @@ -245,6 +245,11 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase): self.removeChildGameFSM(self.gameFSM) del self.gameFSM self.ignoreAll() + + for rayEntry in self.rayArray: + rayEntry[3].remove_node() + del self.rayArray + return def onstage(self): diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index 8cc88c1..75b616b 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -860,6 +860,9 @@ class Toon(Avatar.Avatar, ToonHead): self.resetHeight() self.setupToonNodes() self.generateBackpack() + hands = self.getRightHands() + for bookActor, hand in zip(self.__bookActors, hands): + bookActor.reparentTo(hand) def generateToonHead(self, copy = 1): headHeight = ToonHead.generateToonHead(self, copy, self.style, ('1000', '500', '250'))