zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up weapon switching deficiencies

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4888 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-01-11 04:51:17 +00:00
parent 0699a44e4e
commit 9ab6ab7139
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/player.c
View file

@ -3101,6 +3101,8 @@ static void P_ChangeWeapon(DukePlayer_t *p, int32_t weapon)
if (p->weapon_pos == 0) if (p->weapon_pos == 0)
p->weapon_pos = -1; p->weapon_pos = -1;
else if ((unsigned)p->weapon_pos < WEAPON_POS_RAISE)
p->weapon_pos = -p->weapon_pos;
else p->weapon_pos = WEAPON_POS_LOWER; else p->weapon_pos = WEAPON_POS_LOWER;
if (p->holster_weapon) if (p->holster_weapon)

5
polymer/eduke32/source/sector.c
View file

@ -2644,8 +2644,9 @@ CHECKINV1:
p->kickback_pic = 0; p->kickback_pic = 0;
} }
if ((int32_t)j != -1 && p->last_pissed_time <= (GAMETICSPERSEC*218) && p->show_empty_weapon == 0 /*&& p->kickback_pic == 0*/ && if ((int32_t)j != -1 && p->last_pissed_time <= (GAMETICSPERSEC * 218) && p->show_empty_weapon == 0 &&
p->quick_kick == 0 && sprite[p->i].xrepeat > 32 && p->access_incs == 0 && p->knee_incs == 0) p->kickback_pic == 0 && p->quick_kick == 0 && sprite[p->i].xrepeat > 32 && p->access_incs == 0 &&
p->knee_incs == 0)
{ {
// if( ( p->weapon_pos == 0 || ( p->holster_weapon && p->weapon_pos == WEAPON_POS_LOWER ) )) // if( ( p->weapon_pos == 0 || ( p->holster_weapon && p->weapon_pos == WEAPON_POS_LOWER ) ))
{ {