From 1b5a2e9c6e45d1eaa4be99a624ccabe1d4cc84e6 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 5 May 2019 20:30:39 +0200 Subject: [PATCH] modules/world: derive the Actor2D from the base actor --- gamecore/modules/world/actors/actor2D.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gamecore/modules/world/actors/actor2D.lua b/gamecore/modules/world/actors/actor2D.lua index 46a7a00..13c9e16 100644 --- a/gamecore/modules/world/actors/actor2D.lua +++ b/gamecore/modules/world/actors/actor2D.lua @@ -23,16 +23,16 @@ ]] local cwd = (...):gsub('%.actor2D$', '') .. "." +local BaseActor = require(cwd .. "baseactor") +local Actor2D = BaseActor:extend() -local Actor2D = Object:extend() local Timer = require(cwd .. "utils.timer") -- INIT FUNCTIONS -- Initialise the actor and its base functions function Actor2D:new(world, type, x, y, w, h, isSolid) - self.type = type or "" - + Actor2D.super.new(self, world, type) self:setManagers(world) self:initPhysics(x, y, w, h, isSolid)