summaryrefslogtreecommitdiffhomepage
path: root/menu.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-06-04 15:14:05 +0200
committerAki <nthirtyone@gmail.com>2016-06-04 15:14:05 +0200
commit3787499248fdc2d2b881b20779911733eb2678ad (patch)
tree845877c4041999a22be9c5540b2dc6359189e9e9 /menu.lua
parent26bdffd66e2b33b2dc75bbe6e3701541df6181da (diff)
downloadroflnauts-3787499248fdc2d2b881b20779911733eb2678ad.zip
roflnauts-3787499248fdc2d2b881b20779911733eb2678ad.tar.gz
roflnauts-3787499248fdc2d2b881b20779911733eb2678ad.tar.bz2
Menu actually works now
Diffstat (limited to 'menu.lua')
-rw-r--r--menu.lua14
1 files changed, 9 insertions, 5 deletions
diff --git a/menu.lua b/menu.lua
index 6f0681c..72c2087 100644
--- a/menu.lua
+++ b/menu.lua
@@ -70,7 +70,7 @@ function Menu:update(dt)
self.countdown = 3
end
if state and self.countdown < 0 then
- self.__index = self:startGame()
+ self:startGame()
end
end
@@ -110,12 +110,16 @@ end
function Menu:controllerReleased(control, controller)
end
--- WARUDO
-function Menu:startGame()
+function Menu:getNauts()
local nauts = {}
for _,selector in pairs(self.selected) do
table.insert(nauts, {selector:getSelectionName(), selector:getController()})
end
- local world = World:new("default", nauts)
- return world
+ return nauts
+end
+
+-- WARUDO
+function Menu:startGame()
+ local world = World:new("default", self:getNauts())
+ changeScene(world)
end \ No newline at end of file