aboutsummaryrefslogtreecommitdiff
path: root/builtin/client
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/client')
-rw-r--r--builtin/client/init.lua10
-rw-r--r--builtin/client/preview.lua2
-rw-r--r--builtin/client/register.lua1
3 files changed, 12 insertions, 1 deletions
diff --git a/builtin/client/init.lua b/builtin/client/init.lua
index dd218aab6..b204ee5e6 100644
--- a/builtin/client/init.lua
+++ b/builtin/client/init.lua
@@ -6,8 +6,18 @@ local commonpath = scriptpath.."common"..DIR_DELIM
dofile(clientpath .. "register.lua")
dofile(commonpath .. "after.lua")
dofile(commonpath .. "chatcommands.lua")
+dofile(clientpath .. "chatcommands.lua")
dofile(clientpath .. "preview.lua")
core.register_on_death(function()
core.display_chat_message("You died.")
+ local formspec = "size[11,5.5]bgcolor[#320000b4;true]" ..
+ "label[4.85,1.35;" .. fgettext("You died.") .. "]button_exit[4,3;3,0.5;btn_respawn;".. fgettext("Respawn") .."]"
+ core.show_formspec("bultin:death", formspec)
+end)
+
+core.register_on_formspec_input(function(formname, fields)
+ if formname == "bultin:death" then
+ core.send_respawn()
+ end
end)
diff --git a/builtin/client/preview.lua b/builtin/client/preview.lua
index 22e8bb97f..4c01d665f 100644
--- a/builtin/client/preview.lua
+++ b/builtin/client/preview.lua
@@ -32,7 +32,7 @@ end)
-- This is an example function to ensure it's working properly, should be removed before merge
core.register_chatcommand("dump", {
- func = function(name, param)
+ func = function(param)
return true, dump(_G)
end,
})
diff --git a/builtin/client/register.lua b/builtin/client/register.lua
index 8b60c1222..1e6ac4342 100644
--- a/builtin/client/register.lua
+++ b/builtin/client/register.lua
@@ -62,5 +62,6 @@ core.registered_on_sending_chat_messages, core.register_on_sending_chat_messages
core.registered_on_death, core.register_on_death = make_registration()
core.registered_on_hp_modification, core.register_on_hp_modification = make_registration()
core.registered_on_damage_taken, core.register_on_damage_taken = make_registration()
+core.registered_on_formspec_input, core.register_on_formspec_input = make_registration()