summaryrefslogtreecommitdiff
path: root/src/gnu_and_bola_brawlers/main.lua
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-15 02:56:00 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-12-17 21:23:17 -0300
commitc028315038adcd71634e0af264fbff8a618a7fa8 (patch)
tree4b4a762d27323d8f75c4671309e46372e677bb2c /src/gnu_and_bola_brawlers/main.lua
parent52ce3e69e97aed2a5db7f6a7e4209961a145cdcc (diff)
Keep the code KISS
Diffstat (limited to 'src/gnu_and_bola_brawlers/main.lua')
-rw-r--r--src/gnu_and_bola_brawlers/main.lua71
1 files changed, 6 insertions, 65 deletions
diff --git a/src/gnu_and_bola_brawlers/main.lua b/src/gnu_and_bola_brawlers/main.lua
index a0e406f..c0acbc3 100644
--- a/src/gnu_and_bola_brawlers/main.lua
+++ b/src/gnu_and_bola_brawlers/main.lua
@@ -4,72 +4,13 @@ function love.load()
end
function love.keypressed(key, scancode)
- keypressed = function(character, images, metaSprite, controller, key, scancode)
- if scancode == playerController.quit then
- love.event.quit()
- end
-
- if scancode == controller.a then
- character.actionA = true
- character.actionDown = false
- character.actionUp = false
- metaSprite = require 'jump'
- end
-
- if scancode == controller.left then
- character.actionLeft = true
- end
-
- if scancode == controller.right then
- character.actionRight = true
- end
-
- if scancode == controller.up and character.jump.isJumping == false then
- character.actionUp = true
- end
-
- if scancode == controller.down and character.jump.isJumping == false then
- character.actionDown = true
- end
- end
- keypressed(character.bola, images.bola, metaSprite.bola, playerController.player1, key, scancode)
+ keypressed = require 'keypressed/trigger'
+ keypressed.trigger(character.bola, images.bola, metaSprite.bola, controller.player1, key, scancode)
end
function love.keyreleased(key, scancode)
- keyreleased = function(character, key, controller, scancode)
- if scancode == controller.a then
- character.actionA = false
- end
-
- if scancode == controller.left then
- character.actionLeft = false
- end
-
- if scancode == controller.right then
- character.actionRight = false
- end
-
- if scancode == controller.up then
- character.actionUp = false
- end
-
- if scancode == controller.down then
- character.actionDown = false
- end
-
- if scancode == controller.b then
- character.actionB = false
- end
-
- if scancode == controller.a then
- character.actionA = false
-
- if character.jump.velocity ~= 0 then
- character.jump.limitButtonJump = true
- end
- end
- end
- keyreleased(character.bola, key, playerController.player1, scancode)
+ keyreleased = require 'keyreleased/trigger'
+ keyreleased.trigger(character.bola, key, controller.player1, scancode)
end
function love.update(dt)
@@ -153,9 +94,9 @@ function love.update(dt)
character.jump.isJumping = false
character.actionA = false
- if love.keyboard.isScancodeDown(playerController.player1.up) then
+ if love.keyboard.isScancodeDown(controller.player1.up) then
character.actionUp = true
- elseif love.keyboard.isScancodeDown(playerController.player1.down) then
+ elseif love.keyboard.isScancodeDown(controller.player1.down) then
character.actionDown = true
end
end