diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index cc9eaa3..501c907 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -23,11 +23,11 @@ tab_credits = { cbf_formspec = function (tabview, name, tabdata) local logofile = defaulttexturedir .. "logo.png" return "vertlabel[0,-0.25;CREDITS]" .. - "label[0.5,3;Minetest " .. core.get_version() .. "]" .. - "label[0.5,3.3;http://minetest.net]" .. + "label[0.5,3;Minetime " .. core.get_version() .. "]" .. + "label[0.5,3.3; ]" .. "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. "textlist[3.5,-0.25;8.5,5.8;list_credits;" .. - "#FFFF00" .. fgettext("Core Developers") .."," .. + --[["#FFFF00" .. fgettext("Core Developers") .."," .. "Perttu Ahola (celeron55) ,".. "Ryan Kwolek (kwolekr) ,".. "PilzAdam ," .. @@ -55,7 +55,7 @@ tab_credits = { "Nils Dagsson Moskopp (erlehmann) ,".. "Constantin Wenger (SpeedProg) ,".. "matttpt ,".. - "JacobF ,".. + "JacobF ,"..]]-- ";0;true]" end } diff --git a/builtin/mainmenu/textures.lua b/builtin/mainmenu/textures.lua index 56992c0..d5d0fea 100644 --- a/builtin/mainmenu/textures.lua +++ b/builtin/mainmenu/textures.lua @@ -20,6 +20,7 @@ mm_texture = {} -------------------------------------------------------------------------------- function mm_texture.init() + mm_texture.defaulttexturedir = core.get_texturepath() .. DIR_DELIM .. "base" .. DIR_DELIM .. "pack" .. DIR_DELIM mm_texture.basetexturedir = mm_texture.defaulttexturedir @@ -48,7 +49,7 @@ function mm_texture.reset() mm_texture.gameid = nil local have_bg = false local have_overlay = mm_texture.set_generic("overlay") - + if not have_overlay then have_bg = mm_texture.set_generic("background") end @@ -56,7 +57,8 @@ function mm_texture.reset() mm_texture.clear("header") mm_texture.clear("footer") core.set_clouds(false) - + mm_texture.set_dirt_bg() + mm_texture.set_generic("background") mm_texture.set_generic("footer") mm_texture.set_generic("header") @@ -116,16 +118,25 @@ function mm_texture.set_generic(identifier) return true end end - - if mm_texture.defaulttexturedir ~= nil then - local path = mm_texture.defaulttexturedir .. DIR_DELIM .."menu_" .. + + local file=io.open(mm_texture.defaulttexturedir ,"r") + + if file ~= nil then + io.close(file) + local path = mm_texture.defaulttexturedir .."menu_" .. identifier .. ".png" if core.set_background(identifier,path) then return true end + else + local path = defaulttexturedir .."menu_" .. + identifier .. ".png" + if core.set_background(identifier,path) then + return true + end + end - - return false + end -------------------------------------------------------------------------------- @@ -152,6 +163,7 @@ function mm_texture.set_game(identifier,gamedetails) return false end +--------------------------------------------------------------------------------- function mm_texture.set_dirt_bg() if mm_texture.texturepack ~= nil then local path = mm_texture.texturepack .. DIR_DELIM .."default_dirt.png" @@ -162,5 +174,5 @@ function mm_texture.set_dirt_bg() --use base pack local minimalpath = defaulttexturedir .. "dirt_bg.png" - core.set_background("background", minimalpath, true, 128) + core.set_background("background", minimalpath)--, true, 128) end diff --git a/games/minetime_game/menu/background.png b/games/minetime_game/menu/background.png new file mode 100644 index 0000000..24c98ec Binary files /dev/null and b/games/minetime_game/menu/background.png differ diff --git a/games/minetime_game/menu/header.png b/games/minetime_game/menu/header.png index c8a878e..a964f98 100644 Binary files a/games/minetime_game/menu/header.png and b/games/minetime_game/menu/header.png differ diff --git a/textures/base/pack/menu_background.png b/textures/base/pack/menu_background.png new file mode 100644 index 0000000..521766e Binary files /dev/null and b/textures/base/pack/menu_background.png differ diff --git a/textures/base/pack/menu_header.png b/textures/base/pack/menu_header.png index abf2403..a964f98 100644 Binary files a/textures/base/pack/menu_header.png and b/textures/base/pack/menu_header.png differ