Compilation.

nagolove · Jun 15, 2021 · 3cee8e9 · 3cee8e9
1 parent 73fb4c0
commit 3cee8e9
Show file tree

Hide file tree

Showing 12 changed files with 362 additions and 355 deletions.
diff --git a/design-doc.md b/design-doc.md
@@ -38,6 +38,7 @@
 
 Скриншоты:
 
+
 ![9](scenes/nback3/shoots/9.png)
 ![10](scenes/nback3/shoots/10.png)
 ![11](scenes/nback3/shoots/11.png)

diff --git a/fonts.tl b/fonts.tl
@@ -1,7 +1,8 @@
 require "love"
 local lg = love.graphics
-local prefix = "scenes/nback2/"
-return {
+local prefix = "scenes/nback3/"
+print('Fonts module loading..')
+local t = {
     help = {
         font = lg.newFont(prefix .. "gfx/DejaVuSansMono.ttf", 15),
         gooi = lg.newFont(prefix .. "gfx/DejaVuSansMono.ttf", 13),
@@ -20,3 +21,5 @@ return {
     languageSelector = love.graphics.newFont(prefix .. "gfx/DejaVuSansMono.ttf", 25),
     menu = love.graphics.newFont(prefix .. "gfx/DejaVuSansMono.ttf", 32),
 }
+print('Fonts module loading done.')
+return t
diff --git a/help.lua b/help.lua
@@ -1,11 +1,12 @@
 local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local math = _tl_compat and _tl_compat.math or math; print('hello from top of Help module.')
 
-require("love")
-require("common")
-require("layout")
+require("button")
 require("cmn")
+require("common")
 require("globals")
-require("button")
+require("layout")
+require("love")
+require("menu-new")
 
 
 local pallete = require("pallete")

diff --git a/help.tl b/help.tl
@@ -1,11 +1,12 @@
 print('hello from top of Help module.')
 
-require "love"
-require "common"
-require "layout"
+require "button"
 require "cmn"
+require "common"
 require "globals"
-require "button"
+require "layout"
+require "love"
+require "menu-new"
 
 --local gooi = require "gooi.gooi"
 local pallete = require "pallete"

diff --git a/init.lua b/init.lua
@@ -1,13 +1,13 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local os = _tl_compat and _tl_compat.os or os; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; love.filesystem.setRequirePath(love.filesystem.getRequirePath() .. ";?.lua;?/init.lua;scenes/nback2/?.lua")
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local os = _tl_compat and _tl_compat.os or os; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; love.filesystem.setRequirePath(love.filesystem.getRequirePath() .. ";?.lua;?/init.lua;scenes/nback3/?.lua")
 
-require("love")
-require("nbtypes")
 require("common")
 require("globals")
-require("pviewer")
 require("help")
-require("menu")
 require("languageselector")
+require("love")
+require("menu-new")
+require("nbtypes")
+require("pviewer")
 
 
 

diff --git a/init.tl b/init.tl
@@ -1,13 +1,13 @@
-love.filesystem.setRequirePath(love.filesystem.getRequirePath() .. ";?.lua;?/init.lua;scenes/nback2/?.lua")
+love.filesystem.setRequirePath(love.filesystem.getRequirePath() .. ";?.lua;?/init.lua;scenes/nback3/?.lua")
 
-require "love"
-require "nbtypes"
 require "common"
 require "globals"
-require "pviewer"
 require "help"
-require "menu"
 require "languageselector"
+require "love"
+require "menu-new"
+require "nbtypes"
+require "pviewer"
 
 --preventiveFirstRun = false
 --onAndroid = true