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

switching between spect modes, demo recording fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1462 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-12-15 20:45:02 +00:00
parent 1da623b451
commit ad52973b6f
8 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+3 -3
View File
@@ -232,7 +232,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
{
const bool water = hdr.waterlevel>pl->o.z-0.5f;
const bool editfly = (editmode && local) || pl->state==CS_EDITING;
const bool specfly = local && pl->type==ENT_PLAYER && (pl->state==CS_SPECTATE || ((playerent *)pl)->spectating==SM_FLY);
const bool specfly = local && pl->type==ENT_PLAYER && ((playerent *)pl)->spectating==SM_FLY;
const float speed = curtime/(water ? 2000.0f : 1000.0f)*pl->maxspeed*(pl->crouching ? 0.5f : 1.0f);
const float friction = water ? 20.0f : (pl->onfloor || editfly || specfly ? 6.0f : (pl->onladder ? 1.5f : 30.0f));
@@ -487,9 +487,9 @@ void attack(bool on)
void jumpn(bool on)
{
if(intermission) return;
if(player1->state==CS_DEAD)
if(player1->state==CS_DEAD || player1->state==CS_SPECTATE)
{
if(on) toggledeathcam();
if(on) player1->spectating = SM_FLY;
}
else if(player1->crouching) return;
else player1->jumpnext = on;