bitsquid_dt/Darktide-Mod-Framework
bitsquid_dt/Darktide-Mod-Framework
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

[Custom Views] Update transition safety checks

Browse source
This commit is contained in:
Azumgi 2019-03-25 13:42:36 +03:00
parent f28fd3672e
commit f809f35a74
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vmf/scripts/mods/vmf/modules/gui/custom_views.lua
View file

@ -1,6 +1,7 @@
local vmf = get_mod("VMF") local vmf = get_mod("VMF")
local _ingame_ui = nil local _ingame_ui
local _ingame_ui_disabled
-- There's no direct access to local variable 'transitions' in ingame_ui. -- There's no direct access to local variable 'transitions' in ingame_ui.
local _ingame_ui_transitions = require("scripts/ui/views/ingame_ui_settings").transitions local _ingame_ui_transitions = require("scripts/ui/views/ingame_ui_settings").transitions
local _views_data = {} local _views_data = {}
@ -247,21 +248,28 @@ function VMFMod:handle_transition(transition_name, ignore_active_menu, fade, tra
return return
end end
local vt2_player_list_active
if not VT1 then
local ingame_player_list_ui = _ingame_ui.ingame_hud:component("IngamePlayerListUI")
vt2_player_list_active = ingame_player_list_ui and ingame_player_list_ui:is_active()
end
if _ingame_ui if _ingame_ui
and not _ingame_ui_disabled
and not _ingame_ui:pending_transition() and not _ingame_ui:pending_transition()
and not _ingame_ui:end_screen_active() and not _ingame_ui:end_screen_active()
and (not _ingame_ui.menu_active or ignore_active_menu) and (not _ingame_ui.menu_active or ignore_active_menu)
and not _ingame_ui.leave_game and not _ingame_ui.leave_game
and not _ingame_ui.menu_suspended
and not _ingame_ui.return_to_title_screen and not _ingame_ui.return_to_title_screen
and ( and (
VT1 VT1
and not _ingame_ui.menu_suspended
and not _ingame_ui.popup_join_lobby_handler.visible and not _ingame_ui.popup_join_lobby_handler.visible
or not VT1 or not VT1
and not _ingame_ui.ingame_hud.ingame_player_list_ui:is_active()
and not Managers.transition:in_fade_active() and not Managers.transition:in_fade_active()
and not _ingame_ui:cutscene_active() and not _ingame_ui:cutscene_active()
and not _ingame_ui:unavailable_hero_popup_active() and not _ingame_ui:unavailable_hero_popup_active()
and (not vt2_player_list_active or ignore_active_menu)
) )
then then
if fade then if fade then
@ -330,6 +338,11 @@ vmf:hook_safe(IngameUI, "destroy", function()
_ingame_ui = nil _ingame_ui = nil
end) end)
vmf:hook_safe(IngameUI, "update", function(self, dt_, t_, disable_ingame_ui)
_ingame_ui_disabled = disable_ingame_ui
end)
-- ##################################################################################################################### -- #####################################################################################################################
-- ##### VMF internal functions and variables ########################################################################## -- ##### VMF internal functions and variables ##########################################################################
-- ##################################################################################################################### -- #####################################################################################################################