summaryrefslogtreecommitdiffhomepage
path: root/decoration.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-02-08 19:18:25 +0100
committerAki <nthirtyone@gmail.com>2017-02-08 19:18:25 +0100
commita7b1bcc6872579b0ed8dbce399352d3afca1a80f (patch)
treecad837f35cc495d42385c3238de06804e8d68d07 /decoration.lua
parent939ef3d25ec3dadba9e86b04ae1e294e789175d0 (diff)
parentf44ce392bc511fdfd24c54a5ee24b09f8ff6836f (diff)
downloadroflnauts-a7b1bcc6872579b0ed8dbce399352d3afca1a80f.zip
roflnauts-a7b1bcc6872579b0ed8dbce399352d3afca1a80f.tar.gz
roflnauts-a7b1bcc6872579b0ed8dbce399352d3afca1a80f.tar.bz2
Merge branch 'animations'
Diffstat (limited to 'decoration.lua')
-rw-r--r--decoration.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/decoration.lua b/decoration.lua
index 9552b09..3ca6f76 100644
--- a/decoration.lua
+++ b/decoration.lua
@@ -4,10 +4,11 @@ Decoration = {
x = 0,
y = 0
}
+Decoration.__index = Decoration
+setmetatable(Decoration, Animated)
function Decoration:new(x, y, sprite)
local o = {}
setmetatable(o, self)
- self.__index = self
o.sprite = love.graphics.newImage(sprite)
o:setPosition(x,y)
return o
@@ -28,6 +29,5 @@ function Decoration:draw(offset_x, offset_y, scale)
local draw_x = (math.floor(x) + offset_x) * scale
local draw_y = (math.floor(y) + offset_y) * scale
-- draw
- love.graphics.setColor(255,255,255,255)
- love.graphics.draw(self.sprite, draw_x, draw_y, 0, scale, scale)
+ Animated.draw(self, draw_x, draw_y, 0, scale, scale)
end \ No newline at end of file