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 issue where the player's pistol isn't removed when they spawn on HURTRAIL/FLOORSLIME/FLOORPLASMA

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7292 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-12-15 21:34:57 +00:00
parent acf8384d11
commit cae791ffa4
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/duke3d/src/premap.cpp
View file

@ -1639,20 +1639,24 @@ static void G_ResetAllPlayers(void)
for (int TRAVERSE_CONNECT(i)) for (int TRAVERSE_CONNECT(i))
{ {
auto &p = *g_player[i].ps; auto &p = *g_player[i].ps;
switch (DYNAMICTILEMAP(sector[sprite[p.i].sectnum].floorpicnum))
if (p.cursectnum >= 0)
{ {
case HURTRAIL__STATIC: switch (DYNAMICTILEMAP(sector[p.cursectnum].floorpicnum))
case FLOORSLIME__STATIC: {
case FLOORPLASMA__STATIC: case HURTRAIL__STATIC:
P_ResetWeapons(i); case FLOORSLIME__STATIC:
P_ResetInventory(i); case FLOORPLASMA__STATIC:
P_ResetWeapons(i);
P_ResetInventory(i);
p.ammo_amount[PISTOL_WEAPON] = 0; p.ammo_amount[PISTOL_WEAPON] = 0;
p.gotweapon &= ~(1 << PISTOL_WEAPON); p.gotweapon &= ~(1 << PISTOL_WEAPON);
p.curr_weapon = KNEE_WEAPON; p.curr_weapon = KNEE_WEAPON;
p.kickback_pic = 0; p.kickback_pic = 0;
break; break;
}
} }
} }
} }
@ -2031,7 +2035,7 @@ int G_EnterLevel(int gameMode)
if (g_netClient || g_netServer) // [75] : Initialize map states after map load if (g_netClient || g_netServer) // [75] : Initialize map states after map load
{ {
Net_InitMapStateHistory(); Net_InitMapStateHistory();
Net_AddWorldToInitialSnapshot(); Net_AddWorldToInitialSnapshot();
} }
Net_WaitForServer(); Net_WaitForServer();