From d5a60336f5735116e10b3766c786087210069d9e Mon Sep 17 00:00:00 2001
From: 0x81c <mmlxxvi@gmail.com>
Date: Wed, 11 Mar 2015 21:08:15 -0400
Subject: [PATCH] fixed

---
 main.lua   |  1 -
 player.lua | 16 +++++-----------
 room.lua   | 24 +++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/main.lua b/main.lua
index f811181..7c173e8 100644
--- a/main.lua
+++ b/main.lua
@@ -11,7 +11,6 @@ function love.load()
 
 	loadSprites()
 
-
 	inputTimer = Timer.new()
 	player = Player:new(2, 1, "green")
 end
diff --git a/player.lua b/player.lua
index 2c5526b..5903271 100644
--- a/player.lua
+++ b/player.lua
@@ -1,23 +1,17 @@
 require "entity"
 
-Player = class("Player")
+Player = class("Player", Entity)
 
 function Player:initialize(x, y, color)
 	
-	local entityTable = {
+	Entity.initialize(self, {
 		x = x,
 		y = y,
-		sizeX = 1,
-		sizeY = 1,
+		sizeX = 3,
+		sizeY = 3,
 		color = color,
 		collision = "none" --player can't push other player
-	}
-
-	Entity.initialize(self, entityTable)
-	--need to probably get rid of middleclass
-	--and roll yr own for default method inheritance
-	self.getDrawPos = Entity.getDrawPos
-	self.getGridPos = Entity.getGridPos
+	})
 
 	self.sprite = playerSprite
 end
diff --git a/room.lua b/room.lua
index c858c69..ad6d347 100644
--- a/room.lua
+++ b/room.lua
@@ -1,6 +1,14 @@
 Room = class("Room")
+require "player"
 
-function Room:initialize()
+function Room:initialize(t)
+	self.exits = t.exits
+	self.name = t.name
+	self.player = {}
+
+	for color, coords in ipairs(t.playerColors) do
+		self.player[color] = Player:new(coords.x, coords.y, color)
+	end
 
 end
 
@@ -10,4 +18,18 @@ end
 
 function Room:update()
 
+end
+
+function Room:tick()
+	self:nextRoomCheck()
+end
+
+function Room:nextRoomCheck()
+
+end
+
+function nextRoom()
+	-- currentRoom = Room:new{
+		
+	-- }
 end
\ No newline at end of file