collides

js/game.js

@@ -93,7 +93,7 @@ function game() {
 		update();
 		addPlayers();
 		remPlayers();
-		player.update([],[], dt);
+		player.update(squares, circles, dt);
 		for (var i = players.length - 1; i >= 0; i--) {
 			players[i].update([],[], dt);//squares, circles
 		}

js/objects.js

@@ -10,5 +10,5 @@ for (var i = objects.squares.length - 1; i >= 0; i--) {
 
 for (var i = objects.circles.length - 1; i >= 0; i--) {
 	let current = objects.circles[i]
-	circles.push(new Circle(current.x, current.y, current.w, current.h));
+	circles.push(new Circle(current.x, current.y, current.r));
 }