Small fix mainmenu and add crack_anylenght

This commit is contained in:
Maksim Gamarnik 2016-05-06 00:59:15 +03:00
parent df40c58333
commit a52fa91a77
5 changed files with 15 additions and 17 deletions

View File

@ -46,7 +46,7 @@ local function create_world_formspec(dialogdata)
current_seed = core.formspec_escape(current_seed)
local retval =
"size[12,3,true]" ..
"size[11.5,3,false]" ..
"label[2,0;" .. fgettext("World name") .. "]"..
"field[4.5,0.4;6,0.5;te_world_name;;]" ..
@ -56,11 +56,10 @@ local function create_world_formspec(dialogdata)
--"label[2,2;" .. fgettext("Mapgen") .. "]"..
--"dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" ..
"dropdown[6000.2,6;6.3;games;" .. gamemgr.gamelist() ..
";1]" ..
"dropdown[600.2,6;6.3;games;" .. gamemgr.gamelist() .. ";1]" ..
"button[5,2.6;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
"button[7.5,2.6;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
"button[3.25,2.6;2.5,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
"button[5.75,2.6;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
if #gamemgr.games == 0 then
retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" ..

View File

@ -19,7 +19,7 @@
local function delete_world_formspec(dialogdata)
local retval =
"size[12,2,true]" ..
"size[11.5,2,false]" ..
"label[2,0;" ..
fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" ..
"button[3.5,1.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes") .. "]" ..

View File

@ -24,8 +24,7 @@ mt_color_dark_green = "#003300"
local menupath = core.get_mainmenu_path()
local basepath = core.get_builtin_path()
defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
DIR_DELIM
defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" .. DIR_DELIM
dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "async_event.lua")
dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "filterlist.lua")
@ -43,7 +42,7 @@ dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
if PLATFORM ~= "Android" then
dofile(menupath .. DIR_DELIM .. "modmgr.lua")
dofile(menupath .. DIR_DELIM .. "store.lua")
-- dofile(menupath .. DIR_DELIM .. "store.lua")
dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
end
@ -131,3 +130,4 @@ local function init_globals()
end
init_globals()

View File

@ -20,8 +20,7 @@ mm_texture = {}
--------------------------------------------------------------------------------
function mm_texture.init()
mm_texture.defaulttexturedir = core.get_texturepath() .. DIR_DELIM .. "base" ..
DIR_DELIM
mm_texture.defaulttexturedir = core.get_texturepath() .. DIR_DELIM .. "base" .. DIR_DELIM
mm_texture.basetexturedir = mm_texture.defaulttexturedir
mm_texture.texturepack = core.setting_get("texture_path")

Binary file not shown.

After

Width:  |  Height:  |  Size: 908 B