From 34c98d89106396c9c1d970f0a6fcba6c4513bd91 Mon Sep 17 00:00:00 2001
From: Samir Naik <samir.naik@gmail.com>
Date: Tue, 25 Nov 2003 03:19:54 +0000
Subject: [PATCH] spawn title text on camera entering zone, not toon

---
 direct/src/level/DistributedLevel.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/direct/src/level/DistributedLevel.py b/direct/src/level/DistributedLevel.py
index f77e9ef38f..5bba38ef45 100755
--- a/direct/src/level/DistributedLevel.py
+++ b/direct/src/level/DistributedLevel.py
@@ -31,6 +31,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
         DistributedObject.DistributedObject.__init__(self, cr)
         Level.Level.__init__(self)
         self.lastToonZone = 0
+        self.lastCamZone = 0
         self.titleColor = (1,1,1,1)
         self.titleText = OnscreenText.OnscreenText(
             "",
@@ -423,13 +424,16 @@ class DistributedLevel(DistributedObject.DistributedObject,
             self.lastToonZone = zoneNum
             print "toon is standing in zone %s" % zoneNum
             messenger.send("factoryZoneChanged", [zoneNum])
-            self.smallTitleText.hide()
-            self.spawnTitleText()
 
     def camEnterZone(self, zoneNum):
         DistributedLevel.notify.debug('camEnterZone%s' % zoneNum)
         self.enterZone(zoneNum)
 
+        if zoneNum != self.lastCamZone:
+            self.lastCamZone = zoneNum
+            self.smallTitleText.hide()
+            self.spawnTitleText()
+
     def enterZone(self, zoneNum):
         DistributedLevel.notify.debug("entering zone %s" % zoneNum)
 
@@ -541,7 +545,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
                     return ent.description
             return None
 
-        description = getDescription(self.lastToonZone)
+        description = getDescription(self.lastCamZone)
         if description and description != '':
             taskMgr.remove("titleText")
             self.smallTitleText.setText(description)
@@ -553,8 +557,8 @@ class DistributedLevel(DistributedObject.DistributedObject,
             # If we've already seen it, just show the small title
 
             titleSeq = None
-            if not self.lastToonZone in self.zonesEnteredList:
-                self.zonesEnteredList.append(self.lastToonZone)
+            if not self.lastCamZone in self.zonesEnteredList:
+                self.zonesEnteredList.append(self.lastCamZone)
                 titleSeq = Task.sequence(
                     Task.Task(self.hideSmallTitleTextTask),
                     Task.Task(self.showTitleTextTask),