From faa12d4ff78fccdf8fd2d89061ddb41b815db224 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 20 Apr 2019 17:54:01 +0200 Subject: [PATCH] modules/menusystem: link a menusystem to a scene --- gamecore/modules/menusystem/init.lua | 6 +++++- gamecore/modules/scenes.lua | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gamecore/modules/menusystem/init.lua b/gamecore/modules/menusystem/init.lua index 1380743..e6b4010 100644 --- a/gamecore/modules/menusystem/init.lua +++ b/gamecore/modules/menusystem/init.lua @@ -38,7 +38,8 @@ MenuSystem.Widget = require(cwd .. "widgets") -- INIT FUNCTIONS -- Initialize and configure the menu controller -function MenuSystem:new() +function MenuSystem:new(scene) + self.scene = scene self.menus = {} self.focusedMenu = "" self.isActive = true @@ -140,6 +141,9 @@ function MenuSystem:removeDestroyedMenus() end end +-- SOUND FUNCTIONS +-- Add sounds to every menus + -- UPDATE FUNCTIONS -- Update the menus of the menusystem diff --git a/gamecore/modules/scenes.lua b/gamecore/modules/scenes.lua index 47422e6..02d6a23 100644 --- a/gamecore/modules/scenes.lua +++ b/gamecore/modules/scenes.lua @@ -37,7 +37,7 @@ function Scene:new() self.mouse.x, self.mouse.y = core.screen:getMousePosition() self.assets = Assets() - self.menusystem = MenuSystem() + self.menusystem = MenuSystem(self) self.sources = core.input:getSources() self.inputLocked = false