[Custom Views] Fix not working 'active' option

This commit is contained in:
Azumgi 2018-11-07 16:33:54 +03:00
parent 0e51011f6c
commit 1de94497f9

View file

@ -53,8 +53,19 @@ local ERRORS = {
-- ##### Local functions ############################################################################################### -- ##### Local functions ###############################################################################################
-- ##################################################################################################################### -- #####################################################################################################################
local function is_view_active_for_current_level(view_name)
local active = _views_data[view_name].view_settings.active
if _ingame_ui.is_in_inn and active.inn or not _ingame_ui.is_in_inn and active.ingame then
return true
end
end
-- @THROWS_ERRORS -- @THROWS_ERRORS
local function inject_view(view_name) local function inject_view(view_name)
if not is_view_active_for_current_level(view_name) then
return
end
local view_settings = _views_data[view_name].view_settings local view_settings = _views_data[view_name].view_settings
local mod = _views_data[view_name].mod local mod = _views_data[view_name].mod
@ -177,7 +188,7 @@ local function validate_view_data(view_data)
if type(active) ~= "table" then if type(active) ~= "table" then
vmf.throw_error(ERRORS.THROWABLE["active_wrong_type"], type(active)) vmf.throw_error(ERRORS.THROWABLE["active_wrong_type"], type(active))
end end
if not active.inn or not active.ingame then if active.inn == nil or active.ingame == nil then
vmf.throw_error(ERRORS.THROWABLE["active_missing_element"]) vmf.throw_error(ERRORS.THROWABLE["active_missing_element"])
end end
for level_name, value in pairs(active) do for level_name, value in pairs(active) do