summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-06-15 14:57:58 +0200
committerAki <nthirtyone@gmail.com>2017-06-15 14:57:58 +0200
commit20190e7e7878c9217dc2633cbb912e405c19074f (patch)
treed2140e5345d8526d18423aae8e81ed0b20ec7dd3
parent65f338b78a26784e42a232f9b0f2fdab3054e3aa (diff)
downloadroflnauts-20190e7e7878c9217dc2633cbb912e405c19074f.zip
roflnauts-20190e7e7878c9217dc2633cbb912e405c19074f.tar.gz
roflnauts-20190e7e7878c9217dc2633cbb912e405c19074f.tar.bz2
Pushing old edits
World comments and main newline a eof
-rw-r--r--main.lua2
-rw-r--r--not/World.lua7
2 files changed, 3 insertions, 6 deletions
diff --git a/main.lua b/main.lua
index 11e4d95..4a56c9d 100644
--- a/main.lua
+++ b/main.lua
@@ -82,4 +82,4 @@ end
function Controller.controlreleased (set, action, key)
Scene:controlreleased(set, action, key)
-end \ No newline at end of file
+end
diff --git a/not/World.lua b/not/World.lua
index 1ced718..99f50fa 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -14,12 +14,9 @@ World.Effects =--[[{not.Effect}]]nil
World.Rays =--[[{not.Ray}]]nil
World.camera =--[[not.Camera]]nil
World.music =--[[not.Music]]nil
--- cloud generator
World.clouds_delay = 5
--- Map
-World.map = nil
-World.background = nil
--- Gameplay status
+World.map =--[[config.maps.*]]nil
+World.background =--[[image?]]nil
World.lastNaut = false
World.win_move = 0 -- "WINNER"