summaryrefslogtreecommitdiff
path: root/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-12-03 17:27:36 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-12-03 17:27:36 -0300
commit1a9e17acb3a65a98305d19363f6b4e7185356c74 (patch)
tree99f452f72c7ca1f585e383063466513bce6e41fc /src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
parentcc5000abb51b03dbba8ac05ece193d5f197fcf71 (diff)
Keep the code more KISS - part 1
Diffstat (limited to 'src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua')
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua7
1 files changed, 5 insertions, 2 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 3a7f8b7..92389ba 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
@@ -16,10 +16,11 @@ function love.load()
bola = require 'scripts.bola.default'
}
- bolaAnimation = require 'scripts.bola.animation'
+ gameAnimation = require 'scripts.game.animation'
bolaMotion = require 'scripts.bola.motion'
bolaGravity = require 'scripts.bola.gravity'
bolaLimit = require 'scripts.bola.limit'
+ bolaDraw = require 'scripts.bola.draw'
end
function love.keypressed(key, scancode, isrepeat)
@@ -89,7 +90,7 @@ end
function love.update(dt)
nextTime = nextTime + (1 / fps)
- bolaAnimation.animation(dt)
+ gameAnimation.animation(dt)
bolaMotion.motion(dt)
bolaGravity.motion(dt)
bolaLimit.motion(dt)
@@ -120,4 +121,6 @@ function love.draw()
character.bola.origin.y
)
}
+-- bolaDraw.motion()
+-- game.draw(metaSprites.bola, quad.bola, character.bola)
end