summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob <jakob@memeware.net>2018-11-01 14:25:05 -0400
committerGitHub <noreply@github.com>2018-11-01 14:25:05 -0400
commitdb1cbb2a55b953364e8004c88749f6a8425f2606 (patch)
tree44dafc4be90cbbdd2ae4767e6a216880ba53a076
parent34d9a5224126333911ca6b5107367968e39d983d (diff)
parent30fa87ca7f76a21f22638ff4528bbb5cd7495099 (diff)
Merge pull request #1 from technomancy/appimage-compatibility
Don't assume PWD is the checkout root.
-rw-r--r--main.lua1
-rw-r--r--world.fnl2
2 files changed, 2 insertions, 1 deletions
diff --git a/main.lua b/main.lua
index 79cc40c..1ec1ac7 100644
--- a/main.lua
+++ b/main.lua
@@ -4,4 +4,5 @@ table.insert(package.loaders, fennel.make_searcher({correlate=true}))
pp = function(x) print(require("lib.fennelview")(x)) end
lume = require("lib.lume")
+fennel.path = love.filesystem.getSource() .. "/?.fnl"
require("wrap")
diff --git a/world.fnl b/world.fnl
index 947b7bc..d0870ae 100644
--- a/world.fnl
+++ b/world.fnl
@@ -333,7 +333,7 @@
;; error out if either 'maps/${name}.png' or 'maps/${name}.fnl' do not exist.
(fn new-world [name player]
(let [tiles-path (.. "maps/" name ".png")
- meta-path (.. "maps/" name ".fnl")
+ meta-path (.. (love.filesystem.getSource) "/maps/" name ".fnl")
res (load-tiles (love.image.newImageData tiles-path))
res (lume.extend res {:player player})
res (lume.extend res {:slimeballs []})