merge

1 files changed, 11 insertions, 2 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 7ff472d..0da3b9a 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -38,6 +38,15 @@
 		base.floors = []
 		base.lookup = {}
 		base.colors = {}
+		
+		base.init = function(){
+      base.colors = {
+        wall: app.defaults.colors.wall.slice(),
+        outline: app.defaults.colors.outline.slice(),
+        floor: app.defaults.colors.floor.slice(),
+        ceiling: app.defaults.colors.ceiling.slice(),
+      }
+    }
 
 		base.first = function(){
 		  for (var i in base.list) {
@@ -90,7 +99,7 @@
 		base.values = function(){
 			return _.values(base.lookup)
 		}
-		
+
 		base.serialize = function(){
 		  var data = []
 			base.forEach(function(wall){
@@ -104,7 +113,6 @@
 			  if (! wall_data) { return }
 			  var wall = base.lookup[ wall_data.id ]
 			  if (! wall) {
-			    console.log(wall_data);
 			    return
 			  }
 			  wall.deserialize( wall_data )
@@ -118,6 +126,7 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
+        // TODO: SET WALLPAPER HERE
       })
       Rooms.forEach(function(room){
         room.setFloorColor(floorColor)