summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-04-07 03:06:26 +0200
committerAki <nthirtyone@gmail.com>2017-04-07 03:06:26 +0200
commit54e85dd188af15cd5f3f5e08f5d3e69088a909b1 (patch)
tree7d188fd4142d8690321df69281ce8d5c55fbfa2b
parent37767d6c54ea6af0b4631b5ce838ee584603895e (diff)
downloadroflnauts-54e85dd188af15cd5f3f5e08f5d3e69088a909b1.zip
roflnauts-54e85dd188af15cd5f3f5e08f5d3e69088a909b1.tar.gz
roflnauts-54e85dd188af15cd5f3f5e08f5d3e69088a909b1.tar.bz2
Moved map configs to config directory
-rw-r--r--config/maps/aiguillon.lua (renamed from maps/aiguillon.lua)0
-rw-r--r--config/maps/alpha abyss.lua (renamed from maps/alpha abyss.lua)0
-rw-r--r--config/maps/default.lua (renamed from maps/default.lua)0
-rw-r--r--config/maps/readme.md (renamed from maps/readme.md)0
-rw-r--r--config/maps/ribbit.lua (renamed from maps/ribbit.lua)0
-rw-r--r--config/maps/rill.lua (renamed from maps/rill.lua)0
-rw-r--r--config/maps/sorona.lua (renamed from maps/sorona.lua)0
-rw-r--r--config/maps/starstorm.lua (renamed from maps/starstorm.lua)0
-rw-r--r--not/World.lua3
9 files changed, 1 insertions, 2 deletions
diff --git a/maps/aiguillon.lua b/config/maps/aiguillon.lua
index 40d3928..40d3928 100644
--- a/maps/aiguillon.lua
+++ b/config/maps/aiguillon.lua
diff --git a/maps/alpha abyss.lua b/config/maps/alpha abyss.lua
index 0dd2c61..0dd2c61 100644
--- a/maps/alpha abyss.lua
+++ b/config/maps/alpha abyss.lua
diff --git a/maps/default.lua b/config/maps/default.lua
index 05b8dc9..05b8dc9 100644
--- a/maps/default.lua
+++ b/config/maps/default.lua
diff --git a/maps/readme.md b/config/maps/readme.md
index dc139ad..dc139ad 100644
--- a/maps/readme.md
+++ b/config/maps/readme.md
diff --git a/maps/ribbit.lua b/config/maps/ribbit.lua
index c3f5c78..c3f5c78 100644
--- a/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
diff --git a/maps/rill.lua b/config/maps/rill.lua
index 83c02f2..83c02f2 100644
--- a/maps/rill.lua
+++ b/config/maps/rill.lua
diff --git a/maps/sorona.lua b/config/maps/sorona.lua
index 8ec4727..8ec4727 100644
--- a/maps/sorona.lua
+++ b/config/maps/sorona.lua
diff --git a/maps/starstorm.lua b/config/maps/starstorm.lua
index 7f00633..7f00633 100644
--- a/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
diff --git a/not/World.lua b/not/World.lua
index 2a6106c..bbceec4 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -79,8 +79,7 @@ end
-- TODO: Change current map model to function-based one.
function World:loadMap (name)
local name = name or "default"
- name = "maps/" .. name .. ".lua"
- local map = love.filesystem.load(name)
+ local map = love.filesystem.load(string.format("config/maps/%s.lua", name))
self.map = map()
-- Platforms
for _,platform in pairs(self.map.platforms) do