zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-25 13:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: EV_Teleport must not access the thing's player pointer before ensuring that 'thing' is a valid pointer.

Browse source
This commit is contained in:
Christoph Oelckers 2014-10-06 17:40:02 +02:00
parent 981b5f32e0
commit 3eaebabdf1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_teleport.cpp
View file

@ -328,7 +328,6 @@ static AActor *SelectTeleDest (int tid, int tag, bool norandom)
bool EV_Teleport (int tid, int tag, line_t *line, int side, AActor *thing, bool fog, bool EV_Teleport (int tid, int tag, line_t *line, int side, AActor *thing, bool fog,
bool sourceFog, bool keepOrientation, bool haltVelocity, bool keepHeight) bool sourceFog, bool keepOrientation, bool haltVelocity, bool keepHeight)
{ {
bool predicting = (thing->player && (thing->player->cheats & CF_PREDICTING));
AActor *searcher; AActor *searcher;
fixed_t z; fixed_t z;
@ -341,6 +340,7 @@ bool EV_Teleport (int tid, int tag, line_t *line, int side, AActor *thing, bool
{ // Teleport function called with an invalid actor { // Teleport function called with an invalid actor
return false; return false;
} }
bool predicting = (thing->player && (thing->player->cheats & CF_PREDICTING));
if (thing->flags2 & MF2_NOTELEPORT) if (thing->flags2 & MF2_NOTELEPORT)
{ {
return false; return false;