From 1ba8d6d2515d1c6631b6bdc6d148ec7c3692d3f3 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 9 Mar 2019 17:58:07 +0100 Subject: [PATCH] scenes/mainmenu: refactor the listmenu file --- .../scenes/debugmenu/menuobject.lua | 25 -------------- .../scenes/debugmenu/menus.lua | 34 +++++++++++++++---- 2 files changed, 27 insertions(+), 32 deletions(-) delete mode 100644 imperium-porcorum.love/scenes/debugmenu/menuobject.lua diff --git a/imperium-porcorum.love/scenes/debugmenu/menuobject.lua b/imperium-porcorum.love/scenes/debugmenu/menuobject.lua deleted file mode 100644 index 8a09a38..0000000 --- a/imperium-porcorum.love/scenes/debugmenu/menuobject.lua +++ /dev/null @@ -1,25 +0,0 @@ -local ListBox = require "core.modules.menusystem.listbox" - -local MenuObject = ListBox:extend() -local Widgets = require "scenes.debugmenu.widgets" - -function MenuObject:new(scene, name) - local screenwidth, screenheight = core.screen:getDimensions() - local height, width, x, y - height = screenheight - (88 + 24) - width = 240 - x = screenwidth/2 - width/2 - y = screenheight/2 - height/2 - 8 - - MenuObject.super.new(self, scene.menusystem, name, x, y, width, height, 5) - self.scene = scene - - self.isActive = false - self.isVisible = false -end - -function MenuObject:draw() - MenuObject.super.draw(self) -end - -return MenuObject diff --git a/imperium-porcorum.love/scenes/debugmenu/menus.lua b/imperium-porcorum.love/scenes/debugmenu/menus.lua index 9c0bfc6..18c4b94 100644 --- a/imperium-porcorum.love/scenes/debugmenu/menus.lua +++ b/imperium-porcorum.love/scenes/debugmenu/menus.lua @@ -1,12 +1,32 @@ local menu = {} -local menuParent = require "scenes.debugmenu.menuobject" +local ListBox = require "core.modules.menusystem.listbox" +local MenuObject = ListBox:extend() -menu.Main = menuParent:extend() -menu.Debug = menuParent:extend() -menu.Levels = menuParent:extend() -menu.Bonus = menuParent:extend() -menu.Pigs = menuParent:extend() -menu.Options = menuParent:extend() +function MenuObject:new(scene, name) + local screenwidth, screenheight = core.screen:getDimensions() + local height, width, x, y + height = screenheight - (88 + 24) + width = 240 + x = screenwidth/2 - width/2 + y = screenheight/2 - height/2 - 8 + + MenuObject.super.new(self, scene.menusystem, name, x, y, width, height, 5) + self.scene = scene + + self.isActive = false + self.isVisible = false +end + +function MenuObject:draw() + MenuObject.super.draw(self) +end + +menu.Main = MenuObject:extend() +menu.Debug = MenuObject:extend() +menu.Levels = MenuObject:extend() +menu.Bonus = MenuObject:extend() +menu.Pigs = MenuObject:extend() +menu.Options = MenuObject:extend() local widgets = require "scenes.debugmenu.widgets"