Revert "BROKE IT"

This reverts commit f8820e8037.

src/gamestates/game.lua

@@ -73,10 +73,7 @@ function game:enter(previous, settings, gameControls, gamejoltSession)
 	boxColumns = math.floor(screenWidth / boxSize) - 1
 	boxRows = math.floor(screenHeight / boxSize) - 5
 	-- save the settings for later use
-	if settings then
+	gameSettings = settings or gameSettings
-		gameSettings = settings
-	end
-	--gameSettings = settings or gameSettings
 	controls = gameControls or controls
 	session = gamejoltSession
 	-- ping our active state immediately

src/gamestates/menu.lua

@@ -120,7 +120,7 @@ end
 
 function menu:mousepressed(x, y, button)
 	if input(button, controls.select) then
-		Gamestate.switch(game, difficulty, controls, session)
+		Gamestate.switch(game, {boxSize = settings.difficulty.boxSize, colorStep = settings.difficulty.colorStep, timeLimit = settings.difficulty.timeLimit}, controls)
 	end
 end
 

src/main.lua

@@ -5,31 +5,29 @@ debug = require "conf" -- a bit redundant but makes it obvious what is global
 local startDate = os.date("*t", os.time())
 local logFile = "logs/" .. startDate.year .. "." .. startDate.month .. "." .. startDate.day .. "-" .. startDate.hour .. "." .. startDate.min .. ".log"
 function log(...)
-	---[[
+	--[[
 	local strings = ""
 	if type(arg) == "table" then
-		for _,v in ipairs(arg) do
+	for _,v in pairs(arg) do
-			strings = strings .. v
+	strings = strings .. v
-		end
+end
-	else
+else
-		strings = arg
+strings = arg
-	end
+end
-	-- make sure logs exists
+if love.filesystem.exists("logs") then
-	if love.filesystem.exists("logs") then
+if not love.filesystem.isDirectory("logs") then
-		if not love.filesystem.isDirectory("logs") then
+love.filesystem.remove()
-			love.filesystem.remove()
+love.filesystem.createDirectory("logs")
-			love.filesystem.createDirectory("logs")
+end
-		end
+else
-	else
+love.filesystem.createDirectory("logs")
-		love.filesystem.createDirectory("logs")
+end
-	end
+local success, errorMsg = love.filesystem.append(logFile, strings)
-	-- append new data to logFile
+if not success then
-	local success, errorMsg = love.filesystem.append(logFile, strings)
+print("Failed to write to log file.", errorMsg)
-	if not success then
+end
-		print("Failed to write to log file.", errorMsg)
+--]]
-	end
+if debug then print(...) end
-	--]]
-	if debug then print(...) end
 end
 
 local inifile = require "lib.inifile"
@@ -38,15 +36,14 @@ local menu = require "gamestates.menu"
 
 function love.load()
 	log("Loading...")
-	love.window.setIcon(love.image.newImageData("icon.png"))
+	-- set custom window icon
+	local icon = love.image.newImageData("icon.png")
+	love.window.setIcon(icon)
 	log("Window icon set.")
 
 	-- initialize Game Jolt
-	if GameJolt.init(48728, "b8e4a0eae1509d3edef3d8451bae1842") then
+	local initSuccess = GameJolt.init(48728, "b8e4a0eae1509d3edef3d8451bae1842")
-		log("Game Jolt initialized.")
+	if initSuccess then log("Game Jolt initialized.") end
-	else
-		log("Err: Game Jolt NOT initialized.")
-	end
 
 	-- load settings and change if needed
 	local gamejoltSessionOpen = false --set true if we get a session open