Fix a bunch of small bugs due to mainmenu cleanup

Fix doubleclick not working in singleplayer
Fix of by one issue on accessing raw list
Fix this->self
Fix copy&paste error for scroll button

diff --git a/builtin/common/filterlist.lua b/builtin/common/filterlist.lua
index 99c4bca1ce280fb0f0cc1f459386928ea67aa79b..2106811335faeff02485c0a101807deb992073e3 100644 (file)
--- a/builtin/common/filterlist.lua
+++ b/builtin/common/filterlist.lua
@@ -37,9 +37,9 @@
 filterlist = {}
 
 --------------------------------------------------------------------------------
-function filterlist.refresh(this)
-       this.m_raw_list = this.m_raw_list_fct(this.m_fetch_param)
-       filterlist.process(this)
+function filterlist.refresh(self)
+       self.m_raw_list = self.m_raw_list_fct(self.m_fetch_param)
+       filterlist.process(self)
 end
 
 --------------------------------------------------------------------------------
@@ -48,105 +48,105 @@ function filterlist.create(raw_fct,compare_fct,uid_match_fct,filter_fct,fetch_pa
        assert((raw_fct ~= nil) and (type(raw_fct) == "function"))
        assert((compare_fct ~= nil) and (type(compare_fct) == "function"))
        
-       local this = {}
+       local self = {}
        
-       this.m_raw_list_fct  = raw_fct
-       this.m_compare_fct   = compare_fct
-       this.m_filter_fct    = filter_fct
-       this.m_uid_match_fct = uid_match_fct
+       self.m_raw_list_fct  = raw_fct
+       self.m_compare_fct   = compare_fct
+       self.m_filter_fct    = filter_fct
+       self.m_uid_match_fct = uid_match_fct
        
-       this.m_filtercriteria = nil
-       this.m_fetch_param = fetch_param
+       self.m_filtercriteria = nil
+       self.m_fetch_param = fetch_param
        
-       this.m_sortmode = "none"
-       this.m_sort_list = {}
+       self.m_sortmode = "none"
+       self.m_sort_list = {}
 
-       this.m_processed_list = nil
-       this.m_raw_list = this.m_raw_list_fct(this.m_fetch_param)
+       self.m_processed_list = nil
+       self.m_raw_list = self.m_raw_list_fct(self.m_fetch_param)
 
-       this.add_sort_mechanism = filterlist.add_sort_mechanism
-       this.set_filtercriteria = filterlist.set_filtercriteria
-       this.get_filtercriteria = filterlist.get_filtercriteria
-       this.set_sortmode       = filterlist.set_sortmode
-       this.get_list           = filterlist.get_list
-       this.get_raw_list       = filterlist.get_raw_list
-       this.get_raw_element    = filterlist.get_raw_element
-       this.get_raw_index      = filterlist.get_raw_index
-       this.get_current_index  = filterlist.get_current_index
-       this.size               = filterlist.size
-       this.uid_exists_raw     = filterlist.uid_exists_raw
-       this.raw_index_by_uid   = filterlist.raw_index_by_uid
-       this.refresh            = filterlist.refresh
+       self.add_sort_mechanism = filterlist.add_sort_mechanism
+       self.set_filtercriteria = filterlist.set_filtercriteria
+       self.get_filtercriteria = filterlist.get_filtercriteria
+       self.set_sortmode       = filterlist.set_sortmode
+       self.get_list           = filterlist.get_list
+       self.get_raw_list       = filterlist.get_raw_list
+       self.get_raw_element    = filterlist.get_raw_element
+       self.get_raw_index      = filterlist.get_raw_index
+       self.get_current_index  = filterlist.get_current_index
+       self.size               = filterlist.size
+       self.uid_exists_raw     = filterlist.uid_exists_raw
+       self.raw_index_by_uid   = filterlist.raw_index_by_uid
+       self.refresh            = filterlist.refresh
 
-       filterlist.process(this)
+       filterlist.process(self)
        
-       return this
+       return self
 end
 
 --------------------------------------------------------------------------------
-function filterlist.add_sort_mechanism(this,name,fct)
-       this.m_sort_list[name] = fct
+function filterlist.add_sort_mechanism(self,name,fct)
+       self.m_sort_list[name] = fct
 end
 
 --------------------------------------------------------------------------------
-function filterlist.set_filtercriteria(this,criteria)
-       if criteria == this.m_filtercriteria and
+function filterlist.set_filtercriteria(self,criteria)
+       if criteria == self.m_filtercriteria and
                type(criteria) ~= "table" then
                return
        end
-       this.m_filtercriteria = criteria
-       filterlist.process(this)
+       self.m_filtercriteria = criteria
+       filterlist.process(self)
 end
 
 --------------------------------------------------------------------------------
-function filterlist.get_filtercriteria(this)
-       return this.m_filtercriteria
+function filterlist.get_filtercriteria(self)
+       return self.m_filtercriteria
 end
 
 --------------------------------------------------------------------------------
 --supported sort mode "alphabetic|none"
-function filterlist.set_sortmode(this,mode)
-       if (mode == this.m_sortmode) then
+function filterlist.set_sortmode(self,mode)
+       if (mode == self.m_sortmode) then
                return
        end
-       this.m_sortmode = mode
-       filterlist.process(this)
+       self.m_sortmode = mode
+       filterlist.process(self)
 end
 
 --------------------------------------------------------------------------------
-function filterlist.get_list(this)
-       return this.m_processed_list
+function filterlist.get_list(self)
+       return self.m_processed_list
 end
 
 --------------------------------------------------------------------------------
-function filterlist.get_raw_list(this)
-       return this.m_raw_list
+function filterlist.get_raw_list(self)
+       return self.m_raw_list
 end
 
 --------------------------------------------------------------------------------
-function filterlist.get_raw_element(this,idx)
+function filterlist.get_raw_element(self,idx)
        if type(idx) ~= "number" then
                idx = tonumber(idx)
        end
        
-       if idx ~= nil and idx > 0 and idx < #this.m_raw_list then
-               return this.m_raw_list[idx]
+       if idx ~= nil and idx > 0 and idx <= #self.m_raw_list then
+               return self.m_raw_list[idx]
        end
        
        return nil
 end
 
 --------------------------------------------------------------------------------
-function filterlist.get_raw_index(this,listindex)
-       assert(this.m_processed_list ~= nil)
+function filterlist.get_raw_index(self,listindex)
+       assert(self.m_processed_list ~= nil)
        
        if listindex ~= nil and listindex > 0 and
-               listindex <= #this.m_processed_list then
-               local entry = this.m_processed_list[listindex]
+               listindex <= #self.m_processed_list then
+               local entry = self.m_processed_list[listindex]
                
-               for i,v in ipairs(this.m_raw_list) do
+               for i,v in ipairs(self.m_raw_list) do
                
-                       if this.m_compare_fct(v,entry) then
+                       if self.m_compare_fct(v,entry) then
                                return i
                        end
                end
@@ -156,16 +156,16 @@ function filterlist.get_raw_index(this,listindex)
 end
 
 --------------------------------------------------------------------------------
-function filterlist.get_current_index(this,listindex)
-       assert(this.m_processed_list ~= nil)
+function filterlist.get_current_index(self,listindex)
+       assert(self.m_processed_list ~= nil)
        
        if listindex ~= nil and listindex > 0 and
-               listindex <= #this.m_raw_list then
-               local entry = this.m_raw_list[listindex]
+               listindex <= #self.m_raw_list then
+               local entry = self.m_raw_list[listindex]
                
-               for i,v in ipairs(this.m_processed_list) do
+               for i,v in ipairs(self.m_processed_list) do
                
-                       if this.m_compare_fct(v,entry) then
+                       if self.m_compare_fct(v,entry) then
                                return i
                        end
                end
@@ -175,48 +175,48 @@ function filterlist.get_current_index(this,listindex)
 end
 
 --------------------------------------------------------------------------------
-function filterlist.process(this)
-       assert(this.m_raw_list ~= nil)
+function filterlist.process(self)
+       assert(self.m_raw_list ~= nil)
 
-       if this.m_sortmode == "none" and
-               this.m_filtercriteria == nil then
-               this.m_processed_list = this.m_raw_list
+       if self.m_sortmode == "none" and
+               self.m_filtercriteria == nil then
+               self.m_processed_list = self.m_raw_list
                return
        end
        
-       this.m_processed_list = {}
+       self.m_processed_list = {}
        
-       for k,v in pairs(this.m_raw_list) do
-               if this.m_filtercriteria == nil or
-                       this.m_filter_fct(v,this.m_filtercriteria) then
-                       table.insert(this.m_processed_list,v)
+       for k,v in pairs(self.m_raw_list) do
+               if self.m_filtercriteria == nil or
+                       self.m_filter_fct(v,self.m_filtercriteria) then
+                       table.insert(self.m_processed_list,v)
                end
        end
        
-       if this.m_sortmode == "none" then
+       if self.m_sortmode == "none" then
                return
        end
        
-       if this.m_sort_list[this.m_sortmode] ~= nil and
-               type(this.m_sort_list[this.m_sortmode]) == "function" then
+       if self.m_sort_list[self.m_sortmode] ~= nil and
+               type(self.m_sort_list[self.m_sortmode]) == "function" then
                
-               this.m_sort_list[this.m_sortmode](this)
+               self.m_sort_list[self.m_sortmode](self)
        end
 end
 
 --------------------------------------------------------------------------------
-function filterlist.size(this)
-       if this.m_processed_list == nil then
+function filterlist.size(self)
+       if self.m_processed_list == nil then
                return 0
        end
        
-       return #this.m_processed_list
+       return #self.m_processed_list
 end
 
 --------------------------------------------------------------------------------
-function filterlist.uid_exists_raw(this,uid)
-       for i,v in ipairs(this.m_raw_list) do
-               if this.m_uid_match_fct(v,uid) then
+function filterlist.uid_exists_raw(self,uid)
+       for i,v in ipairs(self.m_raw_list) do
+               if self.m_uid_match_fct(v,uid) then
                        return true
                end
        end
@@ -224,11 +224,11 @@ function filterlist.uid_exists_raw(this,uid)
 end
 
 --------------------------------------------------------------------------------
-function filterlist.raw_index_by_uid(this, uid)
+function filterlist.raw_index_by_uid(self, uid)
        local elementcount = 0
        local elementidx = 0
-       for i,v in ipairs(this.m_raw_list) do
-               if this.m_uid_match_fct(v,uid) then
+       for i,v in ipairs(self.m_raw_list) do
+               if self.m_uid_match_fct(v,uid) then
                        elementcount = elementcount +1
                        elementidx = i
                end
@@ -236,7 +236,7 @@ function filterlist.raw_index_by_uid(this, uid)
        
        
        -- If there are more elements than one with same name uid can't decide which
-       -- one is meant. This shouldn't be possible but just for sure.
+       -- one is meant. self shouldn't be possible but just for sure.
        if elementcount > 1 then
                elementidx=0
        end
@@ -267,9 +267,9 @@ function compare_worlds(world1,world2)
 end
 
 --------------------------------------------------------------------------------
-function sort_worlds_alphabetic(this)
+function sort_worlds_alphabetic(self)
 
-       table.sort(this.m_processed_list, function(a, b)
+       table.sort(self.m_processed_list, function(a, b)
                --fixes issue #857 (crash due to sorting nil in worldlist)
                if a == nil or b == nil then
                        if a == nil and b ~= nil then return false end
@@ -284,9 +284,9 @@ function sort_worlds_alphabetic(this)
 end
 
 --------------------------------------------------------------------------------
-function sort_mod_list(this)
+function sort_mod_list(self)
 
-       table.sort(this.m_processed_list, function(a, b)
+       table.sort(self.m_processed_list, function(a, b)
                -- Show game mods at bottom
                if a.typ ~= b.typ then
                        return b.typ == "game_mod"

diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua
index f5ac8905e4939a8daccdd5e9477d8114f05539f7..769bfb0bead60e5f7436addec84190f7fc61830d 100644 (file)
--- a/builtin/fstk/buttonbar.lua
+++ b/builtin/fstk/buttonbar.lua
@@ -101,7 +101,7 @@ local function buttonbar_formspec(self)
                                        self.name, text_dec)
                                
                formspec = formspec ..
-                       string.format("image_button[%f,%f;%f,%f;;btnbar_dec_%s;%s;true;true]",
+                       string.format("image_button[%f,%f;%f,%f;;btnbar_inc_%s;%s;true;true]",
                                        btn_inc_pos.x, btn_inc_pos.y, btn_size.x, btn_size.y,
                                         self.name, text_inc)
        end

diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua
index c1dd6f50119c9385d794c4ab61144f80f44730be..154a54cc71116a6a74f5eed09dcfece50d3aeb04 100644 (file)
--- a/builtin/mainmenu/tab_server.lua
+++ b/builtin/mainmenu/tab_server.lua
@@ -74,6 +74,7 @@ local function main_button_handler(this, fields, name, tabdata)
                if event.type == "CHG" then
                        core.setting_set("mainmenu_last_selected_world",
                                menudata.worldlist:get_raw_index(core.get_textlist_index("srv_worlds")))
+                       return true
                end
        end
 
@@ -83,14 +84,17 @@ local function main_button_handler(this, fields, name, tabdata)
 
        if fields["cb_creative_mode"] then
                core.setting_set("creative_mode", fields["cb_creative_mode"])
+               return true
        end
 
        if fields["cb_enable_damage"] then
                core.setting_set("enable_damage", fields["cb_enable_damage"])
+               return true
        end
 
        if fields["cb_server_announce"] then
                core.setting_set("server_announce", fields["cb_server_announce"])
+               return true
        end
 
        if fields["start_server"] ~= nil or
@@ -111,9 +115,11 @@ local function main_button_handler(this, fields, name, tabdata)
 
                        --update last game
                        local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
+                       
                        local game,index = gamemgr.find_by_gameid(world.gameid)
                        core.setting_set("menu_last_game",game.id)
                        core.start()
+                       return true
                end
        end
 

diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua
index 244221c373612c52065707f231fb6087b07c0fcf..1eab94da36a13d82b8abf571ec990d71ffff4f6e 100644 (file)
--- a/builtin/mainmenu/tab_singleplayer.lua
+++ b/builtin/mainmenu/tab_singleplayer.lua
@@ -112,9 +112,8 @@ local function main_button_handler(this, fields, name, tabdata)
                if event.type == "CHG" then
                        core.setting_set("mainmenu_last_selected_world",
                                menudata.worldlist:get_raw_index(core.get_textlist_index("sp_worlds")))
+                       return true
                end
-               
-               return true
        end
 
        if menu_handle_key_up_down(fields,"sp_worlds","mainmenu_last_selected_world") then
@@ -135,9 +134,11 @@ local function main_button_handler(this, fields, name, tabdata)
                world_doubleclick or
                fields["key_enter"] then
                local selected = core.get_textlist_index("sp_worlds")
+               
                if selected ~= nil then
-                       gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
-                       gamedata.singleplayer   = true
+                       gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
+                       gamedata.singleplayer   = true
+                       
                        core.start()
                end
                return true