OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/r_plane.cpp
#	src/win32/zdoom.rc
This commit is contained in:
Magnus Norddahl 2017-01-13 13:21:10 +01:00
commit 1d941c9839
98 changed files with 768 additions and 927 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_user.cpp
View file

@ -942,7 +942,7 @@ bool APlayerPawn::UseInventory (AInventory *item)
//
//===========================================================================
AWeapon *APlayerPawn::BestWeapon(PClassAmmo *ammotype)
AWeapon *APlayerPawn::BestWeapon(PClassInventory *ammotype)
{
AWeapon *bestMatch = NULL;
int bestOrder = INT_MAX;
@ -1004,7 +1004,7 @@ AWeapon *APlayerPawn::BestWeapon(PClassAmmo *ammotype)
//
//===========================================================================
AWeapon *APlayerPawn::PickNewWeapon(PClassAmmo *ammotype)
AWeapon *APlayerPawn::PickNewWeapon(PClassInventory *ammotype)
{
AWeapon *best = BestWeapon (ammotype);
@ -1032,7 +1032,7 @@ AWeapon *APlayerPawn::PickNewWeapon(PClassAmmo *ammotype)
//
//===========================================================================
void APlayerPawn::CheckWeaponSwitch(PClassAmmo *ammotype)
void APlayerPawn::CheckWeaponSwitch(PClassInventory *ammotype)
{
if (!player->userinfo.GetNeverSwitch() &&
player->PendingWeapon == WP_NOCHANGE &&