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

spectator div-by-0 position bug

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2262 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2008-07-30 21:40:18 +00:00
parent 3211848537
commit f36a106f2e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+11 -9
View File
@@ -398,18 +398,20 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
hitplayer = NULL;
if(collide(pl, false, drop, rise)) continue;
else collided = true;
// fs: trying to fix the spectator bug (monochrome screen et al)
//if(pl->type==ENT_CAMERA) continue; //return;
if(pl->type==ENT_CAMERA) return;
if(pl->type==ENT_PLAYER && hitplayer)
{
float dx = hitplayer->o.x-pl->o.x, dy = hitplayer->o.y-pl->o.y, mag = sqrtf(dx*dx+dy*dy);
dx /= mag;
dy /= mag;
pl->o.x -= f*(dx + d.x);
pl->o.y -= f*(dy + d.y);
if(collide(pl, false, drop, rise)) continue;
pl->o.x += f*(dx + d.x);
pl->o.y += f*(dy + d.y);
if(mag)
{
dx /= mag;
dy /= mag;
pl->o.x -= f*(dx + d.x);
pl->o.y -= f*(dy + d.y);
if(collide(pl, false, drop, rise)) continue;
pl->o.x += f*(dx + d.x);
pl->o.y += f*(dy + d.y);
}
}
// player stuck, try slide along y axis
pl->o.x -= f*d.x;