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

physics

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@858 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-03-23 20:44:17 +00:00
parent 8a6d454761
commit c423ba443e
3 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+9 -7
View File
@@ -360,7 +360,6 @@ void throw_nade(playerent *d, const vec &vel, bounceent *p)
p->bouncestate = NADE_THROWED;
d->thrownademillis = lastmillis;
d->inhandnade = NULL;
if(d==player1)
@@ -374,16 +373,17 @@ void throw_nade(playerent *d, bounceent *p)
{
if(!d || !p) return;
float speed = cosf(RAD*d->pitch);
vec vel;
vel.z = sinf(RAD*d->pitch);
vel.x = sinf(RAD*d->yaw)*speed;
vel.y = -cosf(RAD*d->yaw)*speed;
vel.mul(1.7f);
const float speed = cosf(RAD*d->pitch);
vec vel(sinf(RAD*d->yaw)*speed, -cosf(RAD*d->yaw)*speed, sinf(RAD*d->pitch));
vel.mul(1.5f);
throw_nade(d, vel, p);
};
// fixme
VAR(grenadespeed, 0, 27, 100);
VAR(grenaderot, 0, 60, 100);
bounceent *new_nade(playerent *d, int millis = 0)
{
bounceent *p = newbounceent();
@@ -391,6 +391,8 @@ bounceent *new_nade(playerent *d, int millis = 0)
p->millis = lastmillis;
p->timetolife = 2000-millis;
p->bouncestate = NADE_ACTIVATED;
p->maxspeed = (float)grenadespeed;
p->rotspeed = grenaderot/10.0f;
d->inhandnade = p;
d->thrownademillis = 0;