Skip to content

Commit 284fefb

Browse files
committedMar 25, 2015
Remove duplicate code since 8ca08a8
1 parent b711d90 commit 284fefb

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed
 

Diff for: ‎builtin/mainmenu/common.lua

+14-17
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ local function render_client_count(n)
4040
end
4141
end
4242

43+
local function configure_selected_world_params(idx)
44+
local worldconfig = modmgr.get_worldconfig(
45+
menudata.worldlist:get_list()[idx].path)
46+
47+
if worldconfig.creative_mode ~= nil then
48+
core.setting_set("creative_mode", worldconfig.creative_mode)
49+
end
50+
if worldconfig.enable_damage ~= nil then
51+
core.setting_set("enable_damage", worldconfig.enable_damage)
52+
end
53+
end
54+
4355
--------------------------------------------------------------------------------
4456
function image_column(tooltip, flagname)
4557
return "image," ..
@@ -197,15 +209,7 @@ function menu_handle_key_up_down(fields,textlist,settingname)
197209
core.setting_set(settingname,
198210
menudata.worldlist:get_raw_index(newidx))
199211

200-
local worldconfig = modmgr.get_worldconfig(
201-
menudata.worldlist:get_list()[newidx].path)
202-
203-
if worldconfig.creative_mode ~= nil then
204-
core.setting_set("creative_mode", worldconfig.creative_mode)
205-
end
206-
if worldconfig.enable_damage ~= nil then
207-
core.setting_set("enable_damage", worldconfig.enable_damage)
208-
end
212+
configure_selected_world_params(newidx)
209213
end
210214
return true
211215
end
@@ -217,15 +221,8 @@ function menu_handle_key_up_down(fields,textlist,settingname)
217221
local newidx = oldidx + 1
218222
core.setting_set(settingname,
219223
menudata.worldlist:get_raw_index(newidx))
220-
local worldconfig = modmgr.get_worldconfig(
221-
menudata.worldlist:get_list()[newidx].path)
222224

223-
if worldconfig.creative_mode ~= nil then
224-
core.setting_set("creative_mode", worldconfig.creative_mode)
225-
end
226-
if worldconfig.enable_damage ~= nil then
227-
core.setting_set("enable_damage", worldconfig.enable_damage)
228-
end
225+
configure_selected_world_params(newidx)
229226
end
230227

231228
return true

0 commit comments

Comments
 (0)
Please sign in to comment.