From 9d26267e6715fc242863a281d4223b243ef7acf9 Mon Sep 17 00:00:00 2001 From: Sokomine Date: Fri, 9 Feb 2024 19:45:34 +0100 Subject: [PATCH] added force_fs_ver to register_fs --- editor/fs/fs_add_quest_steps.lua | 4 +++- show_fs.lua | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/editor/fs/fs_add_quest_steps.lua b/editor/fs/fs_add_quest_steps.lua index c1e37eb..52ddcc3 100644 --- a/editor/fs/fs_add_quest_steps.lua +++ b/editor/fs/fs_add_quest_steps.lua @@ -757,5 +757,7 @@ end yl_speak_up.register_fs("add_quest_steps", yl_speak_up.input_fs_add_quest_steps, -- param is unused here - yl_speak_up.get_fs_add_quest_steps + yl_speak_up.get_fs_add_quest_steps, + -- no special formspec version required + nil ) diff --git a/show_fs.lua b/show_fs.lua index f116345..1e6c736 100644 --- a/show_fs.lua +++ b/show_fs.lua @@ -3,10 +3,13 @@ -- key: formname without yl_speak_up: prefix yl_speak_up.registered_forms_get_fs = {} yl_speak_up.registered_forms_input_handler = {} +-- force_fs_ver can be nil if no special formspec version is required +yl_speak_up.registered_forms_force_fs_ver = {} -yl_speak_up.register_fs = function(formname, fun_input_handler, fun_get_fs) +yl_speak_up.register_fs = function(formname, fun_input_handler, fun_get_fs, force_fs_ver) yl_speak_up.registered_forms_input_handler[formname] = fun_input_handler yl_speak_up.registered_forms_get_fs[formname] = fun_get_fs + yl_speak_up.registered_forms_force_fs_ver[formname] = force_fs_ver end @@ -269,9 +272,11 @@ yl_speak_up.show_fs = function(player, fs_name, param) yl_speak_up.speak_to[pname].last_fs_param = param end - local fun = yl_speak_up.registered_forms_get_fs[formname] + local fun = yl_speak_up.registered_forms_get_fs[fs_name] if(fun) then - yl_speak_up.show_fs_ver(pname, "yl_speak_up:"..formname, fun(player, param)) + yl_speak_up.show_fs_ver(pname, "yl_speak_up:"..fs_name, + fun(player, param), + yl_speak_up.registered_forms_force_fs_ver[fs_name]) return true end