OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/version.h
This commit is contained in:
Rachael Alexanderson 2017-02-28 04:46:23 -05:00
commit 5aec906031
25 changed files with 163 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_pspr.cpp
View file

@ -540,6 +540,7 @@ void P_FireWeapon (player_t *player, FState *state)
return;
}
player->WeaponState &= ~WF_WEAPONBOBBING;
player->mo->PlayAttacking ();
weapon->bAltFire = false;
if (state == nullptr)
@ -576,6 +577,7 @@ void P_FireWeaponAlt (player_t *player, FState *state)
return;
}
player->WeaponState &= ~WF_WEAPONBOBBING;
player->mo->PlayAttacking ();
weapon->bAltFire = true;