From 92c040a9c0104623b19f8f5d6590a260190b4492 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Fri, 30 Sep 2016 16:35:05 +0200
Subject: Added Settings module scrap

---
 main.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'main.lua')

diff --git a/main.lua b/main.lua
index 8c6eb8e..ab1c755 100644
--- a/main.lua
+++ b/main.lua
@@ -39,6 +39,7 @@ require "camera"
 require "menu"
 require "controller"
 require "music"
+require "settings"
 
 -- Temporary debug
 debug = false
@@ -53,8 +54,9 @@ function love.load()
 	Bold = love.graphics.newImageFont("assets/font-big.png", " 0123456789AEFILNORSTUW", -2)
 	Font:setLineHeight(9/16)
 	love.graphics.setFont(Font) 
-	-- Controller
+	-- Modules
 	Controller.load()
+	Settings.load()
 	-- Scene
 	Scene = Menu:new()
 end
@@ -84,7 +86,7 @@ function Controller.controlpressed(set, action, key)
 	-- pass to current Scene
 	Scene:controlpressed(set, action, key)
 	-- globals
-	if key == "escape" or key == "f1" then
+	if key == "escape" then
 		love.event.quit()
 	end
 	if key == "f5" then
-- 
cgit v1.1