From 610c65491c9f354b8cd22b9b298aa7b7e4c5cf3e Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 16 Mar 2019 14:56:46 +0100 Subject: [PATCH] gamecore/modules: remove some instance of hardcoded path --- gamecore/modules/assets/imagefonts.lua | 3 ++- gamecore/modules/scenes.lua | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gamecore/modules/assets/imagefonts.lua b/gamecore/modules/assets/imagefonts.lua index 16e0b7a..3cf2c1b 100644 --- a/gamecore/modules/assets/imagefonts.lua +++ b/gamecore/modules/assets/imagefonts.lua @@ -1,4 +1,5 @@ -local Font = require "core.modules.assets.fonts" +local cwd = (...):gsub('%.imagefonts$', '') .. "." +local Font = require(cwd.. "fonts") local ImageFont = Font:extend() function ImageFont:new(filename, extraspacing) diff --git a/gamecore/modules/scenes.lua b/gamecore/modules/scenes.lua index c87f29e..fc9f2ab 100644 --- a/gamecore/modules/scenes.lua +++ b/gamecore/modules/scenes.lua @@ -22,9 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] +local cwd = (...):gsub('%.scenes$', '') .. "." + local Scene = Object:extend() -local Assets = require "core.modules.assets" -local MenuSystem = require "core.modules.menusystem" +local Assets = require(cwd .. "assets") +local MenuSystem = require(cwd .. "menusystem") function Scene:new() self.mouse = {}