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

Correct the special behavior to select the pipebomb detonator when you have no pipebombs in your inventory but you have some thrown in the environment so that it animates properly and also applies with the next/previous weapon functions.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4967 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-02-08 08:03:06 +00:00
parent 2cbd80ad90
commit c5b3cfa445
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2380,6 +2380,24 @@ void G_AlignWarpElevators(void)
} }
} }
static int32_t P_CheckDetonatorSpecialCase(DukePlayer_t *const p, int32_t weapid)
{
if (weapid == HANDBOMB_WEAPON && p->ammo_amount[HANDBOMB_WEAPON] == 0)
{
int32_t k = headspritestat[STAT_ACTOR];
while (k >= 0)
{
if (sprite[k].picnum == HEAVYHBOMB && sprite[k].owner == p->i)
return 1;
k = nextspritestat[k];
}
}
return 0;
}
void P_HandleSharedKeys(int32_t snum) void P_HandleSharedKeys(int32_t snum)
{ {
int32_t i, k = 0, dainv; int32_t i, k = 0, dainv;
@ -2703,7 +2721,7 @@ CHECKINV1:
if (k == -1) k = FREEZE_WEAPON; if (k == -1) k = FREEZE_WEAPON;
else if (k == 10) k = KNEE_WEAPON; else if (k == 10) k = KNEE_WEAPON;
if ((p->gotweapon & (1<<k)) && p->ammo_amount[k] > 0) if (((p->gotweapon & (1<<k)) && p->ammo_amount[k] > 0) || P_CheckDetonatorSpecialCase(p, k))
{ {
j = k; j = k;
break; break;
@ -2729,19 +2747,10 @@ CHECKINV1:
// XXX: any signifcance to "<= MAX_WEAPONS" instead of "<"? // XXX: any signifcance to "<= MAX_WEAPONS" instead of "<"?
if ((int32_t)j != -1 && j <= MAX_WEAPONS) if ((int32_t)j != -1 && j <= MAX_WEAPONS)
{ {
if (j == HANDBOMB_WEAPON && p->ammo_amount[HANDBOMB_WEAPON] == 0) if (P_CheckDetonatorSpecialCase(p, j))
{ {
k = headspritestat[STAT_ACTOR]; p->gotweapon |= (1<<HANDBOMB_WEAPON);
while (k >= 0) j = HANDREMOTE_WEAPON;
{
if (sprite[k].picnum == HEAVYHBOMB && sprite[k].owner == p->i)
{
p->gotweapon |= (1<<HANDBOMB_WEAPON);
j = HANDREMOTE_WEAPON;
break;
}
k = nextspritestat[k];
}
} }
if (j == SHRINKER_WEAPON && PLUTOPAK) // JBF 20040116: so we don't select the grower with v1.3d if (j == SHRINKER_WEAPON && PLUTOPAK) // JBF 20040116: so we don't select the grower with v1.3d
@ -2794,15 +2803,8 @@ CHECKINV1:
p->show_empty_weapon = 32; p->show_empty_weapon = 32;
} }
case KNEE_WEAPON: case KNEE_WEAPON:
P_AddWeapon(p, j, 1);
break;
case HANDREMOTE_WEAPON: case HANDREMOTE_WEAPON:
if (k >= 0) // Found in list of [1]'s P_AddWeapon(p, j, 1);
{
p->curr_weapon = j;
p->last_weapon = -1;
p->weapon_pos = WEAPON_POS_RAISE;
}
break; break;
case HANDBOMB_WEAPON: case HANDBOMB_WEAPON:
case TRIPBOMB_WEAPON: case TRIPBOMB_WEAPON: