From 6eaaed8056b13cc1364f4ab79eadf33db3eb19e3 Mon Sep 17 00:00:00 2001
From: Loudrob <loudhuddles131@yahoo.com>
Date: Fri, 26 Jun 2015 09:19:43 -0400
Subject: [PATCH] Another fix and Dan's nametag scaling.

---
 otp/nametag/Nametag3d.py             | 3 ++-
 toontown/chat/ToontownChatManager.py | 2 +-
 toontown/estate/House.py             | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/otp/nametag/Nametag3d.py b/otp/nametag/Nametag3d.py
index 63ad5bab..18e9834a 100644
--- a/otp/nametag/Nametag3d.py
+++ b/otp/nametag/Nametag3d.py
@@ -6,9 +6,10 @@ import math
 
 class Nametag3d(Nametag):
     WANT_DYNAMIC_SCALING = True
+    MAX_SCALE = 2.5
     SCALING_FACTOR = 0.055
     SCALING_MINDIST = 1
-    SCALING_MAXDIST = 50
+    SCALING_MAXDIST = math.pow(MAX_SCALE / SCALING_FACTOR, 2)
 
     BILLBOARD_OFFSET = 3.0
     SHOULD_BILLBOARD = True
diff --git a/toontown/chat/ToontownChatManager.py b/toontown/chat/ToontownChatManager.py
index 742740ef..4c4675c3 100755
--- a/toontown/chat/ToontownChatManager.py
+++ b/toontown/chat/ToontownChatManager.py
@@ -35,7 +35,7 @@ class ToontownChatManager(ChatManager.ChatManager):
         ChatManager.ChatManager.__init__(self, cr, localAvatar)
         self.chatInputSpeedChat = TTChatInputSpeedChat(self)
         self.normalPos = Vec3(0.25, 0, -0.196)
-        self.whisperPos = Vec3(0, 0, -0.296)
+        self.whisperPos = Vec3(0.25, 0, -0.28)
         self.speedChatPlusPos = Vec3(-0.35, 0, 0.71)
         self.SCWhisperPos = Vec3(0, 0, 0)
         self.chatInputWhiteList = TTChatInputWhiteList()
diff --git a/toontown/estate/House.py b/toontown/estate/House.py
index 885f310d..9c563998 100755
--- a/toontown/estate/House.py
+++ b/toontown/estate/House.py
@@ -77,7 +77,7 @@ class House(Place.Place):
         self.accept('doorDoneEvent', self.handleDoorDoneEvent)
         self.accept('DistributedDoor_doorTrigger', self.handleDoorTrigger)
         self._telemLimiter = TLGatherAllAvs('House', RotationLimitToH)
-        NametagGlobals.setWant2dNametags(True)
+        NametagGlobals.setMasterArrowsOn(1)
         self.fsm.request(requestStatus['how'], [requestStatus])
 
     def exit(self):
@@ -87,7 +87,7 @@ class House(Place.Place):
         self._telemLimiter.destroy()
         del self._telemLimiter
         messenger.send('exitHouse')
-        NametagGlobals.setWant2dNametags(False)
+        NametagGlobals.setMasterArrowsOn(0)
 
     def setState(self, state):
         if hasattr(self, 'fsm'):