zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-18 15:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Morphed players tried endlessly to switch to a weapon they picked up.

Browse source 
SVN r2027 (trunk)
This commit is contained in:
Christoph Oelckers 2009-12-16 22:42:15 +00:00
parent fdec06ff9b
commit 1c5103c9b1
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,5 +1,6 @@
December 16, 2009 (Changes by Graf Zahl) December 16, 2009 (Changes by Graf Zahl)
- fixed:P_DamageMobj just set an ice corpse's velocity to 0 to make it shatter. - Fixed: Morphed players tried endlessly to switch to a weapon they picked up.
- fixed: P_DamageMobj just set an ice corpse's velocity to 0 to make it shatter.
But that's insufficient because it doesn't factor in any subsequent velocity But that's insufficient because it doesn't factor in any subsequent velocity
change that happens between the damaging and the next call to A_FreezeDeathChunks. change that happens between the damaging and the next call to A_FreezeDeathChunks.
- fixed: The TimeFreezer did not freeze other players' controls in a - fixed: The TimeFreezer did not freeze other players' controls in a

5
src/p_pspr.cpp
View file

@ -505,6 +505,11 @@ void P_CheckWeaponSwitch (player_t *player)
P_SetPsprite (player, ps_weapon, weapon->GetDownState()); P_SetPsprite (player, ps_weapon, weapon->GetDownState());
return; return;
} }
else if (player->morphTics != 0)
{
// morphed classes cannot change weapons so don't even try again.
player->PendingWeapon = WP_NOCHANGE;
}
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------