Merge branch 'com'

1 files changed, 0 insertions, 33 deletions

diff --git a/decoration.lua b/decoration.lua
deleted file mode 100644
index 3ca6f76..0000000
--- a/decoration.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-Decoration = {
-	world = nil,
-	sprite = nil,
-	x = 0,
-	y = 0
-}
-Decoration.__index = Decoration
-setmetatable(Decoration, Animated)
-function Decoration:new(x, y, sprite)
-	local o = {}
-	setmetatable(o, self)
-	o.sprite = love.graphics.newImage(sprite)
-	o:setPosition(x,y)
-	return o
-end
-function Decoration:setPosition(x, y)
-	self.x, self.y = x, y
-end
-function Decoration:getPosition()
-	return self.x, self.y
-end
-function Decoration:draw(offset_x, offset_y, scale)
-	-- locals
-	local offset_x = offset_x or 0
-	local offset_y = offset_y or 0
-	local scale = scale or 1
-	local x, y = self:getPosition()
-	-- pixel grid
-	local draw_x = (math.floor(x) + offset_x) * scale
-	local draw_y = (math.floor(y) + offset_y) * scale
-	-- draw
-	Animated.draw(self, draw_x, draw_y, 0, scale, scale)
-end
\ No newline at end of file