tour/minetest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move builtin/mainmenu/settings to builtin/common/settings, create builtin/pause_menu

Browse Source
This commit is contained in:
grorp 2025-01-01 17:12:28 +01:00
parent c798906f61
commit 42f92694b5
10 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
builtin/mainmenu/settings/components.lua → builtin/common/settings/components.lua
View File

0
builtin/mainmenu/settings/dlg_change_mapgen_flags.lua → builtin/common/settings/dlg_change_mapgen_flags.lua
View File

7
builtin/mainmenu/settings/dlg_settings.lua → builtin/common/settings/dlg_settings.lua
View File

@ -16,11 +16,10 @@
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
local component_funcs = dofile(core.get_mainmenu_path() .. DIR_DELIM .. local path = core.get_builtin_path() .. "common" .. DIR_DELIM .. "settings" .. DIR_DELIM
"settings" .. DIR_DELIM .. "components.lua")
local shadows_component = dofile(core.get_mainmenu_path() .. DIR_DELIM .. local component_funcs = dofile(path .. "components.lua")
"settings" .. DIR_DELIM .. "shadows_component.lua") local shadows_component = dofile(path .. "shadows_component.lua")
local loaded = false local loaded = false
local full_settings local full_settings

0
builtin/mainmenu/settings/generate_from_settingtypes.lua → builtin/common/settings/generate_from_settingtypes.lua
View File

8
builtin/mainmenu/settings/init.lua → builtin/common/settings/init.lua
View File

@ -15,11 +15,11 @@
--with this program; if not, write to the Free Software Foundation, Inc., --with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
local path = core.get_mainmenu_path() .. DIR_DELIM .. "settings" local path = core.get_builtin_path() .. "common" .. DIR_DELIM .. "settings" .. DIR_DELIM
dofile(path .. DIR_DELIM .. "settingtypes.lua") dofile(path .. "settingtypes.lua")
dofile(path .. DIR_DELIM .. "dlg_change_mapgen_flags.lua") dofile(path .. "dlg_change_mapgen_flags.lua")
dofile(path .. DIR_DELIM .. "dlg_settings.lua") dofile(path .. "dlg_settings.lua")
-- Uncomment to generate 'minetest.conf.example' and 'settings_translation_file.cpp'. -- Uncomment to generate 'minetest.conf.example' and 'settings_translation_file.cpp'.
-- For RUN_IN_PLACE the generated files may appear in the 'bin' folder. -- For RUN_IN_PLACE the generated files may appear in the 'bin' folder.

0
builtin/mainmenu/settings/settingtypes.lua → builtin/common/settings/settingtypes.lua
View File

0
builtin/mainmenu/settings/shadows_component.lua → builtin/common/settings/shadows_component.lua
View File

2
builtin/init.lua
View File

@ -79,7 +79,7 @@ elseif INIT == "client" then
elseif INIT == "emerge" then elseif INIT == "emerge" then
dofile(scriptdir .. "emerge" .. DIR_DELIM .. "init.lua") dofile(scriptdir .. "emerge" .. DIR_DELIM .. "init.lua")
elseif INIT == "pause_menu" then elseif INIT == "pause_menu" then
print("WOW WOW WOW HELLO FROM PAUSE MENU ENV") dofile(scriptdir .. "pause_menu" .. DIR_DELIM .. "init.lua")
else else
error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT))) error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
end end

2
builtin/mainmenu/init.lua
View File

@ -47,7 +47,7 @@ dofile(menupath .. DIR_DELIM .. "game_theme.lua")
dofile(menupath .. DIR_DELIM .. "content" .. DIR_DELIM .. "init.lua") dofile(menupath .. DIR_DELIM .. "content" .. DIR_DELIM .. "init.lua")
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
dofile(menupath .. DIR_DELIM .. "settings" .. DIR_DELIM .. "init.lua") dofile(basepath .. "common" .. DIR_DELIM .. "settings" .. DIR_DELIM .. "init.lua")
dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
dofile(menupath .. DIR_DELIM .. "dlg_delete_content.lua") dofile(menupath .. DIR_DELIM .. "dlg_delete_content.lua")
dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")

0
builtin/pause_menu/init.lua Normal file
View File