diff options
| author | Aki <nthirtyone@gmail.com> | 2017-09-22 22:21:05 +0200 |
|---|---|---|
| committer | Aki <nthirtyone@gmail.com> | 2017-09-22 22:21:05 +0200 |
| commit | f0d20bb0667f9bafd0075fd506e2a0b40e84e869 (patch) | |
| tree | 879e67a4b235373f760f581e82b6ff1f0c60dcde /config/menus | |
| parent | bad3e12962e2c7040090ec678d3ed6cfd5586288 (diff) | |
| download | roflnauts-f0d20bb0667f9bafd0075fd506e2a0b40e84e869.zip roflnauts-f0d20bb0667f9bafd0075fd506e2a0b40e84e869.tar.gz roflnauts-f0d20bb0667f9bafd0075fd506e2a0b40e84e869.tar.bz2 | |
Maps can be unavailable now too; changed loadConfigs to reflect that
Diffstat (limited to 'config/menus')
| -rw-r--r-- | config/menus/host.lua | 25 | ||||
| -rw-r--r-- | config/menus/select.lua | 25 |
2 files changed, 44 insertions, 6 deletions
diff --git a/config/menus/host.lua b/config/menus/host.lua index ce67047..2b5fac5 100644 --- a/config/menus/host.lua +++ b/config/menus/host.lua @@ -10,7 +10,23 @@ if background == nil or not background:is(require "not.MenuBackground") then background = require "not.MenuBackground"(menu) end --- TODO: loadConfigs is duplicated in menus/select and menus/host. +-- TODO: loadConfigs and isAvailable are duplicated in menus/select and menus/host. +local +function isAvailable (item) + if item then + if debug then + return true + end + local at = type(item.available) + if at == "boolean" then + return item.available + end + if at == "string" then + return false + end + end +end + local function loadConfigs (dir, process) local items, icons = {}, {} @@ -18,7 +34,10 @@ function loadConfigs (dir, process) local path = string.format("%s/%s", dir, file) if love.filesystem.isFile(path) and file ~= "readme.md" then local item = love.filesystem.load(path)() - if item and process(item, file, path) then + if isAvailable(item) then + if process then + process(item, file, path) + end table.insert(icons, love.graphics.newImage(item.portrait)) table.insert(items, item) end @@ -28,7 +47,7 @@ function loadConfigs (dir, process) end -- TODO: This is temporary solution for generating available maps list and portraits for them to pass to Selector. -local maps, icons = loadConfigs("config/maps", function (map, _, path) map.filename = path; return true end) +local maps, icons = loadConfigs("config/maps", function (map, _, path) map.filename = path end) local mapSelector = Selector(maps, nil, menu) return { diff --git a/config/menus/select.lua b/config/menus/select.lua index d101472..9f0ed9b 100644 --- a/config/menus/select.lua +++ b/config/menus/select.lua @@ -14,7 +14,23 @@ if background == nil or not background:is(require "not.MenuBackground") then background = require "not.MenuBackground"(menu) end --- TODO: loadConfigs is duplicated in menus/select and menus/host. +-- TODO: loadConfigs and isAvailable are duplicated in menus/select and menus/host. +local +function isAvailable (item) + if item then + if debug then + return true + end + local at = type(item.available) + if at == "boolean" then + return item.available + end + if at == "string" then + return false + end + end +end + local function loadConfigs (dir, process) local items, icons = {}, {} @@ -22,7 +38,10 @@ function loadConfigs (dir, process) local path = string.format("%s/%s", dir, file) if love.filesystem.isFile(path) and file ~= "readme.md" then local item = love.filesystem.load(path)() - if item and process(item) then + if isAvailable(item) then + if process then + process(item, file, path) + end table.insert(icons, love.graphics.newImage(item.portrait)) table.insert(items, item) end @@ -34,7 +53,7 @@ end -- TODO: Clean-up menus/select, menus/host and Hero after portraits split. local group, get do - local nauts, icons = loadConfigs("config/nauts", function (naut) return naut.available or debug end) + local nauts, icons = loadConfigs("config/nauts") -- TODO: Find a better way to add empty and random entries to naut Selector. table.insert(icons, 1, false) |