mirror of
https://github.com/notwa/mm
synced 2024-06-30 22:07:11 -07:00
abstract brush again, update titles
This commit is contained in:
parent
e75a9be4e3
commit
e6ad4d05d8
|
@ -114,7 +114,7 @@ local playas_menu = oot and Menu{
|
||||||
|
|
||||||
local main_menu = Menu{
|
local main_menu = Menu{
|
||||||
Screen{
|
Screen{
|
||||||
Text("Main Menu"),
|
Text("Main Menu #1/2"),
|
||||||
Toggle("L to Levitate", levitate),
|
Toggle("L to Levitate", levitate),
|
||||||
Toggle("A to Run Fast", supersonic),
|
Toggle("A to Run Fast", supersonic),
|
||||||
Hold("Levitate", levitate),
|
Hold("Levitate", levitate),
|
||||||
|
@ -123,6 +123,7 @@ local main_menu = Menu{
|
||||||
Back(),
|
Back(),
|
||||||
},
|
},
|
||||||
Screen{
|
Screen{
|
||||||
|
Text("Main Menu #2/2"),
|
||||||
Oneshot("Kill Link", self_destruct),
|
Oneshot("Kill Link", self_destruct),
|
||||||
Flags("some flags"),
|
Flags("some flags"),
|
||||||
Text("k"),
|
Text("k"),
|
||||||
|
@ -138,7 +139,7 @@ local input = InputHandler{
|
||||||
right = "P1 DPad R",
|
right = "P1 DPad R",
|
||||||
}
|
}
|
||||||
|
|
||||||
local handle = MenuHandler(main_menu)
|
local handle = MenuHandler(main_menu, T_TL)
|
||||||
|
|
||||||
while mm or oot do
|
while mm or oot do
|
||||||
local ctrl, pressed = input:update()
|
local ctrl, pressed = input:update()
|
||||||
|
|
|
@ -274,9 +274,10 @@ function Menu:draw(brush, y)
|
||||||
end
|
end
|
||||||
|
|
||||||
MenuHandler = Class()
|
MenuHandler = Class()
|
||||||
function MenuHandler:init(main_menu)
|
function MenuHandler:init(main_menu, brush)
|
||||||
self.main_menu = main_menu
|
self.main_menu = main_menu
|
||||||
self.backstack = {}
|
self.backstack = {}
|
||||||
|
self.brush = brush
|
||||||
self.menu = nil
|
self.menu = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -306,5 +307,5 @@ function MenuHandler:update(ctrl, pressed)
|
||||||
if new_menu and new_menu ~= self.menu then new_menu:focus() end
|
if new_menu and new_menu ~= self.menu then new_menu:focus() end
|
||||||
self.menu = new_menu
|
self.menu = new_menu
|
||||||
end
|
end
|
||||||
if self.menu then self.menu:draw(T_TL, 0) end
|
if self.menu then self.menu:draw(self.brush, 0) end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user