NO11
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

master #15

Merged
NO11 merged 241 commits from VoxeLibre/VoxeLibre:master into master 2022-03-12 23:42:27 +01:00
Conversation 0 Commits 241 Files Changed 295 +15 -3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 27842aa2f5 - Show all commits

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

@ -147,12 +147,24 @@ function mcl_maps.load_map(id)
local texture = "mcl_maps_map_texture_" .. id .. ".tga" local texture = "mcl_maps_map_texture_" .. id .. ".tga"
if not loaded_maps[id] then if not loaded_maps[id] then
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 loaded_maps[id] = true
dynamic_add_media(map_textures_path .. texture, function() end) 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 end
if loaded_maps[id] then
return texture return texture
end end
end
function mcl_maps.load_map_item(itemstack) function mcl_maps.load_map_item(itemstack)
return mcl_maps.load_map(itemstack:get_meta():get_string("mcl_maps:id")) return mcl_maps.load_map(itemstack:get_meta():get_string("mcl_maps:id"))