From 9763040c99efd32601b5f3bb587321a0609dd509 Mon Sep 17 00:00:00 2001
From: 0x81c <mmlxxvi@gmail.com>
Date: Wed, 11 Mar 2015 21:41:02 -0400
Subject: [PATCH] id_

---
 entity.lua |  2 +-
 main.lua   | 18 ++++++++++++++----
 player.lua |  2 ++
 room.lua   | 24 ++++++++++++++++++------
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/entity.lua b/entity.lua
index 3a07164..9027811 100644
--- a/entity.lua
+++ b/entity.lua
@@ -4,7 +4,7 @@ function Entity:initialize(t)
 	self.gridX, self.gridY = t.x, t.y
 	self.gridSize = {x = t.sizeX, y = t.sizeY}
 	self.color = Color:new(t.color)
-	self.collision = t.collision
+	self.collision = t.collision --either "none", "moveable", "unmoveable"
 end
 
 function Entity:atGridPos(x, y)
diff --git a/main.lua b/main.lua
index 7c173e8..e814c48 100644
--- a/main.lua
+++ b/main.lua
@@ -6,24 +6,34 @@ require "room"
 require "player"
 
 function love.load()
-	_initLoveDefaults()
+	_initDefaults()
 	_initGridVars()
 
 	loadSprites()
 
 	inputTimer = Timer.new()
-	player = Player:new(2, 1, "green")
+
+	currentRoom = Room:new{
+		player = {
+			red = {x = 3, y = 5},
+			green = {x = 4, y = 3},
+			blue = {x = 3, y = 10}
+		}
+	}
 end
 
 function love.update(dt)
 	Input:handler()
+
+	currentRoom:update()
 end
 
 function love.draw()
-	player:draw()
+	love.graphics.setBlendMode("screen")
+	currentRoom:draw()
 end
 
-function _initLoveDefaults()
+function _initDefaults()
 	love.graphics.setDefaultFilter("linear", "nearest")
 
 	width = love.graphics.getWidth()
diff --git a/player.lua b/player.lua
index 5903271..f32718e 100644
--- a/player.lua
+++ b/player.lua
@@ -14,6 +14,8 @@ function Player:initialize(x, y, color)
 	})
 
 	self.sprite = playerSprite
+
+	print("i exist!!")
 end
 
 function Player:update()
diff --git a/room.lua b/room.lua
index ad6d347..d70e050 100644
--- a/room.lua
+++ b/room.lua
@@ -1,4 +1,5 @@
 Room = class("Room")
+
 require "player"
 
 function Room:initialize(t)
@@ -6,18 +7,28 @@ function Room:initialize(t)
 	self.name = t.name
 	self.player = {}
 
-	for color, coords in ipairs(t.playerColors) do
+	for color, coords in pairs(t.player) do
 		self.player[color] = Player:new(coords.x, coords.y, color)
 	end
 
+	local crate
+	local box
+	local blox
+	local tile
+
+end
+
+
+function Room:update(dt)
+	for color, player in pairs(self.player) do
+		player:update(dt)
+	end
 end
 
 function Room:draw()
-
-end
-
-function Room:update()
-
+	for color, player in pairs(self.player) do
+		player:draw()
+	end
 end
 
 function Room:tick()
@@ -29,6 +40,7 @@ function Room:nextRoomCheck()
 end
 
 function nextRoom()
+	print("next room!!!")
 	-- currentRoom = Room:new{
 		
 	-- }