tangent/RGB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "BROKE IT"

Browse Source 
This reverts commit f8820e8037.
This commit is contained in:
Paul Liverman
2015-03-05 13:38:48 -08:00
parent df082ab3cc
commit 16abd571a7
3 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gamestates/game.lua
View File

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

2
src/gamestates/menu.lua
View File

@@ -120,7 +120,7 @@ end
function menu:mousepressed(x, y, button) function menu:mousepressed(x, y, button)
if input(button, controls.select) then 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
end end

17
src/main.lua
View File

@@ -5,16 +5,15 @@ debug = require "conf" -- a bit redundant but makes it obvious what is global
local startDate = os.date("*t", os.time()) local startDate = os.date("*t", os.time())
local logFile = "logs/" .. startDate.year .. "." .. startDate.month .. "." .. startDate.day .. "-" .. startDate.hour .. "." .. startDate.min .. ".log" local logFile = "logs/" .. startDate.year .. "." .. startDate.month .. "." .. startDate.day .. "-" .. startDate.hour .. "." .. startDate.min .. ".log"
function log(...) function log(...)
---[[ --[[
local strings = "" local strings = ""
if type(arg) == "table" then 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()
@@ -23,7 +22,6 @@ function log(...)
else else
love.filesystem.createDirectory("logs") love.filesystem.createDirectory("logs")
end end
-- append new data to logFile
local success, errorMsg = love.filesystem.append(logFile, strings) local success, errorMsg = love.filesystem.append(logFile, strings)
if not success then if not success then
print("Failed to write to log file.", errorMsg) print("Failed to write to log file.", errorMsg)
@@ -38,15 +36,14 @@ local menu = require "gamestates.menu"
function love.load() function love.load()
log("Loading...") 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.") log("Window icon set.")
-- initialize Game Jolt -- 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 -- load settings and change if needed
local gamejoltSessionOpen = false --set true if we get a session open local gamejoltSessionOpen = false --set true if we get a session open