OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- reverted r2783 because it was causing problems.

Browse source 
SVN r2792 (trunk)
This commit is contained in:
Christoph Oelckers 2010-09-16 06:51:42 +00:00
commit 3662bf8a15
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.cpp
View file

@ -1103,10 +1103,7 @@ void APlayerPawn::GiveDefaultInventory ()
if (item != NULL && item->IsKindOf (RUNTIME_CLASS (AWeapon)) &&
static_cast<AWeapon*>(item)->CheckAmmo(AWeapon::EitherFire, false))
{
// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
player->PendingWeapon = static_cast<AWeapon *> (item);
player->ReadyWeapon = NULL;
//player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
}
}
di = di->Next;