diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2016-12-03 22:46:01 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2016-12-03 22:46:01 -0300 |
commit | 48651499e2aead78023bcd03f0425ba4afa98010 (patch) | |
tree | fbd2884079c5148b1dbdee8ff77c1d333b2ea5d4 /src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua | |
parent | 8a7eb73c905d5b9361a6257484834cf9e11b3058 (diff) |
Remove update.animation()
Diffstat (limited to 'src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua')
-rw-r--r-- | src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua index 80e5b50..2eada30 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/update/motion.lua @@ -1,5 +1,7 @@ +require 'scripts.game.animation' + update.motion = function(dt) - game.animation(character.bola.stand) + game.animation(character.bola.stand, dt) quad = {} quad.bola = character.bola.stand[character.bola.stand.currentFrame] @@ -37,26 +39,26 @@ function jump(dt) character.bola.jump.higher = character.bola.jump.higher - dt character.bola.jump.velocity = character.bola.jump.velocity + character.bola.jump.height * (dt / character.bola.jump.higherMax) - -- game.animation(character.bola.jump) + -- game.animation(character.bola.jump, dt) -- quad.bola = character.bola.jump[character.bola.jump.currentFrame] end end function stand(dt) - game.animation(character.bola.stand) + game.animation(character.bola.stand, dt) quad.bola = character.bola.stand[character.bola.stand.currentFrame] end function walkLeft(dt) character.bola.position.x = character.bola.position.x - (character.bola.velocity * dt) - game.animation(character.bola.walk) + game.animation(character.bola.walk, dt) quad.bola = character.bola.walk[character.bola.walk.currentFrame] character.bola.scale.x = -1 end function walkRight(dt) character.bola.position.x = character.bola.position.x + (character.bola.velocity * dt) - game.animation(character.bola.walk) + game.animation(character.bola.walk, dt) quad.bola = character.bola.walk[character.bola.walk.currentFrame] character.bola.scale.x = 1 end @@ -64,13 +66,13 @@ end function walkUp(dt) character.bola.position.y = character.bola.position.y - (character.bola.velocity * dt) character.bola.jump.ground = character.bola.position.y - game.animation(character.bola.walk) + game.animation(character.bola.walk, dt) quad.bola = character.bola.walk[character.bola.walk.currentFrame] end function walkDown(dt) character.bola.position.y = character.bola.position.y + (character.bola.velocity * dt) character.bola.jump.ground = character.bola.position.y - game.animation(character.bola.walk) + game.animation(character.bola.walk, dt) quad.bola = character.bola.walk[character.bola.walk.currentFrame] end |