MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stack_max = 64, fix loadingworld background

Browse Source
This commit is contained in:
MoNTE48 2018-08-22 00:39:35 +02:00
parent 3cbb4223b3
commit f58dc36f6f
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/game/item.lua
View File

@ -552,7 +552,7 @@ core.nodedef_default = {
inventory_image = "", inventory_image = "",
wield_image = "", wield_image = "",
wield_scale = {x=1,y=1,z=1}, wield_scale = {x=1,y=1,z=1},
stack_max = 99, stack_max = 64,
usable = false, usable = false,
liquids_pointable = false, liquids_pointable = false,
tool_capabilities = nil, tool_capabilities = nil,
@ -616,7 +616,7 @@ core.craftitemdef_default = {
inventory_image = "", inventory_image = "",
wield_image = "", wield_image = "",
wield_scale = {x=1,y=1,z=1}, wield_scale = {x=1,y=1,z=1},
stack_max = 99, stack_max = 64,
liquids_pointable = false, liquids_pointable = false,
tool_capabilities = nil, tool_capabilities = nil,
@ -654,7 +654,7 @@ core.noneitemdef_default = { -- This is used for the hand and unknown items
inventory_image = "", inventory_image = "",
wield_image = "", wield_image = "",
wield_scale = {x=1,y=1,z=1}, wield_scale = {x=1,y=1,z=1},
stack_max = 99, stack_max = 64,
liquids_pointable = false, liquids_pointable = false,
tool_capabilities = nil, tool_capabilities = nil,

1
builtin/mainmenu/tab_credits.lua
View File

@ -23,6 +23,7 @@ local multicraft_developers = {
"Alexander Zavrin (Ransom.00)", "Alexander Zavrin (Ransom.00)",
"sfan5 <sfan5@live.de>", "sfan5 <sfan5@live.de>",
"stujones11 Stuart Jones <stujones111@gmail.com>", "stujones11 Stuart Jones <stujones111@gmail.com>",
"paramat",
"And other people who helped make the world better!", "And other people who helped make the world better!",
} }

9
builtin/mainmenu/textures.lua
View File

@ -171,14 +171,7 @@ function mm_texture.set_game(identifier, gamedetails)
end end
function mm_texture.set_dirt_bg() function mm_texture.set_dirt_bg()
if mm_texture.texturepack ~= nil then
local path = mm_texture.texturepack .. DIR_DELIM .."default_dirt.png"
if core.set_background("background", path, true, 128) then
return true
end
end
-- Use universal fallback texture in textures/base/pack -- Use universal fallback texture in textures/base/pack
local minimalpath = defaulttexturedir .. "bg.png" local minimalpath = defaulttexturedir .. "bg.png"
core.set_background("background", minimalpath, true, 128) core.set_background("background", minimalpath, true, 64)
end end

4
src/drawscene.cpp
View File

@ -618,8 +618,8 @@ void draw_load_screen(const std::wstring &text, IrrlichtDevice* device,
{ {
driver->beginScene(true, true, video::SColor(255, 0, 0, 0)); driver->beginScene(true, true, video::SColor(255, 0, 0, 0));
video::ITexture *background_image = driver->getTexture((porting::path_share + "/textures/base/bg.png").c_str()); video::ITexture *background_image = driver->getTexture((porting::path_share + "/textures/base/bg.png").c_str());
draw2DImageFilterScaled(driver, background_image, driver->draw2DImage(background_image,
irr::core::rect<s32>(0, 0, screensize.X*2, screensize.Y*2), irr::core::rect<s32>(0, 0, screensize.X, screensize.Y),
irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0, false); irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0, false);
} }