merge

1 files changed, 6 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index 81dce52..b975499 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -11,12 +11,8 @@ var BuilderView = View.extend({
 		this.info = new BuilderInfo ({ parent: this })
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
-		this.lightControl = new LightControl ({ parent: this })
-
-		app.on("rooms-built", function(){
-		  Walls.paint()
-		})
-
+		this.colorControl = new ColorControl ({ parent: this })
+		this.cursor = new HelpCursor({ parent: this })
 	},
 
 	load: function(name){
@@ -36,6 +32,9 @@ var BuilderView = View.extend({
 	},
 	
 	hideExtras: function(){
-	}
+	},
+
+	pickWall: function(wall, pos){
+	},
 
 })