zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-03 02:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom r2794:

Browse source 
- Added Demolisher's APROP_Target/TracerTID [fixed] submission.
- Reverted r2783 because it was causing problems.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@965 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-09-16 09:06:42 +00:00
parent f19cdb49f3
commit 00845f2bb3
5 changed files with 10 additions and 16 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;