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

akimbo bug fixed; some new bugs added

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4598 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2009-08-05 21:21:57 +00:00
parent bb791457ef
commit f1e879e7fd
46 changed files with 2794 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+5 -5
View File
@@ -114,7 +114,7 @@ bool mmcollide(physent *d, float &hi, float &lo) // collide with a map
loopv(ents)
{
entity &e = ents[i];
if(e.type==CLIP)
if(e.type==CLIP || (e.type == PLCLIP && d->type == ENT_PLAYER))
{
if(fabs(e.x-d->o.x) < e.attr2 + d->radius && fabs(e.y-d->o.y) < e.attr3 + d->radius)
{
@@ -434,10 +434,10 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
pl->vel.mul(1.25f);
}
if(water) // dampen velocity change even harder, gives correct water feel
{
pl->vel.x /= 8.0f;
pl->vel.y /= 8.0f;
}
{
pl->vel.x /= 8.0f;
pl->vel.y /= 8.0f;
}
else if(pl==player1 || pl->type!=ENT_PLAYER) audiomgr.playsoundc(S_JUMP, pl);
pl->lastjump = lastmillis;
}