Normal maps generation on the fly.

[dragonfireclient.git] / builtin / mainmenu.lua

diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua
index 8ef306354fcac7710579ac755013cabbfd4586b5..e9c8e8137a962e48488fc9dd27ab1e0da94abbf4 100644 (file)
--- a/builtin/mainmenu.lua
+++ b/builtin/mainmenu.lua
@@ -176,7 +176,7 @@ function update_menu()
 
        -- handle errors
        if gamedata.errormessage ~= nil then
-               formspec = "size[12,5.2]" ..
+               formspec = "size[12,5.2,true]" ..
                        "textarea[1,2;10,2;;ERROR: " ..
                        engine.formspec_escape(gamedata.errormessage) ..
                        ";]"..
@@ -210,12 +210,12 @@ end
 function menu.render_texture_pack_list(list)
        local retval = ""
 
-       for i,v in ipairs(list) do
+       for i, v in ipairs(list) do
                if retval ~= "" then
                        retval = retval ..","
                end
 
-               retval = retval .. v
+               retval = retval .. engine.formspec_escape(v)
        end
 
        return retval
@@ -296,7 +296,7 @@ function menu.handle_key_up_down(fields,textlist,settingname)
        if fields["key_up"] then
                local oldidx = engine.get_textlist_index(textlist)
 
-               if oldidx > 1 then
+               if oldidx ~= nil and oldidx > 1 then
                        local newidx = oldidx -1
                        engine.setting_set(settingname,
                                filterlist.get_raw_index(worldlist,newidx))
@@ -306,7 +306,7 @@ function menu.handle_key_up_down(fields,textlist,settingname)
        if fields["key_down"] then
                local oldidx = engine.get_textlist_index(textlist)
 
-               if oldidx < filterlist.size(worldlist) then
+               if oldidx ~= nil and oldidx < filterlist.size(worldlist) then
                        local newidx = oldidx + 1
                        engine.setting_set(settingname,
                                filterlist.get_raw_index(worldlist,newidx))
@@ -365,7 +365,7 @@ end
 
 function tabbuilder.gettab()
        local tsize = tabbuilder.tabsizes[tabbuilder.current_tab] or {width=12, height=5.2}
-       local retval = "size[" .. tsize.width .. "," .. tsize.height .. "]"
+       local retval = "size[" .. tsize.width .. "," .. tsize.height .. ",true]"
 
        if tabbuilder.show_buttons then
                retval = retval .. tabbuilder.tab_header()
@@ -392,7 +392,7 @@ function tabbuilder.handle_create_world_buttons(fields)
                local worldname = fields["te_world_name"]
                local gameindex = engine.get_textlist_index("games")
 
-               if gameindex > 0 and
+               if gameindex ~= nil and
                        worldname ~= "" then
 
                        local message = nil
@@ -506,11 +506,13 @@ function tabbuilder.handle_multiplayer_buttons(fields)
 
                local fav_idx = engine.get_textlist_index("favourites")
 
-               if fields["key_up"] ~= nil and fav_idx > 1 then
-                       fav_idx = fav_idx -1
-               else if fields["key_down"] and fav_idx < #menu.favorites then
-                       fav_idx = fav_idx +1
-               end end
+               if fav_idx ~= nil then
+                       if fields["key_up"] ~= nil and fav_idx > 1 then
+                               fav_idx = fav_idx -1
+                       else if fields["key_down"] and fav_idx < #menu.favorites then
+                               fav_idx = fav_idx +1
+                       end end
+               end
 
                local address = menu.favorites[fav_idx].address
                local port = menu.favorites[fav_idx].port
@@ -539,6 +541,7 @@ function tabbuilder.handle_multiplayer_buttons(fields)
 
        if fields["btn_delete_favorite"] ~= nil then
                local current_favourite = engine.get_textlist_index("favourites")
+               if current_favourite == nil then return end
                engine.delete_favorite(current_favourite)
                menu.favorites = engine.get_favorites()
                menu.fav_selected = nil
@@ -559,7 +562,7 @@ function tabbuilder.handle_multiplayer_buttons(fields)
 
                local fav_idx = engine.get_textlist_index("favourites")
 
-               if fav_idx > 0 and fav_idx <= #menu.favorites and
+               if fav_idx ~= nil and fav_idx <= #menu.favorites and
                        menu.favorites[fav_idx].address == fields["te_address"] and
                        menu.favorites[fav_idx].port    == fields["te_port"] then
 
@@ -615,7 +618,7 @@ function tabbuilder.handle_server_buttons(fields)
                world_doubleclick or
                fields["key_enter"] then
                local selected = engine.get_textlist_index("srv_worlds")
-               if selected > 0 then
+               if selected ~= nil then
                        gamedata.playername             = fields["te_playername"]
                        gamedata.password               = fields["te_passwd"]
                        gamedata.port                   = fields["te_serverport"]
@@ -623,6 +626,9 @@ function tabbuilder.handle_server_buttons(fields)
                        gamedata.selected_world = filterlist.get_raw_index(worldlist,selected)
 
                        engine.setting_set("port",gamedata.port)
+                       if fields["te_serveraddr"] ~= nil then
+                               engine.setting_set("bind_address",fields["te_serveraddr"])
+                       end
 
                        menu.update_last_game(gamedata.selected_world)
                        engine.start()
@@ -637,7 +643,7 @@ function tabbuilder.handle_server_buttons(fields)
 
        if fields["world_delete"] ~= nil then
                local selected = engine.get_textlist_index("srv_worlds")
-               if selected > 0 and
+               if selected ~= nil and
                        selected <= filterlist.size(worldlist) then
                        local world = filterlist.get_list(worldlist)[selected]
                        if world ~= nil and
@@ -655,7 +661,7 @@ function tabbuilder.handle_server_buttons(fields)
 
        if fields["world_configure"] ~= nil then
                selected = engine.get_textlist_index("srv_worlds")
-               if selected > 0 then
+               if selected ~= nil then
                        modmgr.world_config_selected_world = filterlist.get_raw_index(worldlist,selected)
                        if modmgr.init_worldconfig() then
                                tabbuilder.current_tab = "dialog_configure_world"
@@ -717,6 +723,9 @@ function tabbuilder.handle_settings_buttons(fields)
        if fields["cb_parallax"] then
                engine.setting_set("enable_parallax_occlusion", fields["cb_parallax"])
        end
+       if fields["cb_generate_normalmaps"] then
+               engine.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"])
+       end
        if fields["cb_waving_water"] then
                engine.setting_set("enable_waving_water", fields["cb_waving_water"])
        end
@@ -763,7 +772,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
                world_doubleclick or
                fields["key_enter"] then
                local selected = engine.get_textlist_index("sp_worlds")
-               if selected > 0 then
+               if selected ~= nil then
                        gamedata.selected_world = filterlist.get_raw_index(worldlist,selected)
                        gamedata.singleplayer   = true
 
@@ -781,7 +790,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
 
        if fields["world_delete"] ~= nil then
                local selected = engine.get_textlist_index("sp_worlds")
-               if selected > 0 and
+               if selected ~= nil and
                        selected <= filterlist.size(worldlist) then
                        local world = filterlist.get_list(worldlist)[selected]
                        if world ~= nil and
@@ -799,7 +808,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
 
        if fields["world_configure"] ~= nil then
                selected = engine.get_textlist_index("sp_worlds")
-               if selected > 0 then
+               if selected ~= nil then
                        modmgr.world_config_selected_world = filterlist.get_raw_index(worldlist,selected)
                        if modmgr.init_worldconfig() then
                                tabbuilder.current_tab = "dialog_configure_world"
@@ -820,7 +829,7 @@ function tabbuilder.handle_texture_pack_buttons(fields)
                                index)
                        local list = filter_texture_pack_list(engine.get_dirlist(engine.get_texturepath(), true))
                        local current_index = engine.get_textlist_index("TPs")
-                       if #list >= current_index then
+                       if current_index ~= nil and #list >= current_index then
                                local new_path = engine.get_texturepath()..DIR_DELIM..list[current_index]
                                if list[current_index] == "None" then new_path = "" end
 
@@ -947,11 +956,24 @@ function tabbuilder.tab_server()
                dump(engine.setting_getbool("enable_damage")) .. "]"..
                "checkbox[0.5,1.15;cb_server_announce;".. fgettext("Public") .. ";" ..
                dump(engine.setting_getbool("server_announce")) .. "]"..
-               "field[0.8,3.2;3,0.5;te_playername;".. fgettext("Name") .. ";" ..
+               "field[0.8,3.2;3.5,0.5;te_playername;".. fgettext("Name") .. ";" ..
                engine.setting_get("name") .. "]" ..
-               "pwdfield[0.8,4.2;3,0.5;te_passwd;".. fgettext("Password") .. "]" ..
-               "field[0.8,5.2;3,0.5;te_serverport;".. fgettext("Server Port") .. ";" ..
-               engine.setting_get("port") .."]" ..
+               "pwdfield[0.8,4.2;3.5,0.5;te_passwd;".. fgettext("Password") .. "]"
+               
+       local bind_addr = engine.setting_get("bind_address")
+       if bind_addr ~= nil and bind_addr ~= "" then
+               retval = retval ..
+                       "field[0.8,5.2;2.25,0.5;te_serveraddr;".. fgettext("Bind Address") .. ";" ..
+                       engine.setting_get("bind_address") .."]" ..
+                       "field[3.05,5.2;1.25,0.5;te_serverport;".. fgettext("Port") .. ";" ..
+                       engine.setting_get("port") .."]"
+       else
+               retval = retval ..
+                       "field[0.8,5.2;3.5,0.5;te_serverport;".. fgettext("Server Port") .. ";" ..
+                       engine.setting_get("port") .."]"
+       end
+       
+       retval = retval ..
                "textlist[4,0.25;7.5,3.7;srv_worlds;" ..
                menu.render_world_list() ..
                ";" .. index .. "]"
@@ -991,27 +1013,30 @@ function tabbuilder.tab_settings()
                                        .. dump(engine.setting_getbool("enable_shaders")) .. "]"..
                        "button[1,4.5;2.25,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
 
-if engine.setting_getbool("enable_shaders") then
-       tab_string = tab_string ..
+       if engine.setting_getbool("enable_shaders") then
+               tab_string = tab_string ..
                        "checkbox[8,0.5;cb_bumpmapping;".. fgettext("Bumpmapping") .. ";"
                                        .. dump(engine.setting_getbool("enable_bumpmapping")) .. "]"..
                        "checkbox[8,1.0;cb_parallax;".. fgettext("Parallax Occlusion") .. ";"
                                        .. dump(engine.setting_getbool("enable_parallax_occlusion")) .. "]"..
-                       "checkbox[8,1.5;cb_waving_water;".. fgettext("Waving Water") .. ";"
+                       "checkbox[8,1.5;cb_generate_normalmaps;".. fgettext("Generate Normalmaps") .. ";"
+                                       .. dump(engine.setting_getbool("generate_normalmaps")) .. "]"..
+                       "checkbox[8,2.0;cb_waving_water;".. fgettext("Waving Water") .. ";"
                                        .. dump(engine.setting_getbool("enable_waving_water")) .. "]"..
-                       "checkbox[8,2.0;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";"
+                       "checkbox[8,2.5;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";"
                                        .. dump(engine.setting_getbool("enable_waving_leaves")) .. "]"..
-                       "checkbox[8,2.5;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
+                       "checkbox[8,3.0;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
                                        .. dump(engine.setting_getbool("enable_waving_plants")) .. "]"
-else
-       tab_string = tab_string ..
+       else
+               tab_string = tab_string ..
                        "textlist[8.33,0.7;4,1;;#888888" .. fgettext("Bumpmapping") .. ";0;true]" ..
                        "textlist[8.33,1.2;4,1;;#888888" .. fgettext("Parallax Occlusion") .. ";0;true]" ..
-                       "textlist[8.33,1.7;4,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" ..
-                       "textlist[8.33,2.2;4,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" ..
-                       "textlist[8.33,2.7;4,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]"
+                       "textlist[8.33,1.7;4,1;;#888888" .. fgettext("Generate Normalmaps") .. ";0;true]" ..
+                       "textlist[8.33,2.2;4,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" ..
+                       "textlist[8.33,2.7;4,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" ..
+                       "textlist[8.33,3.2;4,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]"
        end
-return tab_string
+       return tab_string
 end
 
 --------------------------------------------------------------------------------