Merge branch 'master' of github.com:nko2/weapi

Conflicts: js/client.js
nko2 · Sep 13, 2011 · f994807 · f994807
2 parents 41d0817 + c28be10
commit f994807
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/js/client.js b/js/client.js
@@ -449,8 +449,15 @@ function Game(){
 
     socket.on('end',function(rank,score,time,topScores){
       socket.disconnect();
+<<<<<<< HEAD
 
       layers.players.translate([players[myId].x - 405, players[myId].y - 250]);
+=======
+      layers.players.translate([players[myId].x - 405, players[myId].y - 250]);
+      players[myId].shape.remove();
+      delete players[myId];
+      myId = -1;
+>>>>>>> c28be1057c5a490449acd9c54462dd15dad1712f
 
       self.showEnd(rank,score,time,topScores);
     });