X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=builtin%2Fmainmenu.lua;h=926f3f2d92dc3a58b35dee1e7d36534eca1fe3ab;hb=4e1f50035e860a00636ca5d804c267119df99601;hp=3e3777227210d6299ad21cb2ef2c9ad79b1d70c9;hpb=383153419bef744af4bfa5f5d54c4bee663a5ce6;p=dragonfireclient.git diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua index 3e3777227..926f3f2d9 100644 --- a/builtin/mainmenu.lua +++ b/builtin/mainmenu.lua @@ -1,3 +1,5 @@ +print = engine.debug +math.randomseed(os.time()) os.setlocale("C", "numeric") local scriptpath = engine.get_scriptdir() @@ -9,6 +11,7 @@ mt_color_dark_green = "#003300" --for all other colors ask sfan5 to complete his worK! +dofile(scriptpath .. DIR_DELIM .. "misc_helpers.lua") dofile(scriptpath .. DIR_DELIM .. "filterlist.lua") dofile(scriptpath .. DIR_DELIM .. "modmgr.lua") dofile(scriptpath .. DIR_DELIM .. "modstore.lua") @@ -864,7 +867,11 @@ function tabbuilder.init() end end - menu.update_gametype() + if tabbuilder.current_tab ~= "singleplayer" then + menu.update_gametype(true) + else + menu.update_gametype() + end end -------------------------------------------------------------------------------- @@ -1006,8 +1013,7 @@ function tabbuilder.tab_TP() "vertlabel[0,-0.25;TEXTURE PACKS]" .. "textlist[4,0.25;7.5,5.0;TPs;" .. menu.render_TP_list(TPlist) .. - ";" .. index .. "]" .. - menubar.formspec + ";" .. index .. "]" end local TPinfofile = TPpath..DIR_DELIM.."info.txt" local f = io.open(TPinfofile, "r") @@ -1034,8 +1040,7 @@ function tabbuilder.tab_TP() menu.render_TP_list(TPlist) .. ";" .. index .. "]" .. "image[0.65,0.25;4.0,3.7;"..(menu.TPscreen or no_screenshot).."]".. - "textarea[1.0,3.25;3.7,1.5;;"..(menu.TPinfo or "")..";]".. - menubar.formspec + "textarea[1.0,3.25;3.7,1.5;;"..(menu.TPinfo or "")..";]" end -------------------------------------------------------------------------------- @@ -1049,7 +1054,7 @@ function tabbuilder.tab_credits() "Perttu Ahola (celeron55) ,".. "Ryan Kwolek (kwolekr) ,".. "PilzAdam ," .. - "IIya Zhuravlev (thexyz) ,".. + "Ilya Zhuravlev (xyz) ,".. "Lisa Milne (darkrose) ,".. "Maciej Kasatkin (RealBadAngel) ,".. "proller ,"..