merge

3 files changed, 8 insertions, 4 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 48931e9..e0033e3 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -26,6 +26,7 @@ var Rooms = new function(){
 			height: 500
 		})
 		base.add(room)
+		return room
 	}
 	
 	base.remove = function(room){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index e6625ec..49e55dc 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -20,8 +20,8 @@ Rooms.builder = new function(){
 		}
 	}
 	function build (){
-		Rooms.regions.forEach(function(room){
-			build_walls(room).forEach(function(el){
+		Rooms.regions.forEach(function(region){
+			build_walls(region).forEach(function(el){
 				els.push(el)
 				scene.add(el)
 			})
diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
index eb467cd..e2bb894 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
@@ -20,12 +20,15 @@ Rooms.clipper = new function(){
 	
 	// Given a set of overlapping rooms, clip any intersections, then cull any duplicate polygons
 	base.solve_rects = function(){
-		if (Rooms.count() == 0) return
+		if (Rooms.count() == 0) {
+			Rooms.regions = regions = []
+			return
+		}
 		
 		base.reset_rects()
 		base.clip_rects()
 		base.cull_rects()
-		
+
 		Rooms.regions = sort_rects_by_position(regions)
 	}