nalc
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

map_formspec: Remove final cartographer.skin reference

This commit is contained in:
Hugues Ross 2020-06-08 20:05:51 -04:00
parent 1d3c6dec97
commit 1f76359fbd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.lua
View File

@ -50,11 +50,11 @@ local marker_lookup = {};
local skin = loadfile(modpath .. "/skin_api.lua") ();
local gui = loadfile(modpath .. "/formspec.lua") ();
cartographer.skin = skin;
loadfile(modpath .. "/scanner.lua") (map_data, chunk);
loadfile(modpath .. "/map_api.lua") (map_data, chunk, biome_lookup, marker_lookup);
local map_formspec = loadfile(modpath .. "/map_formspec.lua") (map_data, gui, skin);
loadfile(modpath .. "/items.lua") (chunk, marker_lookup, gui, skin, map_formspec);
loadfile(modpath .. "/commands.lua") (map_formspec);
loadfile(modpath .. "/table.lua") (gui, skin);
cartographer.skin = skin;

2
map_formspec.lua
View File

@ -118,7 +118,7 @@ local function generate_map(x, y, w, h, player_x, player_y, detail, map_scale, h
end
if i == player_x and j == player_y then
local player_icon = cartographer.detail_texture(cartographer.skin.player_icons, detail);
local player_icon = cartographer.detail_texture(skin.player_icons, detail);
str = str .. gui.animated_image {
x = fx,
y = fy - height,