From 6e3e277e2e2f4641ef5167ef02de6b8630df6102 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Mon, 24 Jan 2005 21:33:28 +0000 Subject: [PATCH] disable old hostage system in editor --- ChangeLog | 3 +++ main/editor/ehostage.c | 14 +++++++++++--- main/editor/eobject.c | 6 +++--- main/editor/segment.c | 4 ++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8adc6d26..02ca8ba9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ gauge when appropriate * main/editor/kdefs.h, main/gamesave.c, main/gamesave.h: change all functions in kfuncs.c to return int instead of void + * main/editor/ehostage.c, main/editor/eobject.c, main/editor/segment.c: + disable old hostage system in editor (d2 is simpler in this regard) + 2005-01-23 Jason Owen diff --git a/main/editor/ehostage.c b/main/editor/ehostage.c index 8976a460..bf528335 100644 --- a/main/editor/ehostage.c +++ b/main/editor/ehostage.c @@ -1,4 +1,4 @@ -/* $Id: ehostage.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */ +/* $Id: ehostage.c,v 1.5 2005-01-24 21:33:28 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -19,13 +19,15 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #ifdef RCS -static char rcsid[] = "$Id: ehostage.c,v 1.4 2004-12-21 11:58:14 btb Exp $"; +static char rcsid[] = "$Id: ehostage.c,v 1.5 2005-01-24 21:33:28 schaffner Exp $"; #endif #ifdef HAVE_CONFIG_H #include "conf.h" #endif +#if 0 // the hostage code was simplified for Descent 2 + #include #include #ifdef __MSDOS__ @@ -340,12 +342,14 @@ int PlayHostageSound() { //@@ return 1; //@@} +#endif // 0 //------------------------------------------------------------------------- // Called from the editor... does one instance of the hostage dialog box //------------------------------------------------------------------------- int do_hostage_dialog() { +#if 0 int i; // Only open 1 instance of this window... @@ -389,21 +393,24 @@ int do_hostage_dialog() // if ( CurrentHostageIndex == -1 ) // SelectNextHostage(); - +#endif return 1; } void hostage_close_window() { +#if 0 if ( MainWindow!=NULL ) { ui_close_window( MainWindow ); MainWindow = NULL; } +#endif } void do_hostage_window() { +#if 0 // redundant fix DeltaTime, Temp; if ( MainWindow == NULL ) return; @@ -495,6 +502,7 @@ void do_hostage_window() } LastHostageIndex = CurrentHostageIndex; +#endif } diff --git a/main/editor/eobject.c b/main/editor/eobject.c index 95ddd18e..80e87709 100644 --- a/main/editor/eobject.c +++ b/main/editor/eobject.c @@ -1,4 +1,4 @@ -/* $Id: eobject.c,v 1.4 2004-12-20 06:28:10 btb Exp $ */ +/* $Id: eobject.c,v 1.5 2005-01-24 21:33:28 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #ifdef RCS -static char rcsid[] = "$Id: eobject.c,v 1.4 2004-12-20 06:28:10 btb Exp $"; +static char rcsid[] = "$Id: eobject.c,v 1.5 2005-01-24 21:33:28 schaffner Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -140,7 +140,7 @@ int place_object(segment *segp, vms_vector *object_pos, int object_type) obj = &Objects[objnum]; // Fill in obj->id and other hostage info - hostage_init_info( objnum ); + // hostage_init_info( objnum ); //don't need to anymore obj->control_type = CT_POWERUP; diff --git a/main/editor/segment.c b/main/editor/segment.c index af5c12cc..1f18691c 100644 --- a/main/editor/segment.c +++ b/main/editor/segment.c @@ -1,4 +1,4 @@ -/* $Id: segment.c,v 1.5 2004-12-20 06:28:10 btb Exp $ */ +/* $Id: segment.c,v 1.6 2005-01-24 21:33:28 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1803,7 +1803,7 @@ int create_new_mine(void) // Clear refueling center code fuelcen_reset(); - hostage_init_all(); +// hostage_init_all(); init_all_vertices(); -- 2.39.2