From 14a36ae366f53adffd89507bb3d3c587b4fa0f26 Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Fri, 25 Nov 2016 18:18:31 -0700
Subject: [PATCH] Tommy: Added screen edge detection

---
 love/tommy/main.lua | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/love/tommy/main.lua b/love/tommy/main.lua
index 1f97107..e5fe0fe 100644
--- a/love/tommy/main.lua
+++ b/love/tommy/main.lua
@@ -1,5 +1,32 @@
 require "Tserial"
 
+--Detect when player hits screen edges
+function colDetect()
+	-- Is it above 0? Awesome, we're probably on screen
+	if player.x >= 0 then
+		-- Is it below the screen width minus the plaers width?
+		if player.x >= (screen.w - player.w) then
+			--No? Guess we better stop our guy from going off screen
+			--by setting his position to the screen edge
+			player.x = screen.w - player.w
+		end
+	-- Oh, we weren't above or equal to 0? 
+	-- Obviously it can't be above the max if it is 0 or less
+	-- so let's just set it to 0
+	else player.x = 0
+	
+	end
+
+	-- Same as above except for y
+	if player.y >= 0 then
+		if player.y >= (screen.h - player.h) then
+			player.y = screen.h - player.h
+		end
+	else
+		player.y = 0
+	end
+	return player.x, player.y
+end
 --Create a function to deal with acceleration
 --accel is just a TRUE/False flag that tells us if we want to accel or decel
 --axis is directional speed, shoudl probably change its name
@@ -40,11 +67,17 @@ function love.load()
 	
 	-- Check if Save file exists
 	save_exists = love.filesystem.exists(saveFile)
+
+	-- Create a table and grab the screen width/height for colision detection
+	screen = {}
+	screen.w = love.graphics.getWidth()
+	screen.h = love.graphics.getHeight()
+	
 	-- Create a table to hold all the player data
 	player = {}
 	-- Player x/y position
-	player.x = 100
-	player.y = 100
+	player.x = 250
+	player.y = 250
 	-- player height/width
 	player.w = 25
 	player.h = 25
@@ -181,7 +214,9 @@ function love.update(dt)
 	
 	player.x = player.x + (player.current_speed.x)*dt
 	player.y = player.y + (player.current_speed.y)*dt
-
+	
+	--Make sure player doesn't go off screen
+	colDetect()
 end
 
 function love.draw()