From 1c3040de93f9d5a164ccb06194eacc28eead0234 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Fri, 7 Apr 2017 21:05:41 +0200
Subject: Maps and nauts list moved to config Implemented functions to create
 icons list for them Changed so game uses these functions now

---
 config/menus/host.lua   | 7 +++++--
 config/menus/select.lua | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'config/menus')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 8a4887e..b318a5b 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -8,6 +8,9 @@ local bx = width/2-29
 
 local map_selector = selector:new(menu)
 
+require "iconsList"
+local icons, maps = getMapsIconsList()
+
 return {
 	map_selector
 		:setPosition(width/2, 40)
@@ -15,9 +18,9 @@ return {
 		:setMargin(0)
 		:set("global", true)
 		:set("first", true)
-		:set("list", require "maplist")
+		:set("list", maps)
 		:set("icons_i", love.graphics.newImage("assets/maps.png"))
-		:set("icons_q", require "mapicons")
+		:set("icons_q", icons)
 		:set("shape", "panorama")
 		:init()
 	,
diff --git a/config/menus/select.lua b/config/menus/select.lua
index e759f40..804b4eb 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -10,15 +10,18 @@ local bx = width/2-29
 local naut_selector = selector:new(menu)
 local start_button = button:new(menu)
 
+require "iconsList"
+local nautsIcons, nautsList = getNautsIconsList()
+
 return {
 	naut_selector
 		:setPosition(width/2,60)
 		:setMargin(8)
 		:setSize(32, 32)
-		:set("list", require "nautslist")
+		:set("list", nautsList)
 		:set("global", false)
 		:set("icons_i", love.graphics.newImage("assets/portraits.png"))
-		:set("icons_q", require "nautsicons")
+		:set("icons_q", nautsIcons)
 		:init()
 	,
 	start_button
-- 
cgit v1.1