summaryrefslogtreecommitdiffhomepage
path: root/menu.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-08-14 23:00:13 +0200
committerAki <nthirtyone@gmail.com>2016-08-14 23:00:13 +0200
commit1f4b5642739f18185b026a5ad95d66680c8b76c9 (patch)
tree362d27262e6afe86f62fa8abf2765af98b654ee1 /menu.lua
parent49c6cd2edf399313f2204530ce4285299a9b6858 (diff)
downloadroflnauts-1f4b5642739f18185b026a5ad95d66680c8b76c9.zip
roflnauts-1f4b5642739f18185b026a5ad95d66680c8b76c9.tar.gz
roflnauts-1f4b5642739f18185b026a5ad95d66680c8b76c9.tar.bz2
Testing callbacks successfully
Diffstat (limited to 'menu.lua')
-rw-r--r--menu.lua9
1 files changed, 2 insertions, 7 deletions
diff --git a/menu.lua b/menu.lua
index 157fa8e..5b84f83 100644
--- a/menu.lua
+++ b/menu.lua
@@ -197,11 +197,6 @@ function Menu:startGame()
changeScene(world)
end
--- Controllers stuff
-function Menu:assignController(controller)
- controller:setParent(self)
-end
-
-- Controller callbacks
function Menu:controlpressed(set, action, key)
-- assign to character selection
@@ -212,14 +207,14 @@ function Menu:controlpressed(set, action, key)
end
end
-- map selection chaos!
- if control == "left" then
+ if action == "left" then
if self.map ~= 1 then
self.map = self.map - 1
else
self.map = #self.maplist
end
end
- if control == "right" then
+ if action == "right" then
if self.map ~= #self.maplist then
self.map = self.map + 1
else