diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index b2dcfaf1..3a24b22a 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -186,8 +186,9 @@ precache_strings() { precacheString(&"set_dvar_from_dvar"); precacheString(&"hud_update_health"); - precacheString(&"hud_update_zone_fade_out"); - precacheString(&"hud_update_zone_fade_in"); + precacheString(&"hud_update_zone_name"); + precacheString(&"hud_fade_out_zone_name"); + precacheString(&"hud_fade_in_zone_name"); precacheString(&"r_fog"); precacheString(&"r_fog_settings"); @@ -1044,14 +1045,15 @@ zone_name_hud() { if (vars["prev_zone_name"] != &"") { - self luinotifyevent(&"hud_update_zone_fade_out"); + self luinotifyevent(&"hud_fade_out_zone_name"); wait 0.25; } if (vars["zone_name"] != &"") { - self luinotifyevent(&"hud_update_zone_fade_in", 1, vars["zone_name"]); + self luinotifyevent(&"hud_update_zone_name", 1, vars["zone_name"]); + self luinotifyevent(&"hud_fade_in_zone_name"); wait 0.25; } diff --git a/ui_mp/t6/zombie/hudreimagined.lua b/ui_mp/t6/zombie/hudreimagined.lua index c1b87745..01d7bb3a 100644 --- a/ui_mp/t6/zombie/hudreimagined.lua +++ b/ui_mp/t6/zombie/hudreimagined.lua @@ -115,8 +115,9 @@ LUI.createMenu.ReimaginedArea = function(LocalClientIndex) zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_PLAYER_DEAD, CoD.Reimagined.ZoneNameArea.UpdateVisibility) zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_IS_SCOPED, CoD.Reimagined.ZoneNameArea.UpdateVisibility) zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_IS_PLAYER_ZOMBIE, CoD.Reimagined.ZoneNameArea.UpdateVisibility) - zoneNameWidget:registerEventHandler("hud_update_zone_fade_out", CoD.Reimagined.ZoneNameArea.FadeOutZoneName) - zoneNameWidget:registerEventHandler("hud_update_zone_fade_in", CoD.Reimagined.ZoneNameArea.FadeInZoneName) + zoneNameWidget:registerEventHandler("hud_update_zone_name", CoD.Reimagined.ZoneNameArea.UpdateZoneName) + zoneNameWidget:registerEventHandler("hud_fade_out_zone_name", CoD.Reimagined.ZoneNameArea.FadeOutZoneName) + zoneNameWidget:registerEventHandler("hud_fade_in_zone_name", CoD.Reimagined.ZoneNameArea.FadeInZoneName) return safeArea end @@ -174,13 +175,15 @@ CoD.Reimagined.ZoneNameArea.UpdateVisibility = function(Menu, ClientInstance) end end +CoD.Reimagined.ZoneNameArea.UpdateZoneName = function(Menu, ClientInstance) + local zoneName = Engine.Localize(Engine.GetIString(ClientInstance.data[1], "CS_LOCALIZED_STRINGS")) + Menu.zoneNameText:setText(zoneName) +end + CoD.Reimagined.ZoneNameArea.FadeOutZoneName = function(Menu, ClientInstance) Menu.zoneNameText:animateToState("fade_out", 250) end CoD.Reimagined.ZoneNameArea.FadeInZoneName = function(Menu, ClientInstance) - local zoneName = Engine.Localize(Engine.GetIString(ClientInstance.data[1], "CS_LOCALIZED_STRINGS")) - - Menu.zoneNameText:setText(zoneName) Menu.zoneNameText:animateToState("fade_in", 250) end