diff options
| author | Paramat <paramat@users.noreply.github.com> | 2018-11-24 10:41:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 10:41:11 +0000 |
| commit | 2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6 (patch) | |
| tree | 4f607e1f226fa169c2bd98de531b62cba4de3260 /builtin | |
| parent | a969635322576218312be3e32e5b4fcb0359ac05 (diff) | |
| download | minetest-2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6.tar.gz minetest-2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6.tar.bz2 minetest-2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6.zip | |
CSM: Don't create the client script environment if CSM is disabled (#7874)
Use the CSM death formspec when CSM is enabled and use the engine death formspec when CSM is disabled.
Move the CSM death formspec code to a dedicated file.
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/client/death_formspec.lua | 16 | ||||
| -rw-r--r-- | builtin/client/init.lua | 14 |
2 files changed, 17 insertions, 13 deletions
diff --git a/builtin/client/death_formspec.lua b/builtin/client/death_formspec.lua new file mode 100644 index 000000000..e755ac5c1 --- /dev/null +++ b/builtin/client/death_formspec.lua @@ -0,0 +1,16 @@ +-- CSM death formspec. Only used when clientside modding is enabled, otherwise +-- handled by the engine. + +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/init.lua b/builtin/client/init.lua index 22256f6f7..9633a7c71 100644 --- a/builtin/client/init.lua +++ b/builtin/client/init.lua @@ -8,16 +8,4 @@ dofile(commonpath .. "after.lua") dofile(commonpath .. "chatcommands.lua") dofile(clientpath .. "chatcommands.lua") dofile(commonpath .. "vector.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) +dofile(clientpath .. "death_formspec.lua") |