From 5180ae2615ae85e3c0725a1673b1f1e3dab95d2c Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sun, 23 Jan 2005 13:35:16 +0000 Subject: [PATCH] even ifndef NETWORK do last level hack only on last level of built-in mission --- ChangeLog | 5 +++++ main/collide.c | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83b581db..7d7099b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-23 Chris Taylor + + * main/collide: fix bug #2140, even ifndef NETWORK do last level hack + only on last level of built-in mission. + 2005-01-10 Chris Taylor * main/bmread.c, main/dumpmine.c, main/gameseq.c, main/piggy.c: diff --git a/main/collide.c b/main/collide.c index 86ab16d3..a21ada73 100644 --- a/main/collide.c +++ b/main/collide.c @@ -1,4 +1,4 @@ -/* $Id: collide.c,v 1.14 2004-10-09 15:59:28 schaffner Exp $ */ +/* $Id: collide.c,v 1.15 2005-01-23 13:35:16 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -77,6 +77,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "automap.h" #include "switch.h" #include "palette.h" +#include "gameseq.h" #ifdef TACTILE #include "tactile.h" @@ -1388,9 +1389,7 @@ int apply_damage_to_robot(object *robot, fix damage, int killer_objnum) // Do unspeakable hacks to make sure player doesn't die after killing boss. Or before, sort of. if (Robot_info[robot->id].boss_flag) -#ifdef NETWORK if (PLAYING_BUILTIN_MISSION && Current_level_num == Last_level) -#endif if (robot->shields < 0) { #ifdef NETWORK -- 2.39.2