From 167491ecaa946b1addfc94f31039b0365278d221 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Fri, 20 Aug 2021 23:02:18 +0200
Subject: [PATCH] chore: make the scene handle its manager

---
 .../birb/core/scenemanager.lua                | 18 ++-------------
 sonic-radiance.love/birb/modules/scenes.lua   | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/sonic-radiance.love/birb/core/scenemanager.lua b/sonic-radiance.love/birb/core/scenemanager.lua
index cb5e020..e613ea9 100644
--- a/sonic-radiance.love/birb/core/scenemanager.lua
+++ b/sonic-radiance.love/birb/core/scenemanager.lua
@@ -78,14 +78,7 @@ function SceneManager:update(dt)
   end
 
   if (self.currentScene ~= nil) then
-    self.currentScene:updateStart(dt)
-    self.currentScene:setKeys()
-    self.currentScene.assets:update(dt)
-    self.currentScene:updateMenus(dt)
-    self.currentScene:updateDialog(dt)
-    self.currentScene:updateWorld(dt)
-    self.currentScene:update(dt)
-    self.currentScene:updateEnd(dt)
+    self.currentScene:updateScene(dt)
   end
 end
 
@@ -129,14 +122,7 @@ end
 function SceneManager:draw()
   self.controller.screen:apply()
   if (self.currentScene ~= nil) then
-    self.currentScene:drawStart()
-    self.currentScene:drawWorld()
-    self.currentScene:draw()
-    self.currentScene:drawMenus()
-    self.currentScene:drawDialog()
-    self.currentScene:drawEnd()
-    self.controller.screen:drawTransition()
-    self.currentScene:drawOverTransition()
+    self.currentScene:drawScene()
   end
   self.controller.screen:cease()
 end
diff --git a/sonic-radiance.love/birb/modules/scenes.lua b/sonic-radiance.love/birb/modules/scenes.lua
index b01ea17..6a9750e 100644
--- a/sonic-radiance.love/birb/modules/scenes.lua
+++ b/sonic-radiance.love/birb/modules/scenes.lua
@@ -65,6 +65,17 @@ end
 -- UPDATE FUNCTIONS
 -- Handle stuff that happens every steps
 
+function Scene:updateScene(dt)
+  self:updateStart(dt)
+  self:setKeys()
+  self.assets:update(dt)
+  self:updateMenus(dt)
+  self:updateDialog(dt)
+  self:updateWorld(dt)
+  self:update(dt)
+  self:updateEnd(dt)
+end
+
 function Scene:updateStart(dt)
 
 end
@@ -134,6 +145,17 @@ end
 -- DRAW FUNCTIONS
 -- Draw the scene and its content
 
+function Scene:drawScene()
+  self:drawStart()
+  self:drawWorld()
+  self:draw()
+  self:drawMenus()
+  self:drawDialog()
+  self:drawEnd()
+  core.screen:drawTransition()
+  self:drawOverTransition()
+end
+
 function Scene:drawStart()
 
 end