From 8a51309a7178a9522ab7496d5f4a80052e7980ce Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 17 Oct 2001 23:43:03 +0000 Subject: [PATCH] Fixed the invulnerable robots bug! --- main/collide.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/collide.c b/main/collide.c index 4994e7ef6..d2c478de8 100644 --- a/main/collide.c +++ b/main/collide.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: collide.c,v 1.5 2001-10-12 06:40:49 bradleyb Exp $"; +static char rcsid[] = "$Id: collide.c,v 1.6 2001-10-17 23:43:03 bradleyb Exp $"; #endif #include // for memset @@ -1363,12 +1363,13 @@ int apply_damage_to_robot(object *robot, fix damage, int killer_objnum) // Buddy invulnerable on level 24 so he can give you his important messages. Bah. // Also invulnerable if his cheat for firing weapons is in effect. - if (Robot_info[robot->id].companion) + if (Robot_info[robot->id].companion) { // if ((Current_mission_num == 0 && Current_level_num == Last_level) || Buddy_dude_cheat) #ifdef NETWORK if ((Current_mission_num == 0 && Current_level_num == Last_level) ) return 0; #endif + } // if (robot->control_type == CT_REMOTE) // return 0; // Can't damange a robot controlled by another player