OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added a simple check for abstract weapon classes so that I can properly define

Browse source 
the DoomWeapon base class.
- Fixed: When the Tome of Power runs out it must also set any pending weapon
  back to their regular state.


SVN r521 (trunk)
This commit is contained in:
Christoph Oelckers 2007-04-29 08:44:32 +00:00
commit 6e5b1f1182
5 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/g_shared/a_weapons.cpp
View file

@ -486,7 +486,8 @@ void AWeapon::EndPowerup ()
{
if (GetReadyState() != SisterWeapon->GetReadyState())
{
Owner->player->PendingWeapon = SisterWeapon;
if (Owner->player->PendingWeapon != NULL)
Owner->player->PendingWeapon = SisterWeapon;
}
else
{