dust off the bitrot

client/js/index.js

@@ -2,7 +2,7 @@
   /*
     Bootstrap the browser
   */
-  
+
   valid_keys = {
     32 : true,
     37 : true,
@@ -20,8 +20,8 @@
       scene.addPlanet(new Planet());
       scene.update(gameState);
 
-      if (scene.hasPlayer(socket.socket.sessionid)) {
-        var ship = window.ship = scene.getPlayer(socket.socket.sessionid);
+      if (scene.hasPlayer(socket.id)) {
+        var ship = window.ship = scene.getPlayer(socket.id);
 
         /*
           Keybinds
@@ -45,8 +45,8 @@
         setInterval(function() {
           socket.emit('keys', ship.heldKeys);
         }, 33);
-        
-        
+
+
         socket.on('tick', function(gameState) {
           scale = ship.planet_distance();
           $("#vel").html(scale)
@@ -86,4 +86,4 @@
       }, fps);
     });
   };
-})(window);
+})(window);

package.json

@@ -10,8 +10,8 @@
     "node": "*"
   },
   "dependencies": {
-    "socket.io" : "0.7.0",
-    "connect"   : "*"
+    "connect": "1.0.x",
+    "socket.io": "^1.4.5"
   },
   "devDependencies": {}
 }

server/run.js

@@ -21,7 +21,7 @@ io.sockets.on('connection', function (socket) {
  var ship = new Ship({
    x: Math.random()*100,
    y: Math.random()*100,
-   id : socket.id
+   id : socket.id.split('#').pop()
  });
 
  scene.addPlayer(ship);
@@ -45,4 +45,4 @@ setInterval(function() {
   } catch (e) {
     process.exit();
   }
-}, 33)
+}, 33)

shared/scene.js

@@ -52,7 +52,7 @@
 
     tick : function() {
       var that = this;
-      Object.keys(this.players).forEach(function(player_key) { 
+      Object.keys(this.players).forEach(function(player_key) {
         var player = that.players[player_key];
         player.tick(that);
       });
@@ -65,14 +65,15 @@
         this.planets[planet].render(context, timeDiff);
       };
 
-      
+
       var keys = Object.keys(this.players);
-      var player = keys.length; 
+      var player = keys.length;
 
       while(player--) {
-        this.players[keys[player]].render(context, timeDiff, window.ship._.id === this.players[keys[player]]._.id);
+        var currentPlayer = window.ship && window.ship._ && window.ship._.id === this.players[keys[player]]._.id;
+        this.players[keys[player]].render(context, timeDiff, currentPlayer);
       };
 
     }
   };
-})(typeof window === 'undefined' ? exports : window);
+})(typeof window === 'undefined' ? exports : window);

shared/ship.js

@@ -36,7 +36,7 @@
       landing: 0,
       crashing: []
     }
-    
+
     this._.animation = {
       crashing: []
     }
@@ -101,7 +101,7 @@
         if (imageIndex < 5) {
           imageIndex = 4 - imageIndex;
           if (imageIndex > 4) imageIndex = 4;
-          ctx.drawImage(imageCache.ship.default.landing[imageIndex], this._.x, this._.y)  
+          ctx.drawImage(imageCache.ship.default.landing[imageIndex], this._.x, this._.y)
         } else {
           ctx.drawImage(this.image, this._.x, this._.y)
         }
@@ -115,7 +115,7 @@
           ctx.translate(this._.x + 22, this._.y + 50);
           var imageIndex = (this.animation.trails.big % 50) % 4;
           if (this.trails.large[imageIndex]) {
-            ctx.scale(2.0);
+            ctx.scale(2.0, 2.0);
             ctx.drawImage(this.trails.large[imageIndex], -7, 2);
           }
           ctx.restore();
@@ -129,7 +129,7 @@
           ctx.translate(this._.x + 34, this._.y + 35);
           var imageIndex = (this.animation.trails.big % 50) % 4;
           if (this.trails.small[imageIndex]) {
-            ctx.scale(2.0);
+            ctx.scale(2.0, 2.0);
             ctx.drawImage(this.trails.small[imageIndex], -6, 2);
           }
           ctx.restore();
@@ -141,7 +141,7 @@
           ctx.translate(this._.x + 10, this._.y + 35);
           var imageIndex = (this.animation.trails.big % 50) % 4;
           if (this.trails.small[imageIndex]) {
-            ctx.scale(2.0);
+            ctx.scale(2.0, 2.0);
             ctx.drawImage(this.trails.small[imageIndex], -5, 2);
           }
           ctx.restore();
@@ -150,7 +150,7 @@
         if (this.heldKeys['40']) {
           this.animation.trails.big += timeDiff;
           ctx.save();
-        
+
           var imageIndex = (this.animation.trails.big % 50) % 4;
           if (this.trails.small[imageIndex]) {
             ctx.translate(this._.x + 33, this._.y-0.5);
@@ -164,11 +164,11 @@
       }
 
       ctx.restore();
-      
+
       this.projectiles.forEach(function(projectile) {
         projectile.render(ctx, timeDiff);
       });
-      
+
     };
   }
 
@@ -205,11 +205,11 @@
       y += Math.sin(planet_angle) * ((CONST.GRAVITY / Math.pow(planet_distance, 2)));
 
       // update the ship position due to speed
-      
+
       if (planet_distance < 100) { // contact planet
         planet_angle = (planet_angle - Math.PI) % (Math.PI * 2)
         var rotation = this._.rotation % (Math.PI * 2)
-        
+
         if (this._.velocity <= 2 && (rotation > planet_angle - 0.4) && (rotation < planet_angle + 0.4)) { // land
           this._.landed = true;
           this._.rotation = planet_angle;
@@ -232,17 +232,17 @@
         }
 
       } else { // flying
-        
+
         this._.landed = false;
-        
+
         this._.rotation += this._.rotation_delta;
         this._.velocity = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
 
         if (this._.velocity > CONST.MAX_SPEED) this._.velocity = CONST.MAX_SPEED;
         if (this._.velocity < 0) this._.velocity = 0;
 
         this._.velocity_angle = calc_angle(x, y)
-        
+
         this._.x += x;
         this._.y += y;
 
@@ -292,11 +292,11 @@
       // Forward
       if (heldKeys['38']) {
         if (this._.landed) {
-          
+
           this._.landed = false;
           this.addVelocity(CONST.THRUST*40);
         }
-  
+
         // Thrust forward!
         this.addVelocity(CONST.THRUST);
       }