From fd6b55339b7a810c121be0ae1bd14a9ffed4a572 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 10 Nov 2008 11:32:55 +0000 Subject: [PATCH] prevent QC crash when a flag carrier had no flag carrier sprite, but WHY? git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5031 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/ctf.qc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc index 29e304871..1e814611f 100644 --- a/data/qcsrc/server/ctf.qc +++ b/data/qcsrc/server/ctf.qc @@ -253,8 +253,16 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker) e.playerid = attacker.playerid; e.ctf_droptime = time; - WaypointSprite_Ping(p.waypointsprite_attachedforcarrier); - WaypointSprite_DetachCarrier(p); + if(p.waypointsprite_attachedforcarrier) + { + WaypointSprite_Ping(p.waypointsprite_attachedforcarrier); + WaypointSprite_DetachCarrier(p); + } + else + { + bprint("\{1}^1Flag carrier had no flag sprite?!?\n"); + backtrace("Flag carrier had no flag sprite?!?"); + } LogCTF("dropped", p.team, p); setattachment(e, world, ""); -- 2.39.2