Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filterlist api cleanup

This commit is contained in:
sapier 2013-07-15 23:02:18 +02:00 committed by PilzAdam
parent baf5614880
commit 8a1658ec3e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mainmenu_worldlist.lua → builtin/filterlist.lua
View File

@ -90,7 +90,7 @@ function filterlist.get_raw_element(this,idx)
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function filterlist.get_engine_index(this,listindex) function filterlist.get_raw_index(this,listindex)
assert(this.m_processed_list ~= nil) assert(this.m_processed_list ~= nil)
if listindex ~= nil and listindex > 0 and if listindex ~= nil and listindex > 0 and
@ -177,7 +177,7 @@ function filterlist.uid_exists_raw(this,uid)
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function filterlist.engine_index_by_uid(this, uid) function filterlist.raw_index_by_uid(this, uid)
local elementcount = 0 local elementcount = 0
local elementidx = 0 local elementidx = 0
for i,v in ipairs(this.m_raw_list) do for i,v in ipairs(this.m_raw_list) do

24
builtin/mainmenu.lua
View File

@ -7,7 +7,7 @@ mt_color_blue = "#0000DD"
mt_color_green = "#00DD00" mt_color_green = "#00DD00"
mt_color_dark_green = "#003300" mt_color_dark_green = "#003300"
dofile(scriptpath .. DIR_DELIM .. "mainmenu_worldlist.lua") dofile(scriptpath .. DIR_DELIM .. "filterlist.lua")
dofile(scriptpath .. DIR_DELIM .. "modmgr.lua") dofile(scriptpath .. DIR_DELIM .. "modmgr.lua")
dofile(scriptpath .. DIR_DELIM .. "modstore.lua") dofile(scriptpath .. DIR_DELIM .. "modstore.lua")
dofile(scriptpath .. DIR_DELIM .. "gamemgr.lua") dofile(scriptpath .. DIR_DELIM .. "gamemgr.lua")
@ -430,7 +430,7 @@ function menu.handle_key_up_down(fields,textlist,settingname)
if oldidx > 1 then if oldidx > 1 then
local newidx = oldidx -1 local newidx = oldidx -1
engine.setting_set(settingname, engine.setting_set(settingname,
filterlist.get_engine_index(worldlist,newidx)) filterlist.get_raw_index(worldlist,newidx))
end end
end end
@ -440,7 +440,7 @@ function menu.handle_key_up_down(fields,textlist,settingname)
if oldidx < filterlist.size(worldlist) then if oldidx < filterlist.size(worldlist) then
local newidx = oldidx + 1 local newidx = oldidx + 1
engine.setting_set(settingname, engine.setting_set(settingname,
filterlist.get_engine_index(worldlist,newidx)) filterlist.get_raw_index(worldlist,newidx))
end end
end end
end end
@ -618,7 +618,7 @@ function tabbuilder.handle_create_world_buttons(fields)
filterlist.refresh(worldlist) filterlist.refresh(worldlist)
engine.setting_set("mainmenu_last_selected_world", engine.setting_set("mainmenu_last_selected_world",
filterlist.engine_index_by_uid(worldlist,worldname)) filterlist.raw_index_by_uid(worldlist,worldname))
end end
else else
gamedata.errormessage = "No worldname given or no game selected" gamedata.errormessage = "No worldname given or no game selected"
@ -789,7 +789,7 @@ function tabbuilder.handle_server_buttons(fields)
end end
if event.typ == "CHG" then if event.typ == "CHG" then
engine.setting_set("mainmenu_last_selected_world", engine.setting_set("mainmenu_last_selected_world",
filterlist.get_engine_index(worldlist,engine.get_textlist_index("srv_worlds"))) filterlist.get_raw_index(worldlist,engine.get_textlist_index("srv_worlds")))
end end
end end
@ -816,7 +816,7 @@ function tabbuilder.handle_server_buttons(fields)
gamedata.password = fields["te_passwd"] gamedata.password = fields["te_passwd"]
gamedata.port = fields["te_serverport"] gamedata.port = fields["te_serverport"]
gamedata.address = "" gamedata.address = ""
gamedata.selected_world = filterlist.get_engine_index(worldlist,selected) gamedata.selected_world = filterlist.get_raw_index(worldlist,selected)
menu.update_last_game(gamedata.selected_world) menu.update_last_game(gamedata.selected_world)
engine.start() engine.start()
@ -837,7 +837,7 @@ function tabbuilder.handle_server_buttons(fields)
if world ~= nil and if world ~= nil and
world.name ~= nil and world.name ~= nil and
world.name ~= "" then world.name ~= "" then
menu.world_to_del = filterlist.get_engine_index(worldlist,selected) menu.world_to_del = filterlist.get_raw_index(worldlist,selected)
tabbuilder.current_tab = "dialog_delete_world" tabbuilder.current_tab = "dialog_delete_world"
tabbuilder.is_dialog = true tabbuilder.is_dialog = true
tabbuilder.show_buttons = false tabbuilder.show_buttons = false
@ -850,7 +850,7 @@ function tabbuilder.handle_server_buttons(fields)
if fields["world_configure"] ~= nil then if fields["world_configure"] ~= nil then
selected = engine.get_textlist_index("srv_worlds") selected = engine.get_textlist_index("srv_worlds")
if selected > 0 then if selected > 0 then
modmgr.world_config_selected_world = filterlist.get_engine_index(worldlist,selected) modmgr.world_config_selected_world = filterlist.get_raw_index(worldlist,selected)
if modmgr.init_worldconfig() then if modmgr.init_worldconfig() then
tabbuilder.current_tab = "dialog_configure_world" tabbuilder.current_tab = "dialog_configure_world"
tabbuilder.is_dialog = true tabbuilder.is_dialog = true
@ -930,7 +930,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
if event.typ == "CHG" then if event.typ == "CHG" then
engine.setting_set("mainmenu_last_selected_world", engine.setting_set("mainmenu_last_selected_world",
filterlist.get_engine_index(worldlist,engine.get_textlist_index("sp_worlds"))) filterlist.get_raw_index(worldlist,engine.get_textlist_index("sp_worlds")))
end end
end end
@ -949,7 +949,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
fields["key_enter"] then fields["key_enter"] then
local selected = engine.get_textlist_index("sp_worlds") local selected = engine.get_textlist_index("sp_worlds")
if selected > 0 then if selected > 0 then
gamedata.selected_world = filterlist.get_engine_index(worldlist,selected) gamedata.selected_world = filterlist.get_raw_index(worldlist,selected)
gamedata.singleplayer = true gamedata.singleplayer = true
menu.update_last_game(gamedata.selected_world) menu.update_last_game(gamedata.selected_world)
@ -972,7 +972,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
if world ~= nil and if world ~= nil and
world.name ~= nil and world.name ~= nil and
world.name ~= "" then world.name ~= "" then
menu.world_to_del = filterlist.get_engine_index(worldlist,selected) menu.world_to_del = filterlist.get_raw_index(worldlist,selected)
tabbuilder.current_tab = "dialog_delete_world" tabbuilder.current_tab = "dialog_delete_world"
tabbuilder.is_dialog = true tabbuilder.is_dialog = true
tabbuilder.show_buttons = false tabbuilder.show_buttons = false
@ -985,7 +985,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
if fields["world_configure"] ~= nil then if fields["world_configure"] ~= nil then
selected = engine.get_textlist_index("sp_worlds") selected = engine.get_textlist_index("sp_worlds")
if selected > 0 then if selected > 0 then
modmgr.world_config_selected_world = filterlist.get_engine_index(worldlist,selected) modmgr.world_config_selected_world = filterlist.get_raw_index(worldlist,selected)
if modmgr.init_worldconfig() then if modmgr.init_worldconfig() then
tabbuilder.current_tab = "dialog_configure_world" tabbuilder.current_tab = "dialog_configure_world"
tabbuilder.is_dialog = true tabbuilder.is_dialog = true

2
builtin/modmgr.lua
View File

@ -973,7 +973,7 @@ function modmgr.mod_exists(basename)
modmgr.refresh_globals() modmgr.refresh_globals()
end end
if filterlist.engine_index_by_uid(modmgr.global_mods,basename) > 0 then if filterlist.raw_index_by_uid(modmgr.global_mods,basename) > 0 then
return true return true
end end