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

grenade anim fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1432 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-11-17 14:17:45 +00:00
parent 20b22b46d7
commit 474d13d331
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+9 -5
View File
@@ -731,13 +731,17 @@ void shoot(playerent *d, vec &targ)
if(d->thrownademillis && attacktime >= NADE_THROW_TIME)
{
d->weaponchanging = lastmillis-1-WEAPONCHANGE_TIME/2;
d->nextweapon = d->mag[GUN_GRENADE] ? GUN_GRENADE : d->primary;
d->thrownademillis = 0;
if(!d->mag[GUN_GRENADE])
{
d->weaponchanging = lastmillis-1-WEAPONCHANGE_TIME/2;
d->nextweapon = d->gunselect = d->primary;
}
d->thrownademillis = 0;
return;
}
if(d->weaponchanging || attacktime<d->gunwait[d->gunselect]) return;
d->gunwait[d->gunselect] = 0;
if(attacktime<d->gunwait[d->gunselect]) return;
d->gunwait[d->gunselect] = 0;
d->reloading = 0;
if(d->attacking && !d->inhandnade) // activate