id_

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()