From 1f76359fbd2321b1223a9df57bc566249751f83f Mon Sep 17 00:00:00 2001
From: Hugues Ross <hugues.ross@gmail.com>
Date: Mon, 8 Jun 2020 20:05:51 -0400
Subject: [PATCH] map_formspec: Remove final cartographer.skin reference

---
 init.lua         | 4 ++--
 map_formspec.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.lua b/init.lua
index 0ab1dde..19a99c3 100644
--- a/init.lua
+++ b/init.lua
@@ -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;
diff --git a/map_formspec.lua b/map_formspec.lua
index 2a6048d..c82a3ee 100644
--- a/map_formspec.lua
+++ b/map_formspec.lua
@@ -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,