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] Wrap ingameui methods in safe calls

Browse source
This commit is contained in:
Azumgi 2018-11-10 18:46:32 +03:00
parent da2cdc669d
commit 180edd4075
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,11 @@ local ERRORS = {
PREFIX = { PREFIX = {
register_view_validating = "[Custom Views] (register_view) View data validating '%s'", register_view_validating = "[Custom Views] (register_view) View data validating '%s'",
register_view_injection = "[Custom Views] (register_view) View injection '%s'", register_view_injection = "[Custom Views] (register_view) View injection '%s'",
ingameui_hook_injection = "[Custom Views] View injection '%s'" ingameui_hook_injection = "[Custom Views] View injection '%s'",
handle_transition_fade = "[Custom Views] (handle_transition) executing 'ingame_ui.transition_with_fade' for " ..
"transition '%s'",
handle_transition_no_fade = "[Custom Views] (handle_transition) executing 'ingame_ui.handle_transition' for " ..
"transition '%s'"
} }
} }
@ -265,9 +269,11 @@ function VMFMod:handle_transition(transition_name, transition_params, fade, igno
) )
then then
if fade then if fade then
_ingame_ui:transition_with_fade(transition_name, transition_params) vmf.safe_call_nr(self, ERRORS.THROWABLE["handle_transition_fade"], _ingame_ui.transition_with_fade, _ingame_ui,
transition_name, transition_params)
else else
_ingame_ui:handle_transition(transition_name, transition_params) vmf.safe_call_nr(self, ERRORS.THROWABLE["handle_transition_no_fade"], _ingame_ui.handle_transition, _ingame_ui,
transition_name, transition_params)
end end
return true return true
end end
@ -338,14 +344,14 @@ function vmf.keybind_toggle_view(mod, view_name, can_be_opened, is_keybind_press
if _ingame_ui.current_view == view_name then if _ingame_ui.current_view == view_name then
if keybind_transitions.close_view_transition then if keybind_transitions.close_view_transition then
mod:handle_transition(keybind_transitions.close_view_transition, mod:handle_transition(keybind_transitions.close_view_transition,
keybind_transitions.close_view_transition_params, keybind_transitions.close_view_transition_params,
keybind_transitions.transition_fade, true) keybind_transitions.transition_fade, true)
end end
-- Can open views only when keybind is pressed. -- Can open views only when keybind is pressed.
elseif can_be_opened and is_keybind_pressed then elseif can_be_opened and is_keybind_pressed then
if keybind_transitions.open_view_transition then if keybind_transitions.open_view_transition then
mod:handle_transition(keybind_transitions.open_view_transition, mod:handle_transition(keybind_transitions.open_view_transition,
keybind_transitions.close_view_transition_params, keybind_transitions.close_view_transition_params,
keybind_transitions.transition_fade, true) keybind_transitions.transition_fade, true)
end end
end end