diff options
| author | Aki <nthirtyone@gmail.com> | 2017-04-07 21:05:41 +0200 |
|---|---|---|
| committer | Aki <nthirtyone@gmail.com> | 2017-04-07 21:05:41 +0200 |
| commit | 1c3040de93f9d5a164ccb06194eacc28eead0234 (patch) | |
| tree | 3d953fb9b7813a810613cd102e444033a9ddbf1d /config/menus | |
| parent | 612a14474c9d3c28b6512aef4845e52579d7d9c9 (diff) | |
| download | roflnauts-1c3040de93f9d5a164ccb06194eacc28eead0234.zip roflnauts-1c3040de93f9d5a164ccb06194eacc28eead0234.tar.gz roflnauts-1c3040de93f9d5a164ccb06194eacc28eead0234.tar.bz2 | |
Maps and nauts list moved to config
Implemented functions to create icons list for them
Changed so game uses these functions now
Diffstat (limited to 'config/menus')
| -rw-r--r-- | config/menus/host.lua | 7 | ||||
| -rw-r--r-- | config/menus/select.lua | 7 |
2 files changed, 10 insertions, 4 deletions
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 |