Refonte pour utiliser le systeme de GUI #112

Merged
kazhnuz merged 102 commits from feat/gui into master 2022-01-06 19:15:16 +01:00
Showing only changes of commit 30389a2655 - Show all commits

View file

@ -17,11 +17,7 @@ function BattleSystem:new(battleData)
self.assets:batchImport("assets.battle") self.assets:batchImport("assets.battle")
self:playMusic(battleData.music) self:playMusic(battleData.music)
self:initManagers(battleData) self:initManagers(battleData)
self:register()
self:startBattle() self:startBattle()
self.screen = nil self.screen = nil
@ -86,8 +82,7 @@ function BattleSystem:update(dt)
end end
function BattleSystem:draw() function BattleSystem:draw()
self.world:draw() BattleSystem.super.draw(self)
self.turns:draw()
if (self.screen ~= nil) then if (self.screen ~= nil) then
self.screen:draw() self.screen:draw()
end end