summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--config/menus/credits.lua (renamed from config/menucredits.lua)2
-rw-r--r--config/menus/host.lua (renamed from config/menuhost.lua)4
-rw-r--r--config/menus/main.lua (renamed from config/menumain.lua)6
-rw-r--r--config/menus/select.lua (renamed from config/menuselect.lua)2
-rw-r--r--config/menus/settings.lua (renamed from config/menusettings.lua)2
-rw-r--r--not/Menu.lua4
6 files changed, 10 insertions, 10 deletions
diff --git a/config/menucredits.lua b/config/menus/credits.lua
index 0510333..6ba04b3 100644
--- a/config/menucredits.lua
+++ b/config/menus/credits.lua
@@ -11,7 +11,7 @@ return {
:setText("Go back")
:setPosition(bx,144)
:set("active", function (self)
- self.parent:open("menumain")
+ self.parent:open("main")
end)
,
element:new(menu)
diff --git a/config/menuhost.lua b/config/menus/host.lua
index ae5e3dd..47aaa5e 100644
--- a/config/menuhost.lua
+++ b/config/menus/host.lua
@@ -29,14 +29,14 @@ return {
end)
:set("active", function (self)
MAP = map_selector:getFullSelection(true)[1][1] -- please, don't kill me for this, kek
- self.parent:open("menuselect")
+ self.parent:open("select")
end)
,
button:new(menu)
:setText("Go back")
:setPosition(bx,117)
:set("active", function (self)
- self.parent:open("menumain")
+ self.parent:open("main")
end)
,
} \ No newline at end of file
diff --git a/config/menumain.lua b/config/menus/main.lua
index 4e5ef1f..661299c 100644
--- a/config/menumain.lua
+++ b/config/menus/main.lua
@@ -14,7 +14,7 @@ return {
:setText("Start")
:setPosition(bx, 80)
:set("active", function (self)
- self.parent:open("menuhost")
+ self.parent:open("host")
end)
,
button:new(menu)
@@ -28,14 +28,14 @@ return {
:setText("Settings")
:setPosition(bx, 112)
:set("active", function (self)
- self.parent:open("menusettings")
+ self.parent:open("settings")
end)
,
button:new(menu)
:setText("Credits")
:setPosition(bx, 128)
:set("active", function (self)
- self.parent:open("menucredits")
+ self.parent:open("credits")
end)
,
button:new(menu)
diff --git a/config/menuselect.lua b/config/menus/select.lua
index 7b9f073..452a3bf 100644
--- a/config/menuselect.lua
+++ b/config/menus/select.lua
@@ -41,7 +41,7 @@ return {
:setText("Go back")
:setPosition(bx,150)
:set("active", function (self)
- self.parent:open("menuhost")
+ self.parent:open("host")
end)
,
element:new(menu)
diff --git a/config/menusettings.lua b/config/menus/settings.lua
index 19f952e..bfdfc6e 100644
--- a/config/menusettings.lua
+++ b/config/menus/settings.lua
@@ -105,7 +105,7 @@ local a = {
:setText("Go back")
:setPosition(bx,144)
:set("active", function (self)
- self.parent:open("menumain")
+ self.parent:open("main")
end)
,
dimmer
diff --git a/not/Menu.lua b/not/Menu.lua
index 1be6f00..8ef1861 100644
--- a/not/Menu.lua
+++ b/not/Menu.lua
@@ -63,9 +63,9 @@ function Menu:delete ()
end
function Menu:open (name)
- local name = name or "menumain"
+ local name = name or "main"
self.active = Menu.active --Menu.active is initial
- self.elements = love.filesystem.load(string.format("config/%s.lua", name))(self)
+ self.elements = love.filesystem.load(string.format("config/menus/%s.lua", name))(self)
self.elements[self.active]:focus()
end