kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

faster spectator-fly mode

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3244 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-10-25 14:13:27 +00:00
parent 2ca2a84d4c
commit 60307e793f
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+17 -5
View File
@@ -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);