sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: NodePath.remove() -> NodePath.removeNode()

Browse source 
remove() is deprecated
This commit is contained in:
John Cote 2019-11-23 17:51:14 -05:00
parent 10f827e2bd
commit b10466678e
17 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/catalog/CatalogItemPanel.py
View file

@ -266,7 +266,7 @@ class CatalogItemPanel(DirectFrame):
self.ival = None self.ival = None
if len(self.items): if len(self.items):
self.items[0].cleanupPicture() self.items[0].cleanupPicture()
self.pictureFrame.remove() self.pictureFrame.removeNode()
self.pictureFrame = None self.pictureFrame = None
self.items = [] self.items = []
if self.verify: if self.verify:

2
toontown/coghq/DistributedCountryClub.py
View file

@ -59,7 +59,7 @@ class DistributedCountryClub(DistributedObject.DistributedObject):
def stopSky(self): def stopSky(self):
taskMgr.remove('skyTrack') taskMgr.remove('skyTrack')
self.sky.remove() self.sky.removeNode()
def __setupHighSky(self): def __setupHighSky(self):
self.startSky() self.startSky()

4
toontown/coghq/DistributedGolfGreenGame.py
View file

@ -382,7 +382,7 @@ class DistributedGolfGreenGame(BattleBlocker.BattleBlocker):
for panelKey in self.toonPanels: for panelKey in self.toonPanels:
self.toonPanels[panelKey].destroy() self.toonPanels[panelKey].destroy()
self.headPanel.remove() self.headPanel.removeNode()
self.toonPanels = None self.toonPanels = None
self.soundFire = None self.soundFire = None
self.soundLand = None self.soundLand = None
@ -538,7 +538,7 @@ class DistributedGolfGreenGame(BattleBlocker.BattleBlocker):
base.localAvatar.startUpdateSmartCamera() base.localAvatar.startUpdateSmartCamera()
def __removeGame(self): def __removeGame(self):
self.spriteNode.remove() self.spriteNode.removeNode()
self.setupFlag = 0 self.setupFlag = 0
def __leaveGame(self): def __leaveGame(self):

2
toontown/coghq/GameSprite3D.py
View file

@ -95,7 +95,7 @@ class GameSprite:
if not self.nodeObj or self.nodeObj.isEmpty(): if not self.nodeObj or self.nodeObj.isEmpty():
self.nodeObj = None self.nodeObj = None
else: else:
self.nodeObj.remove() self.nodeObj.removeNode()
colorType = type colorType = type
self.multiColor = 0 self.multiColor = 0
self.breakable = 1 self.breakable = 1

2
toontown/coghq/MoleHill.py
View file

@ -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): 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 return
self.hillType = type self.hillType = type
self.moleHead.remove() self.moleHead.removeNode()
if type == MoleFieldBase.HILL_MOLE: if type == MoleFieldBase.HILL_MOLE:
self.moleHead = loader.loadModel('phase_12/models/bossbotHQ/mole_norm') self.moleHead = loader.loadModel('phase_12/models/bossbotHQ/mole_norm')
self.moleColNodePath.setScale(3.0) self.moleColNodePath.setScale(3.0)

4
toontown/golf/DistributedGolfHole.py
View file

@ -564,8 +564,8 @@ class DistributedGolfHole(DistributedPhysicsWorld.DistributedPhysicsWorld, FSM,
return self.ballShadowDict[self.currentGolfer] return self.ballShadowDict[self.currentGolfer]
def cleanupGeom(self): def cleanupGeom(self):
self.targets.remove() self.targets.removeNode()
self.terrainModel.remove() self.terrainModel.removeNode()
self.powerBar.destroy() self.powerBar.destroy()
def cleanupPowerBar(self): def cleanupPowerBar(self):

8
toontown/golf/PhysicsWorldBase.py
View file

@ -67,7 +67,7 @@ class PhysicsWorldBase:
self.commonObjectDict = None self.commonObjectDict = None
if self.canRender: if self.canRender:
for pair in self.odePandaRelationList: for pair in self.odePandaRelationList:
pair[0].remove() pair[0].removeNode()
pair[1].destroy() pair[1].destroy()
self.odePandaRelationList = None self.odePandaRelationList = None
@ -87,10 +87,10 @@ class PhysicsWorldBase:
ray.destroy() ray.destroy()
ray = None ray = None
self.placerNode.remove() self.placerNode.removeNode()
self.root.remove() self.root.removeNode()
for marker in self.jointMarkers: for marker in self.jointMarkers:
marker.remove() marker.removeNode()
self.jointMarkers = None self.jointMarkers = None
for data in self.geomDataList: for data in self.geomDataList:

2
toontown/minigame/DistributedTargetGame.py
View file

@ -544,7 +544,7 @@ class DistributedTargetGame(DistributedMinigame):
self.removeChildGameFSM(self.gameFSM) self.removeChildGameFSM(self.gameFSM)
del self.gameFSM del self.gameFSM
if self.targets: if self.targets:
self.targets.remove() self.targets.removeNode()
del self.targets del self.targets
self.scoreboard.destroy() self.scoreboard.destroy()
del self.scoreboard del self.scoreboard

2
toontown/minigame/FogOverlay.py
View file

@ -58,4 +58,4 @@ class FogOverlay:
def delete(self): def delete(self):
self.overlayGN.removeAllGeoms() self.overlayGN.removeAllGeoms()
self.baseNode.remove() self.baseNode.removeNode()

8
toontown/minigame/MinigamePhysicsWorldBase.py
View file

@ -48,7 +48,7 @@ class MinigamePhysicsWorldBase:
self.commonObjectDict = None self.commonObjectDict = None
if self.canRender: if self.canRender:
for pair in self.odePandaRelationList: for pair in self.odePandaRelationList:
pair[0].remove() pair[0].removeNode()
pair[1].destroy() pair[1].destroy()
self.odePandaRelationList = None self.odePandaRelationList = None
@ -68,10 +68,10 @@ class MinigamePhysicsWorldBase:
ray.destroy() ray.destroy()
ray = None ray = None
self.placerNode.remove() self.placerNode.removeNode()
self.root.remove() self.root.removeNode()
for marker in self.jointMarkers: for marker in self.jointMarkers:
marker.remove() marker.removeNode()
self.jointMarkers = None self.jointMarkers = None
for data in self.geomDataList: for data in self.geomDataList:

2
toontown/minigame/PairingGameCard.py
View file

@ -55,7 +55,7 @@ class PairingGameCard(PlayingCardNodePath):
logo.setZ(0.025) logo.setZ(0.025)
logo.setX(-0.05) logo.setX(-0.05)
logo.setH(180) logo.setH(180)
cardModel.remove() cardModel.removeNode()
self.setR(0) self.setR(0)
self.setScale(2.5) self.setScale(2.5)
self.flipIval = None self.flipIval = None

2
toontown/minigame/RubberBand.py
View file

@ -60,7 +60,7 @@ class RubberBand:
def delete(self): def delete(self):
taskMgr.remove('recreateBand %s' % self.bandNumber) taskMgr.remove('recreateBand %s' % self.bandNumber)
self.bandGN.removeAllGeoms() self.bandGN.removeAllGeoms()
self.baseNode.remove() self.baseNode.removeNode()
def redraw(self, task): def redraw(self, task):
color = {} color = {}

6
toontown/racing/DistributedGag.py
View file

@ -34,7 +34,7 @@ class DistributedGag(DistributedObject.DistributedObject):
self.name = self.uniqueName('pie') self.name = self.uniqueName('pie')
self.nodePath.reparentTo(self.race.geom) self.nodePath.reparentTo(self.race.geom)
if self.ownerId == localAvatar.doId: if self.ownerId == localAvatar.doId:
base.race.thrownGags[0].remove() base.race.thrownGags[0].removeNode()
base.race.thrownGags = base.race.thrownGags[1:] base.race.thrownGags = base.race.thrownGags[1:]
self.nodePath.setPos(self.pos[0], self.pos[1], self.pos[2]) self.nodePath.setPos(self.pos[0], self.pos[1], self.pos[2])
else: else:
@ -63,7 +63,7 @@ class DistributedGag(DistributedObject.DistributedObject):
base.race.localKart.hitPie() base.race.localKart.hitPie()
self.nodePath.hide() self.nodePath.hide()
if hasattr(self, 'bnp'): if hasattr(self, 'bnp'):
self.bnp.remove() self.bnp.removeNode()
def hitSomebody(self, avId, timeStamp): def hitSomebody(self, avId, timeStamp):
if localAvatar.doId != avId: if localAvatar.doId != avId:
@ -71,7 +71,7 @@ class DistributedGag(DistributedObject.DistributedObject):
if kart: if kart:
self.nodePath.hide() self.nodePath.hide()
if hasattr(self, 'bnp'): if hasattr(self, 'bnp'):
self.bnp.remove() self.bnp.removeNode()
kart.playSpin(timeStamp) kart.playSpin(timeStamp)
def setActivateTime(self, actTime): def setActivateTime(self, actTime):

4
toontown/racing/DistributedRace.py
View file

@ -471,7 +471,7 @@ class DistributedRace(DistributedObject.DistributedObject):
self.waitingLabel.setScale(TTLocalizer.DRenterWaiting) self.waitingLabel.setScale(TTLocalizer.DRenterWaiting)
def exitWaiting(self): def exitWaiting(self):
self.waitingLabel.remove() self.waitingLabel.removeNode()
def enterStart(self): def enterStart(self):
waitTime = self.baseTime - globalClock.getFrameTime() waitTime = self.baseTime - globalClock.getFrameTime()
@ -684,7 +684,7 @@ class DistributedRace(DistributedObject.DistributedObject):
return Task.cont return Task.cont
def endGoSign(self, t): def endGoSign(self, t):
self.clock.remove() self.clock.removeNode()
def countdown(self, duration): def countdown(self, duration):
countdownTask = Task(self.timerTask) countdownTask = Task(self.timerTask)

4
toontown/racing/DistributedVehicle.py
View file

@ -390,7 +390,7 @@ class DistributedVehicle(DistributedSmoothNode.DistributedSmoothNode, Kart.Kart,
for x in self.drifts: for x in self.drifts:
x.destroy() x.destroy()
self.smokeMount.remove() self.smokeMount.removeNode()
del self.driftSeq del self.driftSeq
del self.driftParticleForces del self.driftParticleForces
del self.drifts del self.drifts
@ -445,7 +445,7 @@ class DistributedVehicle(DistributedSmoothNode.DistributedSmoothNode, Kart.Kart,
for x in self.sparks: for x in self.sparks:
x.destroy() x.destroy()
self.sparkMount.remove() self.sparkMount.removeNode()
del self.sparks del self.sparks
del self.sparkMount del self.sparkMount

6
toontown/safezone/OZSafeZoneLoader.py
View file

@ -278,14 +278,14 @@ class OZSafeZoneLoader(SafeZoneLoader):
del self.birdSound del self.birdSound
SafeZoneLoader.unload(self) SafeZoneLoader.unload(self)
self.done = 1 self.done = 1
self.collBase.remove() self.collBase.removeNode()
if self.geyserTrack: if self.geyserTrack:
self.geyserTrack.finish() self.geyserTrack.finish()
self.geyserTrack = None self.geyserTrack = None
self.geyserActor.cleanup() self.geyserActor.cleanup()
self.geyserModel.remove() self.geyserModel.removeNode()
self.waterfallActor.cleanup() self.waterfallActor.cleanup()
self.waterfallModel.remove() self.waterfallModel.removeNode()
self.bubbles.destroy() self.bubbles.destroy()
del self.bubbles del self.bubbles
self.geyserPoolSoundInterval.finish() self.geyserPoolSoundInterval.finish()

2
toontown/toon/ToonHead.py
View file

@ -429,7 +429,7 @@ class ToonHead(Actor.Actor):
else: else:
p.reparentTo(self.find('**/__Actor_head')) p.reparentTo(self.find('**/__Actor_head'))
self.pumpkins.addPath(p) self.pumpkins.addPath(p)
pmodel.remove() pmodel.removeNode()
return True return True
else: else:
del self.pumpkins del self.pumpkins