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

ensure fpsfric doesn't underflow

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2285 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2008-08-06 10:32:08 +00:00
parent 239238a2b9
commit c0d06289a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+2 -2
View File
@@ -263,7 +263,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
const float speed = curtime*pl->maxspeed/(water ? 2000.0f : 1000.0f);
const float friction = water ? 20.0f : (pl->onfloor || editfly || specfly ? 6.0f : 30.0f);
const float fpsfric = friction*20.0f/curtime;
const float fpsfric = max(friction*20.0f/curtime, 1.0f);
if(pl->onfloor) // apply friction
{
@@ -298,7 +298,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
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));
const float fpsfric = friction/curtime*20.0f;
const float fpsfric = max(friction/curtime*20.0f, 1.0f);
d.x = (float)(move*cosf(RAD*(pl->yaw-90)));
d.y = (float)(move*sinf(RAD*(pl->yaw-90)));