Simplify loading of Android version of menu

[dragonfireclient.git] / builtin / mainmenu / tab_settings.lua

diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua
index 4bb3eb36c253d0e7e3f916d70577cb83b33b06d9..1f87431408fddfd262b131e49626c943104b3689 100644 (file)
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -122,7 +122,8 @@ local function formspec(tabview, name, tabdata)
                end
                video_driver_string = video_driver_string .. video_drivers[i]
                
-               if current_video_driver:lower() == video_drivers[i]:lower() then
+               local video_driver = string.gsub(video_drivers[i], " ", "")
+               if current_video_driver:lower() == video_driver:lower() then
                        current_video_driver_idx = i
                end
        end
@@ -131,18 +132,18 @@ local function formspec(tabview, name, tabdata)
        local tab_string =
                "vertlabel[0,-0.25;" .. fgettext("SETTINGS") .. "]" ..
                "box[0.75,0;3.25,4;#999999]" ..
-               "checkbox[1,0;cb_fancy_trees;".. fgettext("Fancy Trees") .. ";"
-                               .. dump(core.setting_getbool("new_style_leaves")) .. "]"..
-               "checkbox[1,0.5;cb_smooth_lighting;".. fgettext("Smooth Lighting")
+               "checkbox[1,0;cb_smooth_lighting;".. fgettext("Smooth Lighting")
                                .. ";".. dump(core.setting_getbool("smooth_lighting")) .. "]"..
+               "checkbox[1,0.5;cb_particles;".. fgettext("Enable Particles") .. ";"
+                               .. dump(core.setting_getbool("enable_particles"))       .. "]"..
                "checkbox[1,1;cb_3d_clouds;".. fgettext("3D Clouds") .. ";"
                                .. dump(core.setting_getbool("enable_3d_clouds")) .. "]"..
-               "checkbox[1,1.5;cb_opaque_water;".. fgettext("Opaque Water") .. ";"
+               "checkbox[1,1.5;cb_fancy_trees;".. fgettext("Fancy Trees") .. ";"
+                               .. dump(core.setting_getbool("new_style_leaves")) .. "]"..
+               "checkbox[1,2.0;cb_opaque_water;".. fgettext("Opaque Water") .. ";"
                                .. dump(core.setting_getbool("opaque_water")) .. "]"..
-               "checkbox[1,2.0;cb_pre_ivis;".. fgettext("Preload item visuals") .. ";"
-                               .. dump(core.setting_getbool("preload_item_visuals"))   .. "]"..
-               "checkbox[1,2.5;cb_particles;".. fgettext("Enable Particles") .. ";"
-                               .. dump(core.setting_getbool("enable_particles"))       .. "]"..
+               "checkbox[1,2.5;cb_connected_glass;".. fgettext("Connected Glass") .. ";"
+                               .. dump(core.setting_getbool("connected_glass"))        .. "]"..
                "dropdown[1,3.25;3;dd_video_driver;"
                        .. video_driver_string .. ";" .. current_video_driver_idx .. "]" ..
                "tooltip[dd_video_driver;" ..
@@ -159,7 +160,7 @@ local function formspec(tabview, name, tabdata)
                "box[7.75,0;4,4;#999999]" ..
                "checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";"
                                .. dump(core.setting_getbool("enable_shaders")) .. "]"
-       if not ANDROID then
+       if PLATFORM ~= "Android" then
                tab_string = tab_string ..
                "button[8,4.75;3.75,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
        else
@@ -175,7 +176,7 @@ local function formspec(tabview, name, tabdata)
                        fgettext("Scaling factor applied to menu elements: ") ..
                        dump(core.setting_get("gui_scaling")) .. "]"
 
-       if ANDROID then
+       if PLATFORM == "Android" then
                tab_string = tab_string ..
                "box[4.25,2.75;3.25,2.15;#999999]" ..
                "checkbox[4.5,2.75;cb_touchscreen_target;".. fgettext("Touch free target") .. ";"
@@ -258,8 +259,8 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
                end
                return true
        end
-       if fields["cb_pre_ivis"] then
-               core.setting_set("preload_item_visuals", fields["cb_pre_ivis"])
+       if fields["cb_connected_glass"] then
+               core.setting_set("connected_glass", fields["cb_connected_glass"])
                return true
        end
        if fields["cb_particles"] then
@@ -317,7 +318,8 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
                ddhandled = true
        end
        if fields["dd_video_driver"] then
-               core.setting_set("video_driver",fields["dd_video_driver"])
+               local video_driver = string.gsub(fields["dd_video_driver"], " ", "")
+               core.setting_set("video_driver",string.lower(video_driver))
                ddhandled = true
        end