- X (close) button in the formspecs

- attempt to fix BG in the mainmenu
- fixed textures path on Windows

builtin/mainmenu/dlg_add_server.lua

@@ -43,8 +43,6 @@ end
 
 local function add_server_buttonhandler(this, fields)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if fields["server_add_cancel"] then
                 this:delete()

builtin/mainmenu/dlg_config_world.lua

@@ -120,9 +120,6 @@ end
 
 local function handle_buttons(this, fields)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
         if fields["world_config_modlist"] ~= nil then
                 local event = multicraft.explode_textlist_event(fields["world_config_modlist"])
                 this.data.selected_mod = event.index

builtin/mainmenu/dlg_create_world.lua

@@ -84,8 +84,6 @@ end
 
 local function create_world_buttonhandler(this, fields)
     core.set_clouds(false)
-    core.set_background("background",core.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    core.set_background("header",core.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if fields["world_create_cancel"] then
                 this:delete()

builtin/mainmenu/dlg_delete_mod.lua

@@ -36,8 +36,6 @@ end
 --------------------------------------------------------------------------------
 local function delete_mod_buttonhandler(this, fields)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if fields["dlg_delete_mod_confirm"] ~= nil then
 

builtin/mainmenu/dlg_delete_world.lua

@@ -32,8 +32,6 @@ end
 
 local function delete_world_buttonhandler(this, fields)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
         if fields["world_delete_confirm"] then
            if this.data.delete_index > 0 and
               this.data.delete_index <= #menudata.worldlist:get_raw_list() then

builtin/mainmenu/dlg_rename_modpack.lua

@@ -38,8 +38,6 @@ end
 --------------------------------------------------------------------------------
 local function rename_modpack_buttonhandler(this, fields)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if fields["dlg_rename_modpack_confirm"] ~= nil then
                 local oldpath = multicraft.get_modpath() .. DIR_DELIM .. this.data.mod.name

builtin/mainmenu/init.lua

@@ -79,10 +79,6 @@ end
 --------------------------------------------------------------------------------
 
 local function main_button_handler2(tabview, fields, name, tabdata)
-    multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
     local index = ''
     if fields["btn_show_singleplayer"] then  index = "singleplayer"       end
     if fields["btn_show_multiplayer"]  then  index = "multiplayer"  end
@@ -121,10 +117,8 @@ local function on_activate2(type,old_tab,new_tab)
     mm_texture.clear("header")
     mm_texture.clear("footer")
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
+    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.jpeg')
     multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
-
 end
 
 --------------------------------------------------------------------------------

builtin/mainmenu/modstore.lua

@@ -166,9 +166,6 @@ end
 -- @function [parent=#modstore] handle_buttons
 function modstore.handle_buttons(current_tab,fields)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
 
 	if fields["modstore_tab"] then
 		local index = tonumber(fields["modstore_tab"])

builtin/mainmenu/store.lua

@@ -188,9 +188,6 @@ end
 -- @function [parent=#modstore] handle_buttons
 function modstore.handle_buttons(parent, fields, name, data)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
 
         if fields["btn_modstore_page_up"] then
                 if modstore.current_list ~= nil and modstore.current_list.page > 0 then

builtin/mainmenu/tab_credits.lua

@@ -85,9 +85,6 @@ tab_credits = {
                         end,
         cbf_button_handler = function(tabview, fields, name, tabdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
                if fields["btn_cancel"] ~= nil then
                   tabview:hide()
                   tabview.parent:show()

builtin/mainmenu/tab_mods.lua

@@ -112,8 +112,6 @@ end
 --------------------------------------------------------------------------------
 local function handle_buttons(tabview, fields, tabname, tabdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if fields["modlist"] ~= nil then
                 local event = multicraft.explode_textlist_event(fields["modlist"])

builtin/mainmenu/tab_multiplayer.lua

@@ -119,8 +119,6 @@ end
 --------------------------------------------------------------------------------
 local function main_button_handler(tabview, fields, name, tabdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if not tabdata then tabdata = {} end
 

builtin/mainmenu/tab_server.lua

@@ -78,8 +78,6 @@ end
 --------------------------------------------------------------------------------
 local function main_button_handler(this, fields, name, tabdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         local world_doubleclick = false
 

builtin/mainmenu/tab_settings.lua

@@ -82,8 +82,6 @@ end
 
 local function dlg_confirm_reset_btnhandler(this, fields, dialogdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
         if fields["dlg_reset_singleplayer_confirm"] ~= nil then
                 local worldlist = multicraft.get_worlds()

builtin/mainmenu/tab_singleplayer.lua

@@ -124,9 +124,6 @@ end
 
 local function main_button_handler(this, fields, name, tabdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
-
     --assert(name == "singleplayer")
 
     if fields["btn_server"]~=nil then

builtin/mainmenu/tab_texturepacks.lua

@@ -88,8 +88,6 @@ end
 --------------------------------------------------------------------------------
 local function main_button_handler(tabview, fields, name, tabdata)
     multicraft.set_clouds(false)
-    multicraft.set_background("background",multicraft.formspec_escape(mm_texture.basetexturedir)..'background.png')
-    multicraft.set_background("header",multicraft.formspec_escape(mm_texture.basetexturedir)..'header.png')
 
 	if fields["TPs"] ~= nil then
 		local event = multicraft.explode_textlist_event(fields["TPs"])