Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Fix handheld maps not displaying in Minetest 5.5.0' (#2010) from fix-mcl-maps-in-minetest-5.5 into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2010
new_mapgen_api
cora 2022-02-24 22:47:26 +00:00
parent 85e0e23c76 27842aa2f5
commit 80c79dde1c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/ITEMS/mcl_maps/init.lua
View File

@ -147,11 +147,23 @@ function mcl_maps.load_map(id)
local texture = "mcl_maps_map_texture_" .. id .. ".tga"
if not loaded_maps[id] then
loaded_maps[id] = true
dynamic_add_media(map_textures_path .. texture, function() end)
if not minetest.features.dynamic_add_media_table then
-- minetest.dynamic_add_media() blocks in
-- Minetest 5.3 and 5.4 until media loads
loaded_maps[id] = true
dynamic_add_media(map_textures_path .. texture, function() end)
else
-- minetest.dynamic_add_media() never blocks
-- in Minetest 5.5, callback runs after load
dynamic_add_media(map_textures_path .. texture, function()
loaded_maps[id] = true
end)
end
end
return texture
if loaded_maps[id] then
return texture
end
end
function mcl_maps.load_map_item(itemstack)