summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-11-24 02:17:18 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-11-24 15:42:39 -0300
commit680a2646b01817323853c970e43bd1e31a675b4b (patch)
treeb332a0bcf731c761aa968f5162c4cfc107691e50
parent82aa663df783372aa3fff4a5bf70ed66e8c213f4 (diff)
Rename quad to quad.bola
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua2
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua16
2 files changed, 13 insertions, 5 deletions
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
index b0cf520..8ba5370 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
@@ -46,7 +46,7 @@ function love.draw()
love.graphics.print('FPS: ' .. love.timer.getFPS(), 0, 0)
love.graphics.draw(
metaSprites.bola.image,
- quad,
+ quad.bola,
character.bola.position.x,
character.bola.position.y,
character.bola.orientation,
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
index caf602b..d153207 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
@@ -21,7 +21,9 @@ function left(dt)
character.bola.position.x = character.bola.position.x - (character.bola.speed * dt) - 3
end
end
- quad = character.bola.walk[math.floor(character.bola.walk.start)]
+ quad = {
+ bola = character.bola.walk[math.floor(character.bola.walk.start)]
+ }
character.bola.scale.x = -1
end
@@ -34,19 +36,25 @@ function right(dt)
character.bola.position.x = character.bola.position.x + (character.bola.speed * dt) + 3
end
end
- quad = character.bola.walk[math.floor(character.bola.walk.start)]
+ quad = {
+ bola = character.bola.walk[math.floor(character.bola.walk.start)]
+ }
character.bola.scale.x = 1
end
function down(dt)
character.bola.acceleration = 0
transform.bola.origin.y = character.bola.origin.y - character.bola.origin.y
- quad = character.bola.crouch[1]
+ quad = {
+ bola = character.bola.crouch[1]
+ }
end
function stand(dt)
character.bola.acceleration = 0
- quad = character.bola.stand[math.floor(character.bola.stand.start)]
+ quad = {
+ bola = character.bola.stand[math.floor(character.bola.stand.start)]
+ }
end
return motionModule