From 1213e1e2831805ebb5d193702e02c59c2927e54a Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 24 Aug 2016 13:29:13 +0200 Subject: Almost the same functionality --- config/menumain.lua | 12 ++++++------ config/menuselect.lua | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/menumain.lua b/config/menumain.lua index 2d92817..cb53714 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -5,31 +5,31 @@ local header = require "header" local element = require "element" local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() -local button_x = width/2-29 +local bx = width/2-29 return { button:new(menu) :setText("Start") - :setPosition(button_x, 80) + :setPosition(bx, 80) :set("active", function (self) self.parent:load("menuselect") end) , button:new(menu) :setText("Join") - :setPosition(button_x, 96) + :setPosition(bx, 96) , button:new(menu) :setText("Settings") - :setPosition(button_x, 112) + :setPosition(bx, 112) , button:new(menu) :setText("Credits") - :setPosition(button_x, 128) + :setPosition(bx, 128) , button:new(menu) :setText("Exit") - :setPosition(button_x, 144) + :setPosition(bx, 144) :set("active", love.event.quit) , element:new(menu) diff --git a/config/menuselect.lua b/config/menuselect.lua index ffdda7f..8d646ba 100644 --- a/config/menuselect.lua +++ b/config/menuselect.lua @@ -4,10 +4,13 @@ local button = require "button" local selector = require "selector" local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() +local bx = width/2-29 + +local naut_selector = selector:new(menu) return { - selector:new(menu) - :setPosition(width/2,10) + naut_selector + :setPosition(width/2,60) :setMargin(8) :setSize(32, 32) :set("list", require "nautslist") @@ -17,8 +20,15 @@ return { :init() , button:new(menu) + :setText("Force start") + :setPosition(bx,101) + :set("active", function (self) + changeScene(World:new(nil,naut_selector:getFullSelection(false))) + end) + , + button:new(menu) :setText("Go back") - :setPosition(10,height-25) + :setPosition(bx,117) :set("active", function (self) self.parent:load("menumain") end) -- cgit v1.1