OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added Spleen's fix for not running 2 frames of the weapon when the player spawns.

Browse source 
SVN r2783 (trunk)
This commit is contained in:
Christoph Oelckers 2010-09-15 14:09:48 +00:00
commit a0d7693f33
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.cpp
View file

@ -1103,7 +1103,10 @@ void APlayerPawn::GiveDefaultInventory ()
if (item != NULL && item->IsKindOf (RUNTIME_CLASS (AWeapon)) &&
static_cast<AWeapon*>(item)->CheckAmmo(AWeapon::EitherFire, false))
{
player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
// [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);
}
}
di = di->Next;