scenes/battlesystem: don't overwrite the scene menusystem
This commit is contained in:
parent
2b074943ec
commit
b14e62dabc
2 changed files with 4 additions and 4 deletions
|
@ -70,7 +70,7 @@ function Character:update(dt)
|
||||||
self.y = self.dy
|
self.y = self.dy
|
||||||
self:setAnimation("idle")
|
self:setAnimation("idle")
|
||||||
self.currentAction = "selectAttack"
|
self.currentAction = "selectAttack"
|
||||||
self.controller.menusystem:set( self )
|
self.controller.menu:set( self )
|
||||||
end
|
end
|
||||||
|
|
||||||
elseif (self.currentAction == "selectAttack") then
|
elseif (self.currentAction == "selectAttack") then
|
||||||
|
|
|
@ -23,7 +23,7 @@ function BattleSystem:initManagers()
|
||||||
self.actormanager = ActorManager(self)
|
self.actormanager = ActorManager(self)
|
||||||
self.hud = HUD(self)
|
self.hud = HUD(self)
|
||||||
self.cursor = Cursor(self)
|
self.cursor = Cursor(self)
|
||||||
self.menusystem = MenuSystem(self)
|
self.menu = MenuSystem(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
function BattleSystem:update(dt)
|
function BattleSystem:update(dt)
|
||||||
|
@ -33,7 +33,7 @@ function BattleSystem:update(dt)
|
||||||
self.assets:update(dt)
|
self.assets:update(dt)
|
||||||
|
|
||||||
self.actormanager:update(dt)
|
self.actormanager:update(dt)
|
||||||
self.menusystem:update(dt)
|
self.menu:update(dt)
|
||||||
end
|
end
|
||||||
|
|
||||||
function BattleSystem:draw()
|
function BattleSystem:draw()
|
||||||
|
@ -48,7 +48,7 @@ function BattleSystem:draw()
|
||||||
self.hud:draw()
|
self.hud:draw()
|
||||||
self.actormanager:draw()
|
self.actormanager:draw()
|
||||||
|
|
||||||
self.menusystem:draw(dt)
|
self.menu:draw(dt)
|
||||||
--CScreen:cease()
|
--CScreen:cease()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue