zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 22:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Player turned into a zombie if exiting telefragged in buddha mode.

Browse source 
- Fixed: Players could drop their inventory after dying.
This commit is contained in:
Braden Obrzut 2014-07-15 20:16:28 -04:00
parent 004cf5748c
commit 2020769967
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_net.cpp
View file

@ -2163,7 +2163,8 @@ void Net_DoCommand (int type, BYTE **stream, int player)
{
DWORD which = ReadLong (stream);
if (gamestate == GS_LEVEL && !paused)
if (gamestate == GS_LEVEL && !paused
&& players[player].playerstate != PST_DEAD)
{
AInventory *item = players[player].mo->Inventory;
while (item != NULL && item->InventoryID != which)

4
src/p_interaction.cpp
View file

@ -1255,7 +1255,9 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
// This does not save the player if damage >= TELEFRAG_DAMAGE, still need to
// telefrag him right? ;) (Unfortunately the damage is "absorbed" by armor,
// but telefragging should still do enough damage to kill the player)
if ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE)
if ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE
// Ignore players that are already dead.
&& player->playerstate != PST_DEAD)
{
// If this is a voodoo doll we need to handle the real player as well.
player->mo->health = target->health = player->health = 1;