From b14e62dabc204fbe82e0ab530ea9d9d86d5fd460 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 23 Mar 2019 11:51:47 +0100 Subject: [PATCH] scenes/battlesystem: don't overwrite the scene menusystem --- .../scenes/battlesystem/entities/character.lua | 2 +- sonic-radiance.love/scenes/battlesystem/init.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sonic-radiance.love/scenes/battlesystem/entities/character.lua b/sonic-radiance.love/scenes/battlesystem/entities/character.lua index 541f0df..cad0685 100644 --- a/sonic-radiance.love/scenes/battlesystem/entities/character.lua +++ b/sonic-radiance.love/scenes/battlesystem/entities/character.lua @@ -70,7 +70,7 @@ function Character:update(dt) self.y = self.dy self:setAnimation("idle") self.currentAction = "selectAttack" - self.controller.menusystem:set( self ) + self.controller.menu:set( self ) end elseif (self.currentAction == "selectAttack") then diff --git a/sonic-radiance.love/scenes/battlesystem/init.lua b/sonic-radiance.love/scenes/battlesystem/init.lua index 69bf873..574bf0c 100644 --- a/sonic-radiance.love/scenes/battlesystem/init.lua +++ b/sonic-radiance.love/scenes/battlesystem/init.lua @@ -23,7 +23,7 @@ function BattleSystem:initManagers() self.actormanager = ActorManager(self) self.hud = HUD(self) self.cursor = Cursor(self) - self.menusystem = MenuSystem(self) + self.menu = MenuSystem(self) end function BattleSystem:update(dt) @@ -33,7 +33,7 @@ function BattleSystem:update(dt) self.assets:update(dt) self.actormanager:update(dt) - self.menusystem:update(dt) + self.menu:update(dt) end function BattleSystem:draw() @@ -48,7 +48,7 @@ function BattleSystem:draw() self.hud:draw() self.actormanager:draw() - self.menusystem:draw(dt) + self.menu:draw(dt) --CScreen:cease() end