TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

even ifndef NETWORK do last level hack only on last level of built-in mission

Browse source
This commit is contained in:
Martin Schaffner 2005-01-23 13:35:16 +00:00
parent d866389306
commit 5180ae2615
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-01-23 Chris Taylor <c.taylor@student.curtin.edu.au>
* 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 <c.taylor@student.curtin.edu.au> 2005-01-10 Chris Taylor <c.taylor@student.curtin.edu.au>
* main/bmread.c, main/dumpmine.c, main/gameseq.c, main/piggy.c: * main/bmread.c, main/dumpmine.c, main/gameseq.c, main/piggy.c:

5
main/collide.c
View file

@ -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 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO 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 "automap.h"
#include "switch.h" #include "switch.h"
#include "palette.h" #include "palette.h"
#include "gameseq.h"
#ifdef TACTILE #ifdef TACTILE
#include "tactile.h" #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. // Do unspeakable hacks to make sure player doesn't die after killing boss. Or before, sort of.
if (Robot_info[robot->id].boss_flag) if (Robot_info[robot->id].boss_flag)
#ifdef NETWORK
if (PLAYING_BUILTIN_MISSION && Current_level_num == Last_level) if (PLAYING_BUILTIN_MISSION && Current_level_num == Last_level)
#endif
if (robot->shields < 0) if (robot->shields < 0)
{ {
#ifdef NETWORK #ifdef NETWORK