summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-18 15:16:18 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-18 15:17:01 -0300
commit98c969520e5f4696650d6fd1837992c0445cd9d6 (patch)
tree62ffbc23fa45473142ef30a48ae68abcc2d8cbc7
parent62f3cd6b655d3cceede0945060420009db8fc388 (diff)
Minor fix
-rw-r--r--src/gnu_and_bola_brawlers/meta_sprites/bola/jump.lua2
-rw-r--r--src/gnu_and_bola_brawlers/update/default.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gnu_and_bola_brawlers/meta_sprites/bola/jump.lua b/src/gnu_and_bola_brawlers/meta_sprites/bola/jump.lua
index 8543cf5..fd7e8d0 100644
--- a/src/gnu_and_bola_brawlers/meta_sprites/bola/jump.lua
+++ b/src/gnu_and_bola_brawlers/meta_sprites/bola/jump.lua
@@ -4,7 +4,7 @@ return {
love.graphics.newQuad(images.bola.x * 5, images.bola.y * 2, images.bola.x, images.bola.y, images.bola[1]:getDimensions()),
currentFrame = 1,
elapsedTime = 0,
- fps = 9,
+ fps = 1,
height = -250,
velocity = 0,
ground = windowProfile.mode.height / 2,
diff --git a/src/gnu_and_bola_brawlers/update/default.lua b/src/gnu_and_bola_brawlers/update/default.lua
index d53dbc3..8f37f6c 100644
--- a/src/gnu_and_bola_brawlers/update/default.lua
+++ b/src/gnu_and_bola_brawlers/update/default.lua
@@ -27,7 +27,7 @@ update.motion = function(character, images, metaSprite, dt)
metaSprite = character.stand
elseif character.actionLeft == true and character.actionRight == true then
metaSprite = character.stand
- elseif character.actionLeft == false and character.actionRight == false and character.actionUp == false and character.actionDown == false and character.jump.higher > 0 and character.actionA == false then
+ elseif character.actionLeft == false and character.actionRight == false and character.actionUp == false and character.actionDown == false and character.actionA == false then
metaSprite = character.stand
end