zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: Switching a weapon did not reset the refire counter. 

SVN r1776 (trunk)
This commit is contained in:
Christoph Oelckers 2009-08-29 15:50:03 +00:00
parent bdc0950e01
commit 6e3fdbdfc8
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/g_shared/a_weapons.cpp
View File

@ -520,6 +520,7 @@ void AWeapon::PostMorphWeapon ()
Owner->player->PendingWeapon = WP_NOCHANGE; Owner->player->PendingWeapon = WP_NOCHANGE;
Owner->player->ReadyWeapon = this; Owner->player->ReadyWeapon = this;
Owner->player->psprites[ps_weapon].sy = WEAPONBOTTOM; Owner->player->psprites[ps_weapon].sy = WEAPONBOTTOM;
Owner->player->refire = 0;
P_SetPsprite (Owner->player, ps_weapon, GetUpState()); P_SetPsprite (Owner->player, ps_weapon, GetUpState());
} }

1
src/p_pspr.cpp
View File

@ -186,6 +186,7 @@ void P_BringUpWeapon (player_t *player)
S_Sound (player->mo, CHAN_WEAPON, weapon->UpSound, 1, ATTN_NORM); S_Sound (player->mo, CHAN_WEAPON, weapon->UpSound, 1, ATTN_NORM);
} }
newstate = weapon->GetUpState (); newstate = weapon->GetUpState ();
player->refire = 0;
} }
else else
{ {

6
src/thingdef/thingdef_codeptr.cpp
View File

@ -1581,12 +1581,6 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ThrowGrenade)
bo->velx += self->velx >> 1; bo->velx += self->velx >> 1;
bo->vely += self->vely >> 1; bo->vely += self->vely >> 1;
bo->target= self; bo->target= self;
if (bo->flags4&MF4_RANDOMIZE)
{
bo->tics -= pr_grenade() & 3;
if (bo->tics < 1)
bo->tics = 1;
}
P_CheckMissileSpawn (bo); P_CheckMissileSpawn (bo);
} }
else ACTION_SET_RESULT(false); else ACTION_SET_RESULT(false);