From b10466678e0a421261c0ddd0ef32d97ffd1416e2 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sat, 23 Nov 2019 17:51:14 -0500 Subject: [PATCH] general: NodePath.remove() -> NodePath.removeNode() remove() is deprecated --- toontown/catalog/CatalogItemPanel.py | 2 +- toontown/coghq/DistributedCountryClub.py | 2 +- toontown/coghq/DistributedGolfGreenGame.py | 4 ++-- toontown/coghq/GameSprite3D.py | 2 +- toontown/coghq/MoleHill.py | 2 +- toontown/golf/DistributedGolfHole.py | 4 ++-- toontown/golf/PhysicsWorldBase.py | 8 ++++---- toontown/minigame/DistributedTargetGame.py | 2 +- toontown/minigame/FogOverlay.py | 2 +- toontown/minigame/MinigamePhysicsWorldBase.py | 8 ++++---- toontown/minigame/PairingGameCard.py | 2 +- toontown/minigame/RubberBand.py | 2 +- toontown/racing/DistributedGag.py | 6 +++--- toontown/racing/DistributedRace.py | 4 ++-- toontown/racing/DistributedVehicle.py | 4 ++-- toontown/safezone/OZSafeZoneLoader.py | 6 +++--- toontown/toon/ToonHead.py | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/toontown/catalog/CatalogItemPanel.py b/toontown/catalog/CatalogItemPanel.py index 183dfe9..67f1596 100644 --- a/toontown/catalog/CatalogItemPanel.py +++ b/toontown/catalog/CatalogItemPanel.py @@ -266,7 +266,7 @@ class CatalogItemPanel(DirectFrame): self.ival = None if len(self.items): self.items[0].cleanupPicture() - self.pictureFrame.remove() + self.pictureFrame.removeNode() self.pictureFrame = None self.items = [] if self.verify: diff --git a/toontown/coghq/DistributedCountryClub.py b/toontown/coghq/DistributedCountryClub.py index fa54747..1cb026b 100644 --- a/toontown/coghq/DistributedCountryClub.py +++ b/toontown/coghq/DistributedCountryClub.py @@ -59,7 +59,7 @@ class DistributedCountryClub(DistributedObject.DistributedObject): def stopSky(self): taskMgr.remove('skyTrack') - self.sky.remove() + self.sky.removeNode() def __setupHighSky(self): self.startSky() diff --git a/toontown/coghq/DistributedGolfGreenGame.py b/toontown/coghq/DistributedGolfGreenGame.py index a4ecbbc..9cb6e1e 100644 --- a/toontown/coghq/DistributedGolfGreenGame.py +++ b/toontown/coghq/DistributedGolfGreenGame.py @@ -382,7 +382,7 @@ class DistributedGolfGreenGame(BattleBlocker.BattleBlocker): for panelKey in self.toonPanels: self.toonPanels[panelKey].destroy() - self.headPanel.remove() + self.headPanel.removeNode() self.toonPanels = None self.soundFire = None self.soundLand = None @@ -538,7 +538,7 @@ class DistributedGolfGreenGame(BattleBlocker.BattleBlocker): base.localAvatar.startUpdateSmartCamera() def __removeGame(self): - self.spriteNode.remove() + self.spriteNode.removeNode() self.setupFlag = 0 def __leaveGame(self): diff --git a/toontown/coghq/GameSprite3D.py b/toontown/coghq/GameSprite3D.py index ac2eb0b..52c8847 100644 --- a/toontown/coghq/GameSprite3D.py +++ b/toontown/coghq/GameSprite3D.py @@ -95,7 +95,7 @@ class GameSprite: if not self.nodeObj or self.nodeObj.isEmpty(): self.nodeObj = None else: - self.nodeObj.remove() + self.nodeObj.removeNode() colorType = type self.multiColor = 0 self.breakable = 1 diff --git a/toontown/coghq/MoleHill.py b/toontown/coghq/MoleHill.py index 5e72230..4ea3393 100644 --- a/toontown/coghq/MoleHill.py +++ b/toontown/coghq/MoleHill.py @@ -64,7 +64,7 @@ class MoleHill(NodePath): if self.isUp and (self.hillType == MoleFieldBase.HILL_MOLE and type == MoleFieldBase.HILL_BOMB or self.hillType == MoleFieldBase.HILL_BOMB and type == MoleFieldBase.HILL_MOLE): return self.hillType = type - self.moleHead.remove() + self.moleHead.removeNode() if type == MoleFieldBase.HILL_MOLE: self.moleHead = loader.loadModel('phase_12/models/bossbotHQ/mole_norm') self.moleColNodePath.setScale(3.0) diff --git a/toontown/golf/DistributedGolfHole.py b/toontown/golf/DistributedGolfHole.py index eefea08..6ce1b14 100644 --- a/toontown/golf/DistributedGolfHole.py +++ b/toontown/golf/DistributedGolfHole.py @@ -564,8 +564,8 @@ class DistributedGolfHole(DistributedPhysicsWorld.DistributedPhysicsWorld, FSM, return self.ballShadowDict[self.currentGolfer] def cleanupGeom(self): - self.targets.remove() - self.terrainModel.remove() + self.targets.removeNode() + self.terrainModel.removeNode() self.powerBar.destroy() def cleanupPowerBar(self): diff --git a/toontown/golf/PhysicsWorldBase.py b/toontown/golf/PhysicsWorldBase.py index ec88aba..acea0da 100644 --- a/toontown/golf/PhysicsWorldBase.py +++ b/toontown/golf/PhysicsWorldBase.py @@ -67,7 +67,7 @@ class PhysicsWorldBase: self.commonObjectDict = None if self.canRender: for pair in self.odePandaRelationList: - pair[0].remove() + pair[0].removeNode() pair[1].destroy() self.odePandaRelationList = None @@ -87,10 +87,10 @@ class PhysicsWorldBase: ray.destroy() ray = None - self.placerNode.remove() - self.root.remove() + self.placerNode.removeNode() + self.root.removeNode() for marker in self.jointMarkers: - marker.remove() + marker.removeNode() self.jointMarkers = None for data in self.geomDataList: diff --git a/toontown/minigame/DistributedTargetGame.py b/toontown/minigame/DistributedTargetGame.py index 982970b..29e056b 100644 --- a/toontown/minigame/DistributedTargetGame.py +++ b/toontown/minigame/DistributedTargetGame.py @@ -544,7 +544,7 @@ class DistributedTargetGame(DistributedMinigame): self.removeChildGameFSM(self.gameFSM) del self.gameFSM if self.targets: - self.targets.remove() + self.targets.removeNode() del self.targets self.scoreboard.destroy() del self.scoreboard diff --git a/toontown/minigame/FogOverlay.py b/toontown/minigame/FogOverlay.py index 5a65044..a70e7b7 100644 --- a/toontown/minigame/FogOverlay.py +++ b/toontown/minigame/FogOverlay.py @@ -58,4 +58,4 @@ class FogOverlay: def delete(self): self.overlayGN.removeAllGeoms() - self.baseNode.remove() + self.baseNode.removeNode() diff --git a/toontown/minigame/MinigamePhysicsWorldBase.py b/toontown/minigame/MinigamePhysicsWorldBase.py index ccd41e7..863c6e6 100644 --- a/toontown/minigame/MinigamePhysicsWorldBase.py +++ b/toontown/minigame/MinigamePhysicsWorldBase.py @@ -48,7 +48,7 @@ class MinigamePhysicsWorldBase: self.commonObjectDict = None if self.canRender: for pair in self.odePandaRelationList: - pair[0].remove() + pair[0].removeNode() pair[1].destroy() self.odePandaRelationList = None @@ -68,10 +68,10 @@ class MinigamePhysicsWorldBase: ray.destroy() ray = None - self.placerNode.remove() - self.root.remove() + self.placerNode.removeNode() + self.root.removeNode() for marker in self.jointMarkers: - marker.remove() + marker.removeNode() self.jointMarkers = None for data in self.geomDataList: diff --git a/toontown/minigame/PairingGameCard.py b/toontown/minigame/PairingGameCard.py index c845963..5df8793 100644 --- a/toontown/minigame/PairingGameCard.py +++ b/toontown/minigame/PairingGameCard.py @@ -55,7 +55,7 @@ class PairingGameCard(PlayingCardNodePath): logo.setZ(0.025) logo.setX(-0.05) logo.setH(180) - cardModel.remove() + cardModel.removeNode() self.setR(0) self.setScale(2.5) self.flipIval = None diff --git a/toontown/minigame/RubberBand.py b/toontown/minigame/RubberBand.py index 7b6c63b..28f6d3a 100644 --- a/toontown/minigame/RubberBand.py +++ b/toontown/minigame/RubberBand.py @@ -60,7 +60,7 @@ class RubberBand: def delete(self): taskMgr.remove('recreateBand %s' % self.bandNumber) self.bandGN.removeAllGeoms() - self.baseNode.remove() + self.baseNode.removeNode() def redraw(self, task): color = {} diff --git a/toontown/racing/DistributedGag.py b/toontown/racing/DistributedGag.py index 1a5faff..4d284a2 100644 --- a/toontown/racing/DistributedGag.py +++ b/toontown/racing/DistributedGag.py @@ -34,7 +34,7 @@ class DistributedGag(DistributedObject.DistributedObject): self.name = self.uniqueName('pie') self.nodePath.reparentTo(self.race.geom) if self.ownerId == localAvatar.doId: - base.race.thrownGags[0].remove() + base.race.thrownGags[0].removeNode() base.race.thrownGags = base.race.thrownGags[1:] self.nodePath.setPos(self.pos[0], self.pos[1], self.pos[2]) else: @@ -63,7 +63,7 @@ class DistributedGag(DistributedObject.DistributedObject): base.race.localKart.hitPie() self.nodePath.hide() if hasattr(self, 'bnp'): - self.bnp.remove() + self.bnp.removeNode() def hitSomebody(self, avId, timeStamp): if localAvatar.doId != avId: @@ -71,7 +71,7 @@ class DistributedGag(DistributedObject.DistributedObject): if kart: self.nodePath.hide() if hasattr(self, 'bnp'): - self.bnp.remove() + self.bnp.removeNode() kart.playSpin(timeStamp) def setActivateTime(self, actTime): diff --git a/toontown/racing/DistributedRace.py b/toontown/racing/DistributedRace.py index b1bb2a9..29801c3 100644 --- a/toontown/racing/DistributedRace.py +++ b/toontown/racing/DistributedRace.py @@ -471,7 +471,7 @@ class DistributedRace(DistributedObject.DistributedObject): self.waitingLabel.setScale(TTLocalizer.DRenterWaiting) def exitWaiting(self): - self.waitingLabel.remove() + self.waitingLabel.removeNode() def enterStart(self): waitTime = self.baseTime - globalClock.getFrameTime() @@ -684,7 +684,7 @@ class DistributedRace(DistributedObject.DistributedObject): return Task.cont def endGoSign(self, t): - self.clock.remove() + self.clock.removeNode() def countdown(self, duration): countdownTask = Task(self.timerTask) diff --git a/toontown/racing/DistributedVehicle.py b/toontown/racing/DistributedVehicle.py index 0c05ea7..0abd40d 100644 --- a/toontown/racing/DistributedVehicle.py +++ b/toontown/racing/DistributedVehicle.py @@ -390,7 +390,7 @@ class DistributedVehicle(DistributedSmoothNode.DistributedSmoothNode, Kart.Kart, for x in self.drifts: x.destroy() - self.smokeMount.remove() + self.smokeMount.removeNode() del self.driftSeq del self.driftParticleForces del self.drifts @@ -445,7 +445,7 @@ class DistributedVehicle(DistributedSmoothNode.DistributedSmoothNode, Kart.Kart, for x in self.sparks: x.destroy() - self.sparkMount.remove() + self.sparkMount.removeNode() del self.sparks del self.sparkMount diff --git a/toontown/safezone/OZSafeZoneLoader.py b/toontown/safezone/OZSafeZoneLoader.py index 976a9e5..a92ce51 100644 --- a/toontown/safezone/OZSafeZoneLoader.py +++ b/toontown/safezone/OZSafeZoneLoader.py @@ -278,14 +278,14 @@ class OZSafeZoneLoader(SafeZoneLoader): del self.birdSound SafeZoneLoader.unload(self) self.done = 1 - self.collBase.remove() + self.collBase.removeNode() if self.geyserTrack: self.geyserTrack.finish() self.geyserTrack = None self.geyserActor.cleanup() - self.geyserModel.remove() + self.geyserModel.removeNode() self.waterfallActor.cleanup() - self.waterfallModel.remove() + self.waterfallModel.removeNode() self.bubbles.destroy() del self.bubbles self.geyserPoolSoundInterval.finish() diff --git a/toontown/toon/ToonHead.py b/toontown/toon/ToonHead.py index 569080d..611683b 100644 --- a/toontown/toon/ToonHead.py +++ b/toontown/toon/ToonHead.py @@ -429,7 +429,7 @@ class ToonHead(Actor.Actor): else: p.reparentTo(self.find('**/__Actor_head')) self.pumpkins.addPath(p) - pmodel.remove() + pmodel.removeNode() return True else: del self.pumpkins