format and stuff

Pause/DrawPause.lua

@@ -1,45 +1,44 @@
-local function button(x,y, w, h, text, selected)
-    --x,y is the top left corner of the button
-    local rounding = 30 -- used for rounding the buttons
+local function button(x, y, w, h, text, selected)
+	--x,y is the top left corner of the button
+	local rounding = 30 -- used for rounding the buttons
 
-    if not selected then    
-        love.graphics.setColor(love.math.colorFromBytes(41,134,204))
-    elseif selected then
-        love.graphics.setColor(love.math.colorFromBytes(244,67,54))
-    end
-    -- Draw rectangle
-    love.graphics.rectangle("fill", x, y, w, h, rounding, rounding)
+	if not selected then
+		love.graphics.setColor(love.math.colorFromBytes(41, 134, 204))
+	elseif selected then
+		love.graphics.setColor(love.math.colorFromBytes(244, 67, 54))
+	end
+	-- Draw rectangle
+	love.graphics.rectangle("fill", x, y, w, h, rounding, rounding)
 
-    -- Get width and height of text
-    local tw = MenuFont:getWidth(text)
-    local th = MenuFont:getHeight(text)
-    -- Calculate position to center the text
-    local textX = x + (w - tw) / 2
-    local textY = y + (h - th) / 2
-    -- Place text inside the rectangle
+	-- Get width and height of text
+	local tw = MenuFont:getWidth(text)
+	local th = MenuFont:getHeight(text)
+	-- Calculate position to center the text
+	local textX = x + (w - tw) / 2
+	local textY = y + (h - th) / 2
+	-- Place text inside the rectangle
 	love.graphics.setFont(MenuFont)
-    love.graphics.setColor(1,1,1) -- reset colours
-    love.graphics.print(text, textX, textY)
+	love.graphics.setColor(1, 1, 1) -- reset colours
+	love.graphics.print(text, textX, textY)
 end
 
-
 function DrawPause()
-    local opacity = 0.3
+	local opacity = 0.3
 	local height = love.graphics.getHeight()
 	local width = love.graphics.getWidth()
-    local bwidth, bheight = 300, 140
+	local bwidth, bheight = 300, 140
 	love.graphics.setFont(GameFont)
 
-    DrawGame() --Draw a single frame of the game
-    love.graphics.setColor(0.1,0.1,0.1, opacity) --overlay opaque img
-    love.graphics.rectangle("fill", 0, 0, width, height)
+	DrawGame() --Draw a single frame of the game
+	love.graphics.setColor(0.1, 0.1, 0.1, opacity) --overlay opaque img
+	love.graphics.rectangle("fill", 0, 0, width, height)
 
-    love.graphics.setColor(1,1,1)
-    love.graphics.print("PAUSED", 100,100)
-    --love.graphics.print("" .. PAUSE_POS, 200,200)
+	love.graphics.setColor(1, 1, 1)
+	love.graphics.print("PAUSED", 100, 100)
+	--love.graphics.print("" .. PAUSE_POS, 200,200)
 
-    button(100, 200, bwidth, bheight, "Return",  PAUSE_POS == 0 and true or false)
-    button(100, 350, bwidth, bheight, "Menu",  PAUSE_POS == 1 and true or false)
-    button(100, 500, bwidth, bheight, "Quit",  PAUSE_POS == 2 and true or false)
-    love.graphics.setColor(255,255,255) -- reset colours
-end
+	button(100, 200, bwidth, bheight, "Return", PAUSE_POS == 0 and true or false)
+	button(100, 350, bwidth, bheight, "Menu", PAUSE_POS == 1 and true or false)
+	button(100, 500, bwidth, bheight, "Quit", PAUSE_POS == 2 and true or false)
+	love.graphics.setColor(255, 255, 255) -- reset colours
+end

Pause/PauseKeyPressed.lua

@@ -1,30 +1,26 @@
 function PauseKeyPressed(key)
-    if key == 'return' then
-        musicBattle:setVolume(0.5)
-        musicPause:setVolume(0)
-        -- 0 Return to game
-        -- 1 Quit
-        if PAUSE_POS == 0 then
-            -- unpause the game 
-            _G.GAMESTATE = "GAME"
-            print("STATE CHANEGD: GAME!")
-            _G.PAUSED = false
+	if key == "return" then
+		musicBattle:setVolume(0.5)
+		musicPause:setVolume(0)
+		-- 0 Return to game
+		-- 1 Quit
+		if PAUSE_POS == 0 then
+			-- unpause the game
+			_G.GAMESTATE = "GAME"
+			print("STATE CHANEGD: GAME!")
+			_G.PAUSED = false
 			musicBattle:setVolume(0.5)
 			musicPause:setVolume(0)
-
-        elseif PAUSE_POS == 1 then
-            _G.GAMESTATE = "MENU"
-            print("STATE CHANEGD: MENU!")
-            _G.PAUSED = false
-            musicPause:stop()
-            musicBattle:stop()
-
-        elseif PAUSE_POS == 2 then
+		elseif PAUSE_POS == 1 then
+			_G.GAMESTATE = "MENU"
+			print("STATE CHANEGD: MENU!")
+			_G.PAUSED = false
+			musicPause:stop()
+			musicBattle:stop()
+		elseif PAUSE_POS == 2 then
 			love.event.quit()
-        end
-        
-    end
-
+		end
+	end
 
 	if love.keyboard.isDown("up") then
 		if _G.PAUSE_POS == 0 then
@@ -41,4 +37,4 @@ function PauseKeyPressed(key)
 			_G.PAUSE_POS = _G.PAUSE_POS + 1
 		end
 	end
-end
+end

Pause/UpdatePause.lua

@@ -1,2 +1 @@
-function UpdatePause(dt)
-end
+function UpdatePause(dt) end