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

* Updated to ZDoom r3315:

Browse source 
- Added flag ALF_NOFRIENDS and a friend-basis pointer to P_AimLineAttack(). A_DeathBallImpact uses these to avoid aiming at friends when the death ball bounces. (The pointer is needed because the missile itself does the aiming, not the player that shot it, and missiles are nobody's friends.)
- Allow subclasses when checking for PowerWeaponLevel2.
- Fixed: Starting in a sector with a musinfo thing would not trigger the thing.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1264 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2011-11-07 11:10:18 +00:00
parent 900a6c766b
commit 7038a4ee5b
13 changed files with 74 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_user.cpp
View file

@ -672,7 +672,7 @@ AWeapon *APlayerPawn::BestWeapon (const PClass *ammotype)
int bestOrder = INT_MAX;
AInventory *item;
AWeapon *weap;
bool tomed = NULL != FindInventory (RUNTIME_CLASS(APowerWeaponLevel2));
bool tomed = NULL != FindInventory (RUNTIME_CLASS(APowerWeaponLevel2), true);
// Find the best weapon the player has.
for (item = Inventory; item != NULL; item = item->Inventory)