summaryrefslogtreecommitdiff
path: root/src/gnu_and_bola_brawlers/main.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/gnu_and_bola_brawlers/main.lua')
-rw-r--r--src/gnu_and_bola_brawlers/main.lua22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gnu_and_bola_brawlers/main.lua b/src/gnu_and_bola_brawlers/main.lua
index 78a4e98..3677fd4 100644
--- a/src/gnu_and_bola_brawlers/main.lua
+++ b/src/gnu_and_bola_brawlers/main.lua
@@ -4,7 +4,7 @@ function love.load()
end
function love.keypressed(key, scancode)
- keypressed = function(character, metaSprites, sprite, controller, key, scancode)
+ keypressed = function(character, images, sprite, controller, key, scancode)
if scancode == playerController.quit then
love.event.quit()
end
@@ -32,7 +32,7 @@ function love.keypressed(key, scancode)
character.actionDown = true
end
end
- keypressed(character.bola, metaSprites.bola, sprite.bola, playerController.player1, key, scancode)
+ keypressed(character.bola, images.bola, sprite.bola, playerController.player1, key, scancode)
end
function love.keyreleased(key, scancode)
@@ -75,7 +75,7 @@ end
function love.update(dt)
nextTime = nextTime + (1 / fps)
- animation = function(sprite, metaSprites, dt)
+ animation = function(sprite, images, dt)
--Increase actual elapsed time with new dt
sprite.elapsedTime = sprite.elapsedTime + dt --AnimationStart
@@ -89,11 +89,11 @@ function love.update(dt)
end
end
- metaSprites.quad = sprite[sprite.currentFrame] --Update with new fame
+ images.quad = sprite[sprite.currentFrame] --Update with new fame
end
- animation(sprite.bola, metaSprites.bola, dt)
+ animation(sprite.bola, images.bola, dt)
- motion = function(character, metaSprites, sprite, dt)
+ motion = function(character, images, sprite, dt)
if character.jump.higher > 0 and character.actionA == true then
if character.jump.limitButtonJump == false then
character.jump.higher = character.jump.higher - dt
@@ -135,7 +135,7 @@ function love.update(dt)
return sprite
end
- sprite.bola = motion(character.bola, metaSprites.bola, sprite.bola, dt)
+ sprite.bola = motion(character.bola, images.bola, sprite.bola, dt)
gravity = function(character, dt)
if character.jump.velocity ~= 0 then
@@ -190,10 +190,10 @@ function love.draw()
love.graphics.print('FPS: ' .. love.timer.getFPS(), 0, 0)
- draw = function(metaSprites, character)
+ draw = function(images, character)
love.graphics.draw(
- metaSprites.image,
- metaSprites.quad,
+ images[1],
+ images.quad,
character.position.x,
character.position.y,
character.orientation,
@@ -203,5 +203,5 @@ function love.draw()
character.origin.y
)
end
- draw(metaSprites.bola, character.bola)
+ draw(images.bola, character.bola)
end