From 29a4192cccdcf92a482b4d784fa90a1a5bbdf008 Mon Sep 17 00:00:00 2001 From: Bryce Hutchings Date: Mon, 9 Sep 2002 02:26:18 +0000 Subject: [PATCH] fixed drop case --- reaction/game/g_items.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reaction/game/g_items.c b/reaction/game/g_items.c index 572c6799..b67bf745 100644 --- a/reaction/game/g_items.c +++ b/reaction/game/g_items.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.48 2002/09/09 02:26:18 niceass +// fixed drop case +// // Revision 1.47 2002/09/07 23:30:43 jbravo // Dropped cases stay on the map for 45 seconds (was 30) // @@ -633,7 +636,12 @@ void Touch_Item(gentity_t * ent, gentity_t * other, trace_t * trace) predict = qfalse; break; case IT_TEAM: + // NiceAss: can't pick it up if it's in mid-flight (someone dropped it) + if ( ent->s.pos.trDelta[2] != 0.0f ) + return; + respawn = Pickup_Team(ent, other); + break; case IT_HOLDABLE: //Elder: check to see if it's in mid-air