zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nametag: Fix Boss font, clean up Party Planner nametag

Browse source
This commit is contained in:
Joey Z 2014-08-16 12:53:02 -04:00
parent 75898aee55
commit 7efc31e908
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/parties/PartyPlanner.py
View file

@ -21,7 +21,6 @@ from toontown.parties.InviteVisual import InviteVisual
from toontown.parties.PartyInfo import PartyInfo from toontown.parties.PartyInfo import PartyInfo
from toontown.parties import PartyUtils from toontown.parties import PartyUtils
from toontown.parties.PartyEditor import PartyEditor from toontown.parties.PartyEditor import PartyEditor
from otp.otpbase import OTPGlobals
from pandac.PandaModules import * from pandac.PandaModules import *
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from otp.nametag.NametagGroup import NametagGroup from otp.nametag.NametagGroup import NametagGroup
@ -278,7 +277,8 @@ class PartyPlanner(DirectFrame, FSM):
def __createNametag(self, parent): def __createNametag(self, parent):
if self.nametagGroup == None: if self.nametagGroup == None:
self.nametagGroup = NametagGroup() self.nametagGroup = NametagGroup()
self.nametagGroup.setFont(OTPGlobals.getInterfaceFont()) self.nametagGroup.setFont(ToontownGlobals.getToonFont())
self.nametagGroup.setSpeechFont(ToontownGlobals.getToonFont())
self.nametagGroup.setActive(0) self.nametagGroup.setActive(0)
self.nametagGroup.setAvatar(self.partyPlannerHead) self.nametagGroup.setAvatar(self.partyPlannerHead)
self.nametagGroup.manage(base.marginManager) self.nametagGroup.manage(base.marginManager)

1
toontown/suit/BossCog.py
View file

@ -31,6 +31,7 @@ class BossCog(Avatar.Avatar):
def __init__(self): def __init__(self):
Avatar.Avatar.__init__(self) Avatar.Avatar.__init__(self)
self.setFont(ToontownGlobals.getSuitFont()) self.setFont(ToontownGlobals.getSuitFont())
self.setSpeechFont(ToontownGlobals.getSuitFont())
self.setPlayerType(NametagGroup.CCSuit) self.setPlayerType(NametagGroup.CCSuit)
self.setPickable(0) self.setPickable(0)
self.doorA = None self.doorA = None