summaryrefslogtreecommitdiffhomepage
path: root/main.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-05-28 22:34:00 +0200
committerAki <nthirtyone@gmail.com>2016-05-28 22:34:00 +0200
commit4f119e0e39a8055fd955d37224bda9c91f84e1a3 (patch)
tree858bde95b339ef4c1dbd3fbc4fd7eb20b21cc9ac /main.lua
parent928440ab67f4c0536f98d40061b0096ad2833271 (diff)
downloadroflnauts-4f119e0e39a8055fd955d37224bda9c91f84e1a3.zip
roflnauts-4f119e0e39a8055fd955d37224bda9c91f84e1a3.tar.gz
roflnauts-4f119e0e39a8055fd955d37224bda9c91f84e1a3.tar.bz2
Menu almost
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua22
1 files changed, 16 insertions, 6 deletions
diff --git a/main.lua b/main.lua
index 05a21f4..575b7c8 100644
--- a/main.lua
+++ b/main.lua
@@ -3,7 +3,7 @@
require "world"
require "camera"
--- require "menu"
+require "menu"
require "controller"
-- Temporary debug
@@ -25,6 +25,17 @@ function love.load ()
-- ZU WARUDO!
w = World:new("default", "leon", "lonestar", third, fourth)
+ -- Menu bijaczes
+ -- m = Menu:new()
+ -- m:newSelector()
+ -- m:newSelector()
+ -- m:newSelector()
+ -- m:newSelector()
+ -- m.selectors[1]:setPosition(40+33*1,33)
+ -- m.selectors[2]:setPosition(40+33*2,33)
+ -- m.selectors[3]:setPosition(40+33*3,33)
+ -- m.selectors[4]:setPosition(40+33*4,33)
+
-- Controllers
Controllers = {}
table.insert(Controllers, Controller:new())
@@ -32,16 +43,15 @@ function love.load ()
w.Nauts[1]:assignController(Controllers[1])
w.Nauts[2]:assignController(Controllers[2])
- -- Menu bijaczes
- -- m = Menu:new()
- -- m:newSelector()
- -- m:newSelector()
- -- m.selectors[2]:setPosition(33,33)
+ -- Menu Controllers
+ -- m:assignController(Controllers[1])
+ -- m:assignController(Controllers[2])
end
-- Update
function love.update (dt)
w:update(dt)
+ -- m:update(dt)
end
-- KeyPressed