Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom

# Conflicts:
#	src/dobject.h
This commit is contained in:
Christoph Oelckers 2017-02-14 19:10:02 +01:00
commit 2234d36c7a
40 changed files with 1970 additions and 15 deletions

View file

@ -49,6 +49,7 @@
#include "a_morph.h"
#include "g_levellocals.h"
#include "virtual.h"
#include "events.h"
// [RH] Actually handle the cheat. The cheat code in st_stuff.c now just
// writes some bytes to the network data stream, and the network code
@ -347,6 +348,12 @@ void cht_DoCheat (player_t *player, int cheat)
P_UndoPlayerMorph(player, player);
}
// player is now alive.
// fire E_PlayerRespawned and start the ACS SCRIPT_Respawn.
E_PlayerRespawned(player - players);
//
FBehavior::StaticStartTypedScripts(SCRIPT_Respawn, player->mo, true);
}
}
break;