mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Fix issue where the player's pistol isn't removed when they spawn on HURTRAIL/FLOORSLIME/FLOORPLASMA
git-svn-id: https://svn.eduke32.com/eduke32@7292 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
acf8384d11
commit
cae791ffa4
1 changed files with 16 additions and 12 deletions
|
@ -1639,20 +1639,24 @@ static void G_ResetAllPlayers(void)
|
|||
for (int TRAVERSE_CONNECT(i))
|
||||
{
|
||||
auto &p = *g_player[i].ps;
|
||||
switch (DYNAMICTILEMAP(sector[sprite[p.i].sectnum].floorpicnum))
|
||||
|
||||
if (p.cursectnum >= 0)
|
||||
{
|
||||
case HURTRAIL__STATIC:
|
||||
case FLOORSLIME__STATIC:
|
||||
case FLOORPLASMA__STATIC:
|
||||
P_ResetWeapons(i);
|
||||
P_ResetInventory(i);
|
||||
switch (DYNAMICTILEMAP(sector[p.cursectnum].floorpicnum))
|
||||
{
|
||||
case HURTRAIL__STATIC:
|
||||
case FLOORSLIME__STATIC:
|
||||
case FLOORPLASMA__STATIC:
|
||||
P_ResetWeapons(i);
|
||||
P_ResetInventory(i);
|
||||
|
||||
p.ammo_amount[PISTOL_WEAPON] = 0;
|
||||
p.gotweapon &= ~(1 << PISTOL_WEAPON);
|
||||
p.curr_weapon = KNEE_WEAPON;
|
||||
p.kickback_pic = 0;
|
||||
p.ammo_amount[PISTOL_WEAPON] = 0;
|
||||
p.gotweapon &= ~(1 << PISTOL_WEAPON);
|
||||
p.curr_weapon = KNEE_WEAPON;
|
||||
p.kickback_pic = 0;
|
||||
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue