spawn points

jlongster · Nov 28, 2012 · 37da697 · 37da697
1 parent 73a1f30
commit 37da697
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/main.js b/main.js
@@ -149,13 +149,14 @@ function handlePacket(user, data) {
 }
 
 function handleDeath(killerUser, killedUser) {
-    killedUser.entity.restart();
+    var spawnPoint = Math.floor(Math.random() * 4);
+    killedUser.entity.restart(spawnPoint);
 
     var obj = {
         type: p.cmdPacket.typeId,
         from: 0,
         method: 'die',
-        args: [killerUser.name, killedUser.name]
+        args: [killerUser.name, killedUser.name, spawnPoint]
     };
 
     killedUser.stream.write(p.cmdPacket(obj));

diff --git a/static/js/entity.js b/static/js/entity.js
@@ -49,8 +49,8 @@
             var diffRot = vec3.create();
             vec3.set(this.rot, diffRot);
 
-            this.rotateX(state.mouseY * -.01);
-            this.rotateY(state.mouseX * -.01);
+            this.rotateX(state.mouseY * -Math.PI / 6.0 * dt);
+            this.rotateY(state.mouseX * -Math.PI / 6.0 * dt);
 
             if(state.left) {
                 if(state.mouseDown) {
@@ -156,9 +156,29 @@
             vec3.set(this.historyRot, this.rot);
         },
 
-        restart: function() {
-            this.setPos(0, 0, 0);
-            this.setRot(0, Math.PI, 0);
+        restart: function(spawnPoint) {
+            var sceneX = 256 * 4;
+            var sceneY = 256 * 4;
+
+            switch(spawnPoint) {
+            case 0:
+                this.setPos(0, 0, 0);
+                this.setRot(0, Math.PI, 0);
+                break;
+            case 1:
+                this.setPos(sceneX, 0, 0);
+                this.setRot(0, Math.PI, 0);
+                break;
+            case 2:
+                this.setPos(0, 0, sceneY);
+                this.setRot(0, 0, 0);
+                break;
+            case 3:
+                this.setPos(sceneX, 0, sceneY);
+                this.setRot(0, 0, 0);
+                break;
+            }
+
             this.interp = 1.0;
             this.packetBuffer = [];
             this.startPos = this.targetPos = null;

diff --git a/static/js/player.js b/static/js/player.js
@@ -31,10 +31,10 @@
             this.resetState();
             var state = this.state;
 
-            if(mouse[0] !== 0 && mouse[1] !== 0) {
+            if(mouse[0] !== 0 || mouse[1] !== 0) {
                 moved = true;
-                this.rotateX(mouse[1] * -.01);
-                this.rotateY(mouse[0] * -.01);
+                this.rotateX(mouse[1] * -Math.PI / 6.0 * dt);
+                this.rotateY(mouse[0] * -Math.PI / 6.0 * dt);
             }
 
             state.mouseX = mouse[0];
@@ -138,8 +138,8 @@
             }
         },
 
-        restart: function() {
-            this.parent();
+        restart: function(spawnPoint) {
+            this.parent(spawnPoint);
             vec3.set(this.pos, this.goodPos);
             vec3.set(this.rot, this.goodRot);
         },

diff --git a/static/js/server-events.js b/static/js/server-events.js
@@ -42,7 +42,7 @@
                 }
 
                 if(node) {
-                    node.restart();
+                    node.restart(obj.args[2]);
                 }
             }
         });