rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-10 07:11:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Waits for pin-pull animation before throwing - NiceAss

Browse source
This commit is contained in:
Bryce Hutchings 2001-11-14 06:57:40 +00:00
parent d090ed8331
commit 0850476274
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reaction/game/bg_pmove.c
View file

@ -1199,7 +1199,7 @@ static int PM_FootstepForSurface( void ) {
if ( pml.groundTrace.surfaceFlags & SURF_GRASS ) {
return EV_FOOTSTEP_GRASS;
}
//if ( pml.groundTrace.surfaceFlags & SURF_GRAVEL ) {
//return EV_FOOTSTEP_GRAVEL;
//}
@ -2689,7 +2689,10 @@ static void PM_Weapon( void ) {
{
if ( pm->ps->weapon == WP_GRENADE )
{
pm->ps->weaponTime = 0;
// NiceAss: Add a delay so the pin-pull animation can complete.
if (pm->ps->weaponstate != WEAPON_COCKED) {
pm->ps->weaponTime = 800;
}
// put it in the "cocked" position and play the pin-pull animation
pm->ps->weaponstate = WEAPON_COCKED;
PM_ContinueWeaponAnim(WP_ANIM_EXTRA1);
@ -2707,7 +2710,7 @@ static void PM_Weapon( void ) {
}
}
// check for fire release
// check for fireA release
// if they aren't pressing attack
if (!(pm->cmd.buttons & 1)) {
// if we had them cocked and then they aren't pressing it then