RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed title task bug

This commit is contained in:
Joe Shochet 2003-12-13 00:56:28 +00:00
parent a25ddf02b4
commit cbecb2d3ea
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
direct/src/level/DistributedLevel.py
View File

@ -299,10 +299,10 @@ class DistributedLevel(DistributedObject.DistributedObject,
self.shutdownVisibility()
self.destroyLevel()
DistributedObject.DistributedObject.disable(self)
self.ignoreAll()
# NOTE: this should be moved to FactoryInterior
taskMgr.remove(self.uniqueName("titleText"))
if self.smallTitleText:
self.smallTitleText.cleanup()
self.smallTitleText = None
@ -311,6 +311,8 @@ class DistributedLevel(DistributedObject.DistributedObject,
self.titleText = None
self.zonesEnteredList = []
DistributedObject.DistributedObject.disable(self)
def delete(self):
DistributedLevel.notify.debug('delete')
DistributedObject.DistributedObject.delete(self)
@ -662,7 +664,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
description = getDescription(self.lastCamZone)
if description and description != '':
taskMgr.remove("titleText")
taskMgr.remove(self.uniqueName("titleText"))
self.smallTitleText.setText(description)
self.titleText.setText(description)
self.titleText.setColor(Vec4(*self.titleColor))
@ -690,13 +692,12 @@ class DistributedLevel(DistributedObject.DistributedObject,
0.5),
)
smallTitleSeq = Task.sequence(Task.Task(self.hideTitleTextTask),
Task.Task(self.showSmallTitleTask),
Task.Task(self.showSmallTitleTask))
if titleSeq:
seq = Task.sequence(titleSeq, smallTitleSeq)
else:
seq = smallTitleSeq
taskMgr.add(seq, "titleText")
taskMgr.add(seq, self.uniqueName("titleText"))
def showTitleTextTask(self, task):
assert(DistributedLevel.notify.debug("hideTitleTextTask()"))
@ -711,14 +712,16 @@ class DistributedLevel(DistributedObject.DistributedObject,
def showSmallTitleTask(self, task):
# make sure large title is hidden
self.titleText.hide()
if self.titleText:
self.titleText.hide()
# show the small title
self.smallTitleText.show()
return Task.done
def hideSmallTitleTextTask(self, task):
assert(DistributedLevel.notify.debug("hideTitleTextTask()"))
self.smallTitleText.hide()
if self.smallTitleText:
self.smallTitleText.hide()
return Task.done
# Ouch!