no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1004 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-05-16 20:48:25 +00:00
parent 017d1c1d45
commit b8df666851
4 changed files with 13 additions and 16 deletions
+7 -1
View File
@@ -212,6 +212,12 @@ bool collide(physent *d, bool spawn, float drop, float rise)
return true;
}
float floor(short x, short y)
{
sqr *s = S(x, y);
return s->type == FHF ? s->floor-(s->vdelta+S(x+1,y)->vdelta+S(x,y+1)->vdelta+S(x+1,y+1)->vdelta)/16.0f : s->floor;
}
VARP(maxroll, 0, 0, 20);
// main physics routine, moves a player/monster for a curtime step
@@ -264,7 +270,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
d.x = (float)(move*cosf(RAD*(pl->yaw-90)));
d.y = (float)(move*sinf(RAD*(pl->yaw-90)));
d.z = (float)pl->type==ENT_BOUNCE ? pl->vel.z : 0;
d.z = 0.0f;
if(floating || water)
{