diff --git a/debug.lua b/debug.lua index 9a85811..fe6076d 100644 --- a/debug.lua +++ b/debug.lua @@ -23,7 +23,8 @@ local DebugSystem = Object:extend() -local lovebird = require("libs.lovebird") +local cwd = (...):gsub('%.debug$', '') .. "." +local lovebird = require(cwd .. "libs.lovebird") function DebugSystem:new(controller, active) self.controller = controller diff --git a/init.lua b/init.lua index 63bba08..63975d6 100644 --- a/init.lua +++ b/init.lua @@ -25,13 +25,15 @@ local CoreSystem = Object:extend() -local DebugSystem = require "core.debug" +local cwd = (...):gsub('%.init$', '') .. "." -local Options = require "core.options" -local Input = require "core.input" -local Screen = require "core.screen" -local Lang = require "core.lang" -local SceneManager= require "core.scenemanager" +local DebugSystem = require(cwd .. "debug") + +local Options = require(cwd .. "options") +local Input = require(cwd .. "input") +local Screen = require(cwd .. "screen") +local Lang = require(cwd .. "lang") +local SceneManager = require(cwd .. "scenemanager") function CoreSystem:new() self.debug = DebugSystem(self) diff --git a/modules/assets/autotile.lua b/modules/assets/autotile.lua index 4104303..0cfaf6d 100644 --- a/modules/assets/autotile.lua +++ b/modules/assets/autotile.lua @@ -23,7 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Tileset = require "core.modules.assets.tileset" +local cwd = (...):gsub('%.autotile$', '') .. "." +local Tileset = require(cwd .. "tileset") local Autotile = Object:extend() function Autotile:new(filepath) diff --git a/modules/assets/init.lua b/modules/assets/init.lua index b6e11dc..50812e3 100644 --- a/modules/assets/init.lua +++ b/modules/assets/init.lua @@ -24,13 +24,15 @@ local Assets = Object:extend() -local Sprite = require "core.modules.assets.sprites" -local Font = require "core.modules.assets.fonts" -local ImageFont = require "core.modules.assets.imagefonts" +local cwd = (...):gsub('%.init$', '') .. "." -local Tileset = require "core.modules.assets.tileset" -local Autotile = require "core.modules.assets.autotile" -local Background = require "core.modules.assets.background" +local Sprite = require(cwd .. "sprites") +local Font = require(cwd .. "fonts") +local ImageFont = require(cwd .. "imagefonts") + +local Tileset = require(cwd .. "tileset") +local Autotile = require(cwd .. "autotile") +local Background = require(cwd .. "background") function Assets:new() diff --git a/modules/assets/sprites.lua b/modules/assets/sprites.lua index 326db34..032f147 100644 --- a/modules/assets/sprites.lua +++ b/modules/assets/sprites.lua @@ -24,8 +24,10 @@ ]] local Sprite = Object:extend() -local Animator = require("core.modules.assets.animator") -local Tileset = require("core.modules.assets.tileset") +local cwd = (...):gsub('%.sprites$', '') .. "." + +local Animator = require(cwd .. "animator") +local Tileset = require(cwd .. "tileset") function Sprite:new(filepath) self.tileset = Tileset(filepath) diff --git a/options.lua b/options.lua index 57111c9..d7963d5 100644 --- a/options.lua +++ b/options.lua @@ -24,7 +24,8 @@ local OptionsManager = Object:extend() -local binser = require "libs.binser" +local cwd = (...):gsub('%.options$', '') .. "." +local binser = require(cwd .. "libs.binser") function OptionsManager:new() -- We begin by creating an empty data table before reading the data. diff --git a/screen.lua b/screen.lua index 4e962a8..24a3c4b 100644 --- a/screen.lua +++ b/screen.lua @@ -24,7 +24,8 @@ local ScreenManager = Object:extend() -local CScreen = require "libs.cscreen" +local cwd = (...):gsub('%.screen$', '') .. "." +local CScreen = require(cwd .. "libs.cscreen") function ScreenManager:new(controller) self.controller = controller