summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-01-14 21:05:49 +0100
committerAki <nthirtyone@gmail.com>2017-01-14 21:05:49 +0100
commit1f787dd7d68247669ebcdf71b2afab56cb1c3d9b (patch)
tree11f6586404d2ac90cf4444214d14c7b874050bb2
parent2cb2ffdbeb5c25b01ad361cc4f42724eb0a28b12 (diff)
downloadroflnauts-1f787dd7d68247669ebcdf71b2afab56cb1c3d9b.zip
roflnauts-1f787dd7d68247669ebcdf71b2afab56cb1c3d9b.tar.gz
roflnauts-1f787dd7d68247669ebcdf71b2afab56cb1c3d9b.tar.bz2
Clear commented out part
-rw-r--r--player.lua22
1 files changed, 0 insertions, 22 deletions
diff --git a/player.lua b/player.lua
index 544f89e..133e266 100644
--- a/player.lua
+++ b/player.lua
@@ -71,28 +71,6 @@ function Player:new (game, world, x, y, name)
-- Animation
o.current = o.animations.idle
o:createEffect("respawn")
- --[[ New punch mechanics
- local fixture = love.physics.newFixture(o.body, love.physics.newPolygonShape(-6,-6, -20,-6, -20,6, -6,6), 0) -- LEFT
- fixture:setSensor(true)
- fixture:setCategory(3)
- fixture:setMask(1,3)
- fixture:setGroupIndex(group)
- local fixture = love.physics.newFixture(o.body, love.physics.newPolygonShape(6,-6, 20,-6, 20,6, 6,6), 0) -- RIGHT
- fixture:setSensor(true)
- fixture:setCategory(3)
- fixture:setMask(1,3)
- fixture:setGroupIndex(group)
- o.punch_right = fixture
- local fixture = love.physics.newFixture(o.body, love.physics.newPolygonShape(-8,-7, -8,-20, 8,-20, 8,-7), 0) -- UP
- fixture:setSensor(true)
- fixture:setCategory(3)
- fixture:setMask(1,3)
- fixture:setGroupIndex(group)
- local fixture = love.physics.newFixture(o.body, love.physics.newPolygonShape(-8,7, -8,20, 8,20, 8,7), 0) -- DOWN
- fixture:setSensor(true)
- fixture:setCategory(3)
- fixture:setMask(1,3)
- fixture:setGroupIndex(group)]]
-- Portrait load for first object created
if self.portrait_sprite == nil then
self.portrait_sprite = love.graphics.newImage("assets/portraits.png")