summaryrefslogtreecommitdiffhomepage
path: root/main.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-09-21 21:05:37 +0200
committerAki <nthirtyone@gmail.com>2017-09-21 21:05:37 +0200
commite9a450d65d4fb564691cdf651ef5771dd88303ae (patch)
treef49d29582dd6877f3b3c807c3f7d9d92d368f798 /main.lua
parenteb8302723cd85adca0fbaf505cfb315f1db0299a (diff)
parentb97985def64b8bd8f93a7b391b12333595432e52 (diff)
downloadroflnauts-e9a450d65d4fb564691cdf651ef5771dd88303ae.zip
roflnauts-e9a450d65d4fb564691cdf651ef5771dd88303ae.tar.gz
roflnauts-e9a450d65d4fb564691cdf651ef5771dd88303ae.tar.bz2
Merge branch 'maps'
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua12
1 files changed, 9 insertions, 3 deletions
diff --git a/main.lua b/main.lua
index ac04383..a71b9e2 100644
--- a/main.lua
+++ b/main.lua
@@ -47,12 +47,18 @@ function love.draw ()
love.graphics.setFont(Font)
love.graphics.setColor(255, 0, 0, 255)
love.graphics.print("Debug ON", 10, 10, 0, scale, scale)
- love.graphics.setColor(255, 255, 255, 255)
- love.graphics.print("Current FPS: "..tostring(love.timer.getFPS()), 10, 10+9*scale, 0, scale, scale)
+ if dbg_msg then
+ love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.print(dbg_msg, 10, 10+9*scale, 0, scale, scale)
+ end
end
end
-function love.update (dt) sceneManager:update(dt) end
+function love.update (dt)
+ dbg_msg = string.format("FPS: %d\n", love.timer.getFPS())
+ sceneManager:update(dt)
+end
+
function love.quit () Settings.save() end
-- Pass input to Controller