forked from Sokomine/yl_speak_up
use just one register_on_player_receive_fields function - that also returns properly true instead of nil as before
This commit is contained in:
parent
8a685dc211
commit
ff6a3faca4
@ -1696,8 +1696,32 @@ end
|
|||||||
|
|
||||||
-- options
|
-- options
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(
|
-- route player input to the right functions;
|
||||||
function(player, formname, fields)
|
-- return true when the right function has been found
|
||||||
|
minetest.register_on_player_receive_fields( function(player, formname, fields)
|
||||||
|
if formname == "yl_speak_up:optiondialog" then
|
||||||
|
yl_speak_up.input_optiondialog(player, formname, fields)
|
||||||
|
return true
|
||||||
|
elseif formname == "yl_speak_up:setdialog" then
|
||||||
|
yl_speak_up.input_setdialog(player, formname, fields)
|
||||||
|
return true
|
||||||
|
elseif formname == "yl_speak_up:confirm_save" then
|
||||||
|
yl_speak_up.input_confirm_save(player, formname, fields)
|
||||||
|
return true
|
||||||
|
elseif formname == "yl_speak_up:edit_option_dialog" then
|
||||||
|
yl_speak_up.input_edit_option_dialog(player, formname, fields)
|
||||||
|
return true
|
||||||
|
elseif formname == "yl_speak_up:talk" then
|
||||||
|
yl_speak_up.input_talk(player, formname, fields)
|
||||||
|
return true
|
||||||
|
elseif formname == "yl_speak_up:fashion" then
|
||||||
|
yl_speak_up.input_fashion(player, formname, fields)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
|
||||||
|
yl_speak_up.input_optiondialog = function(player, formname, fields)
|
||||||
if formname ~= "yl_speak_up:optiondialog" then
|
if formname ~= "yl_speak_up:optiondialog" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -1856,12 +1880,10 @@ minetest.register_on_player_receive_fields(
|
|||||||
get_fs_optiondialog(player, n_id, d_id, o_id, p_id, r_id)
|
get_fs_optiondialog(player, n_id, d_id, o_id, p_id, r_id)
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
)
|
|
||||||
|
|
||||||
-- dialog
|
-- dialog
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(
|
yl_speak_up.input_setdialog = function(player, formname, fields)
|
||||||
function(player, formname, fields)
|
|
||||||
if formname ~= "yl_speak_up:setdialog" then
|
if formname ~= "yl_speak_up:setdialog" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -1953,7 +1975,6 @@ minetest.register_on_player_receive_fields(
|
|||||||
minetest.show_formspec(pname, "yl_speak_up:setdialog", get_fs_setdialog(player, n_id, fields.d_id))
|
minetest.show_formspec(pname, "yl_speak_up:setdialog", get_fs_setdialog(player, n_id, fields.d_id))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
)
|
|
||||||
|
|
||||||
-- talk
|
-- talk
|
||||||
|
|
||||||
@ -2491,19 +2512,16 @@ end
|
|||||||
-- end of yl_speak_up.edit_mode_apply_changes
|
-- end of yl_speak_up.edit_mode_apply_changes
|
||||||
|
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(
|
yl_speak_up.input_confirm_save = function(player, formname, fields)
|
||||||
function(player, formname, fields)
|
|
||||||
if formname ~= "yl_speak_up:confirm_save" then
|
if formname ~= "yl_speak_up:confirm_save" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
yl_speak_up.save_changes_and_switch_to_other_dialog(player, fields, fields.goto_target_dialog)
|
yl_speak_up.save_changes_and_switch_to_other_dialog(player, fields, fields.goto_target_dialog)
|
||||||
end
|
end
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
-- process input from formspec created in get_fs_edit_option_dialog(..)
|
-- process input from formspec created in get_fs_edit_option_dialog(..)
|
||||||
minetest.register_on_player_receive_fields(
|
yl_speak_up.input_edit_option_dialog = function(player, formname, fields)
|
||||||
function(player, formname, fields)
|
|
||||||
if formname ~= "yl_speak_up:edit_option_dialog" then
|
if formname ~= "yl_speak_up:edit_option_dialog" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -2581,7 +2599,6 @@ minetest.register_on_player_receive_fields(
|
|||||||
-- reason: don't loose any unsaved changes to the dialog
|
-- reason: don't loose any unsaved changes to the dialog
|
||||||
minetest.show_formspec(pname, "yl_speak_up:talk", get_fs_talkdialog(player, n_id, d_id))
|
minetest.show_formspec(pname, "yl_speak_up:talk", get_fs_talkdialog(player, n_id, d_id))
|
||||||
end
|
end
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
-- identify multiple results that lead to target dialogs
|
-- identify multiple results that lead to target dialogs
|
||||||
@ -2621,8 +2638,7 @@ yl_speak_up.check_for_disambigous_results = function(n_id, pname)
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(
|
yl_speak_up.input_talk = function(player, formname, fields)
|
||||||
function(player, formname, fields)
|
|
||||||
if formname ~= "yl_speak_up:talk" then
|
if formname ~= "yl_speak_up:talk" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -3011,7 +3027,6 @@ minetest.register_on_player_receive_fields(
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
)
|
|
||||||
|
|
||||||
-- Make the NPC talk
|
-- Make the NPC talk
|
||||||
|
|
||||||
@ -3417,8 +3432,7 @@ yl_speak_up.get_fs_fashion = function(pname)
|
|||||||
return table.concat(formspec, "")
|
return table.concat(formspec, "")
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields( --fashion
|
yl_speak_up.input_fashion = function(player, formname, fields)
|
||||||
function(player, formname, fields)
|
|
||||||
if formname ~= "yl_speak_up:fashion" then
|
if formname ~= "yl_speak_up:fashion" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -3496,7 +3510,6 @@ minetest.register_on_player_receive_fields( --fashion
|
|||||||
|
|
||||||
minetest.show_formspec(pname, "yl_speak_up:fashion", yl_speak_up.get_fs_fashion(pname))
|
minetest.show_formspec(pname, "yl_speak_up:fashion", yl_speak_up.get_fs_fashion(pname))
|
||||||
end
|
end
|
||||||
)
|
|
||||||
|
|
||||||
function yl_speak_up.fashion(player, obj)
|
function yl_speak_up.fashion(player, obj)
|
||||||
local luaentity = obj:get_luaentity()
|
local luaentity = obj:get_luaentity()
|
||||||
|
Loading…
Reference in New Issue
Block a user