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

final corner physics fix

Browse Source 
if corner sliding doesn't work, try x- and y-slides as well
This commit is contained in:
ac-stef
2016-09-13 21:17:07 +02:00
parent a976e5b4ba
commit 1a482e5394
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+16 -19
View File
@@ -684,27 +684,24 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
}
pl->o = o_nullxy;
}
else
// try slide along y axis
pl->o.y = o_trying.y;
if(!collide(pl, false, drop, rise))
{
// try slide along y axis
pl->o.y = o_trying.y;
if(!collide(pl, false, drop, rise))
{
d.x = 0;
if(pl->type==ENT_BOUNCE) { pl->vel.x = -pl->vel.x; pl->vel.mul(0.7f); }
continue;
}
pl->o = o_nullxy;
// try x axis
pl->o.x = o_trying.x;
if(!collide(pl, false, drop, rise))
{
d.y = 0;
if(pl->type==ENT_BOUNCE) { pl->vel.y = -pl->vel.y; pl->vel.mul(0.7f); }
continue;
}
pl->o = o_nullxy;
d.x = 0;
if(pl->type==ENT_BOUNCE) { pl->vel.x = -pl->vel.x; pl->vel.mul(0.7f); }
continue;
}
pl->o = o_nullxy;
// try x axis
pl->o.x = o_trying.x;
if(!collide(pl, false, drop, rise))
{
d.y = 0;
if(pl->type==ENT_BOUNCE) { pl->vel.y = -pl->vel.y; pl->vel.mul(0.7f); }
continue;
}
pl->o = o_nullxy;
// try just dropping down
if(!collide(pl, false, drop, rise))
{