From 2820da82677d746198568b60f7c6df39bc4f2c93 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sat, 17 Dec 2016 09:47:52 +0100 Subject: [PATCH] Fix sanity check of door_secret_move6() and door_secret_die(). After this change they match the sanity checks in baseq2 and xatrix. This was reported by maraakate in yquake2 issue #160. --- src/g_func.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/g_func.c b/src/g_func.c index ede92d8..4572ae0 100644 --- a/src/g_func.c +++ b/src/g_func.c @@ -3745,6 +3745,11 @@ door_secret_move5(edict_t *self) void door_secret_move6(edict_t *self) { + if (!self) + { + return; + } + Move_Calc(self, vec3_origin, door_secret_done); } @@ -3806,7 +3811,7 @@ door_secret_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker, int damage /* unused */, vec3_t point /* unused */) { - if (!self) + if (!self || !attacker) { return; }