aboutsummaryrefslogtreecommitdiff
path: root/src/lua/modules/embed/boot.lua.h
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-08-22 13:58:13 +0800
committerchai <chaifix@163.com>2018-08-22 13:58:13 +0800
commit36621e6be9604517c900adc0d97665e975c2b325 (patch)
treed3db26c2de6b47aee96f6a24d2595ff80a8869b7 /src/lua/modules/embed/boot.lua.h
parent95df5cf921f57bfeac0d819994210dfcc2dcad14 (diff)
*update
Diffstat (limited to 'src/lua/modules/embed/boot.lua.h')
-rw-r--r--src/lua/modules/embed/boot.lua.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/lua/modules/embed/boot.lua.h b/src/lua/modules/embed/boot.lua.h
index 5ce20a7..d84ca21 100644
--- a/src/lua/modules/embed/boot.lua.h
+++ b/src/lua/modules/embed/boot.lua.h
@@ -8,24 +8,22 @@ jin.filesystem.mount(jin._argv[2])
-- Config game
-------------------------------------------------------------------------
-jin.conf = {}
+jin.config = {}
if jin.filesystem.exist("config.lua") then
- jin.conf = require "config"
+ jin.config = require "config"
end
-jin.conf.width = jin.conf.width or 576
-jin.conf.height = jin.conf.height or 448
-jin.conf.FPS = jin.conf.FPS or 60
-jin.conf.vsync = jin.conf.vsync or false
-jin.conf.title = jin.conf.title or ("jin v" .. jin.version())
-jin.conf.resizable = jin.conf.resizable or false
-jin.conf.fullscreen = jin.conf.fullscreen or false
-jin.conf.lockFPS = jin.conf.lockFPS or false
+jin.config.width = jin.config.width or 576
+jin.config.height = jin.config.height or 448
+jin.config.vsync = jin.config.vsync or false
+jin.config.title = jin.config.title or ("jin v" .. jin.version())
+jin.config.resizable = jin.config.resizable or false
+jin.config.fullscreen = jin.config.fullscreen or false
-------------------------------------------------------------------------
-- Initialize sub systems
-------------------------------------------------------------------------
-jin.graphics.init(jin.conf)
+jin.graphics.init(jin.config)
jin.audio.init()
-------------------------------------------------------------------------
@@ -53,7 +51,6 @@ function jin.core.run()
local dt = 0
local previous = jin.time.second()
local current = previous
- -- TODO: д¼¼ӦøƵʵ
while jin.core.running() do
for _, e in pairs(jin.event.poll()) do
if e.type == "keydown" then