From 60307e793f21ce85135c282aad894653ad85e627 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sat, 25 Oct 2008 14:13:27 +0000
Subject: [PATCH] faster spectator-fly mode

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3244 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/physics.cpp  | 22 +++++++++++++++++-----
 source/src/rendergl.cpp |  1 +
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/source/src/physics.cpp b/source/src/physics.cpp
index 5653bb5e..2af07734 100644
--- a/source/src/physics.cpp
+++ b/source/src/physics.cpp
@@ -360,7 +360,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
         water = hdr.waterlevel>pl->o.z-0.5f;
 
         const bool crouching = pl->crouching || pl->eyeheight < pl->maxeyeheight;
-        const float speed = curtime/(water ? 2000.0f : 1000.0f)*pl->maxspeed*(crouching ? 0.5f : 1.0f);
+        const float speed = curtime/(water ? 2000.0f : 1000.0f)*pl->maxspeed*(crouching ? 0.5f : 1.0f)*(specfly ? 2.0f : 1.0f);
         const float friction = water ? 20.0f : (pl->onfloor || editfly || specfly ? 6.0f : (pl->onladder ? 1.5f : 30.0f));
         const float fpsfric = max(friction/curtime*20.0f, 1.0f);
 
@@ -387,13 +387,21 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
         if(editfly)                // just apply velocity
         {
             pl->o.add(d);
-            if(pl->jumpnext) { pl->jumpnext = false; pl->vel.z = 2; }
+            if(pl->jumpnext) 
+            { 
+                pl->jumpnext = false; 
+                pl->vel.z = 2; 
+            }
         }
-        if(specfly)
+        else if(specfly)
         {
             drop = 0.0f;
             rise = speed/moveres/1.2f;
-            if(pl->jumpnext) { pl->jumpnext = false; pl->vel.z = 2; }
+            if(pl->jumpnext) 
+            { 
+                pl->jumpnext = false; 
+                pl->vel.z = 2; 
+            }
         }
         else                        // apply velocity with collisions
         {
@@ -694,7 +702,11 @@ void updatecrouch(playerent *p, bool on)
     p->eyeheightvel = on ? -crouchspeed : crouchspeed;
 }
 
-void crouch(bool on) { player1->trycrouch = on; }
+void crouch(bool on) 
+{ 
+    if(player1->isspectating()) return;
+    player1->trycrouch = on; 
+}
 
 COMMAND(backward, ARG_DOWN);
 COMMAND(forward, ARG_DOWN);
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index 96b4dc30..0634a778 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -454,6 +454,7 @@ void recomputecamera()
             }
             case SM_FLY:
                 camera1 = player1;
+                camera1->eyeheight = 1.0f;
                 break;
             case SM_FOLLOW1ST:
             {