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

fixed ent_bounce behavior in water

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1841 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-03 15:25:01 +00:00
parent 7e7fe5a334
commit 709c58d2da
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+4 -3
View File
@@ -237,7 +237,7 @@ VAR(recoilbackfade, 0, 100, 1000);
void moveplayer(physent *pl, int moveres, bool local, int curtime)
{
const bool water = hdr.waterlevel>pl->o.z-0.5f;
bool water = false;
const bool editfly = (editmode && local) || pl->state==CS_EDITING;
const bool specfly = local && pl->type==ENT_PLAYER && ((playerent *)pl)->spectating==SM_FLY;
@@ -253,6 +253,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
{
bounceent* bounce = (bounceent *) pl;
drop = rise = 0;
water = hdr.waterlevel>pl->o.z;
if(pl->onfloor) // apply friction
{
@@ -268,8 +269,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
d = bounce->vel;
d.mul(speed);
if(water) { d.x /= 6; d.y /= 6; }
if(water) d.div(6.0f);
// rotate
float rotspeed = bounce->rotspeed*d.magnitude();
@@ -280,6 +280,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
{
const int timeinair = pl->timeinair;
int move = pl->onladder && !pl->onfloor && pl->move == -1 ? 0 : pl->move; // movement on ladder
water = hdr.waterlevel>pl->o.z-0.5f;
d.x = (float)(move*cosf(RAD*(pl->yaw-90)));
d.y = (float)(move*sinf(RAD*(pl->yaw-90)));