erlehmann
/
mainmenu_csm
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename 'subgame' to 'game'

This commit is contained in:
paramat 2018-03-13 01:59:01 +00:00 committed by Nils Dagsson Moskopp
parent 4d35dd3c15
commit f883baa51e
Signed by: erlehmann
GPG Key ID: A3BC671C35191080
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mainmenu/dlg_create_world.lua
View File

@ -85,12 +85,12 @@ local function create_world_formspec(dialogdata)
if #gamemgr.games == 0 then
retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" ..
fgettext("You have no subgames installed.") .. "]label[2.25,4.4;" ..
fgettext("You have no games installed.") .. "]label[2.25,4.4;" ..
fgettext("Download one from minetest.net") .. "]"
elseif #gamemgr.games == 1 and gamemgr.games[1].id == "minimal" then
retval = retval .. "box[1.75,4;8.7,1;#ff8800]label[2,4;" ..
fgettext("Warning: The minimal development test is meant for developers.") .. "]label[2,4.4;" ..
fgettext("Download a subgame, such as minetest_game, from minetest.net") .. "]"
fgettext("Download a game, such as minetest_game, from minetest.net") .. "]"
end
return retval

2
builtin/mainmenu/textures.lua
View File

@ -143,7 +143,7 @@ function mm_texture.set_game(identifier, gamedetails)
end
end
-- Find out how many randomized textures the subgame provides
-- Find out how many randomized textures the game provides
local n = 0
local filename
local menu_files = core.get_dir_list(gamedetails.path .. DIR_DELIM .. "menu", false)

4
builtin/settingtypes.txt
View File

@ -1235,8 +1235,8 @@ curl_file_download_timeout (cURL file download timeout) int 300000
high_precision_fpu (High-precision FPU) bool true
# Changes the main menu UI:
# - Full: Multple singleplayer worlds, subgame choice, texture pack chooser, etc.
# - Simple: One singleplayer world, no subgame or texture pack choosers. May be necessary for smaller screens.
# - Full: Multple singleplayer worlds, game choice, texture pack chooser, etc.
# - Simple: One singleplayer world, no game or texture pack choosers. May be necessary for smaller screens.
# - Auto: Simple on Android, full on everything else.
main_menu_style (Main menu style) enum auto auto,full,simple