INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00
Code Issues Releases Wiki Activity

HUD: fix character names not showing

Browse Source
This commit is contained in:
Jbleezy 2024-06-03 02:57:49 -07:00
parent d4aa6940b3
commit fd3ed2fd52
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui_mp/t6/zombie/hudcompetitivescoreboardzombie.lua
View File

@ -1,4 +1,5 @@
CoD.CompetitiveScoreboard = {} CoD.CompetitiveScoreboard = {}
CoD.CompetitiveScoreboard.PrevClientInstance = nil
CoD.CompetitiveScoreboard.RowWidth = 150 CoD.CompetitiveScoreboard.RowWidth = 150
CoD.CompetitiveScoreboard.RowHeight = 30 CoD.CompetitiveScoreboard.RowHeight = 30
CoD.CompetitiveScoreboard.FloatingLosePointsColor = { CoD.CompetitiveScoreboard.FloatingLosePointsColor = {
@ -352,6 +353,8 @@ CoD.CompetitiveScoreboard.UpdateVisibility = function(CompetitiveScoreboardWidge
CompetitiveScoreboardWidget.visible = nil CompetitiveScoreboardWidget.visible = nil
end end
CompetitiveScoreboardWidget:dispatchEventToChildren(ClientInstance) CompetitiveScoreboardWidget:dispatchEventToChildren(ClientInstance)
CoD.CompetitiveScoreboard.Update(CompetitiveScoreboardWidget, ClientInstance)
end end
CoD.CompetitiveScoreboard.UpdateTeamChange = function(CompetitiveScoreboardWidget, ClientInstance) CoD.CompetitiveScoreboard.UpdateTeamChange = function(CompetitiveScoreboardWidget, ClientInstance)
@ -421,6 +424,16 @@ CoD.CompetitiveScoreboard.UpdateItemDisplay = function(UnusedArg1, PlayerScoreLi
end end
CoD.CompetitiveScoreboard.Update = function(CompetitiveScoreboardWidget, ClientInstance) CoD.CompetitiveScoreboard.Update = function(CompetitiveScoreboardWidget, ClientInstance)
if ClientInstance.competitivescores == nil then
if CoD.CompetitiveScoreboard.PrevClientInstance == nil then
return
end
ClientInstance = CoD.CompetitiveScoreboard.PrevClientInstance
else
CoD.CompetitiveScoreboard.PrevClientInstance = ClientInstance
end
local ClientScoreIndex = 1 local ClientScoreIndex = 1
local PlayerScoreListWidget = nil local PlayerScoreListWidget = nil
if #ClientInstance.competitivescores <= #CompetitiveScoreboardWidget.Scores then if #ClientInstance.competitivescores <= #CompetitiveScoreboardWidget.Scores then
@ -446,8 +459,8 @@ CoD.CompetitiveScoreboard.Update = function(CompetitiveScoreboardWidget, ClientI
if ClientIndex == ClientInstance.selfindex then if ClientIndex == ClientInstance.selfindex then
CoD.CompetitiveScoreboard.CompetitiveScoreShowSelf(CompetitiveScoreboardWidget.Scores[ClientScoreIndex], ClientScoreIndex, 0) CoD.CompetitiveScoreboard.CompetitiveScoreShowSelf(CompetitiveScoreboardWidget.Scores[ClientScoreIndex], ClientScoreIndex, 0)
CompetitiveScoreboardWidget.Scores[ClientScoreIndex].scoreBg:setAlpha(1) CompetitiveScoreboardWidget.Scores[ClientScoreIndex].scoreBg:setAlpha(1)
if CoD.Zombie.IsCharacterNameDisplayMap() == true and CoD.CompetitiveScoreboard.ShouldUpdateCharacterName(CompetitiveScoreboardWidget, ClientInstance) then if CoD.Zombie.IsCharacterNameDisplayMap() == true then
CoD.CompetitiveScoreboard.UpdateCharacterName(CompetitiveScoreboardWidget, ClientInstance.modelName, CompetitiveScoreboardWidget.Scores[ClientScoreIndex], ClientIndex) CoD.CompetitiveScoreboard.UpdateCharacterName(CompetitiveScoreboardWidget, ClientInstance, CompetitiveScoreboardWidget.Scores[ClientScoreIndex], ClientIndex)
CoD.CompetitiveScoreboard.CompetitiveScoreTextShowPlayerColor(CompetitiveScoreboardWidget.Scores[ClientScoreIndex].characterName, ClientIndex, 0) CoD.CompetitiveScoreboard.CompetitiveScoreTextShowPlayerColor(CompetitiveScoreboardWidget.Scores[ClientScoreIndex].characterName, ClientIndex, 0)
end end
else else
@ -639,23 +652,17 @@ CoD.CompetitiveScoreboard.HasBit = function(ClientFieldValue, NavCardBit)
return NavCardBit <= ClientFieldValue % (NavCardBit + NavCardBit) return NavCardBit <= ClientFieldValue % (NavCardBit + NavCardBit)
end end
CoD.CompetitiveScoreboard.ShouldUpdateCharacterName = function(CompetitiveScoreboardWidget, ClientInstance) CoD.CompetitiveScoreboard.UpdateCharacterName = function(CompetitiveScoreboardWidget, ClientInstance, PlayerScoreListWidget, ClientIndex)
local LocalClientIndex = ClientInstance.controller local ClientInstanceModelName = ClientInstance.modelName
if UIExpression.IsVisibilityBitSet(LocalClientIndex, CoD.BIT_HUD_VISIBLE) == 0 then
return false
elseif UIExpression.IsVisibilityBitSet(LocalClientIndex, CoD.BIT_IS_PLAYER_IN_AFTERLIFE) == 1 then
return false
end
return true
end
CoD.CompetitiveScoreboard.UpdateCharacterName = function(CompetitiveScoreboardWidget, ClientInstanceModelName, PlayerScoreListWidget, ClientIndex)
if not ClientInstanceModelName and PlayerScoreListWidget.characterName then if not ClientInstanceModelName and PlayerScoreListWidget.characterName then
PlayerScoreListWidget.characterName:setText("") PlayerScoreListWidget.characterName:setText("")
return return
elseif UIExpression.IsVisibilityBitSet(ClientIndex, CoD.BIT_SPECTATING_CLIENT) == 1 then elseif UIExpression.IsVisibilityBitSet(ClientInstance.controller, CoD.BIT_SPECTATING_CLIENT) == 1 then
return
elseif UIExpression.IsVisibilityBitSet(ClientInstance.controller, CoD.BIT_HUD_VISIBLE) == 0 then
return
elseif UIExpression.IsVisibilityBitSet(ClientInstance.controller, CoD.BIT_IS_PLAYER_IN_AFTERLIFE) == 1 then
return return
elseif PlayerScoreListWidget.playerModelName ~= ClientInstanceModelName then elseif PlayerScoreListWidget.playerModelName ~= ClientInstanceModelName then
local CharacterNameIndex = 0 local CharacterNameIndex = 0