From 2a7177b62eb0cf0beb82bf38b9e4703693f92287 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Sun, 5 Mar 2006 12:20:16 +0000 Subject: [PATCH] allow the editor to be built with NDEBUG --- ChangeLog | 4 ++++ main/editor/kfuncs.c | 6 ++++-- main/editor/med.c | 13 +++++++++---- main/gamesave.c | 6 +++--- main/object.c | 4 ++-- main/render.c | 4 ++-- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5182c4c9..ede9ace8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * main/inferno.c: create write directory if it doesn't exist (didn't work before) + * main/gamesave.c, main/object.c, main/render.c, + main/editor/kfuncs.c, main/editor/med.c: allow the editor to be + built with NDEBUG + 2006-02-26 Chris Taylor * include/strutil.h, main/bm.c, main/gamepal.c, main/gamesave.c, diff --git a/main/editor/kfuncs.c b/main/editor/kfuncs.c index 575a768e..deb2e7ca 100644 --- a/main/editor/kfuncs.c +++ b/main/editor/kfuncs.c @@ -1,4 +1,4 @@ -/* $Id: kfuncs.c,v 1.4 2005-04-01 03:21:32 chris Exp $ */ +/* $Id: kfuncs.c,v 1.5 2006-03-05 12:19:57 chris 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: kfuncs.c,v 1.4 2005-04-01 03:21:32 chris Exp $"; +static char rcsid[] = "$Id: kfuncs.c,v 1.5 2006-03-05 12:19:57 chris Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -257,8 +257,10 @@ FUNCTION med_functions[] = { { "med-segment-exchange", 0, ExchangeMarkandCurseg }, { "med-segment-mark", 0, CopySegToMarked }, { "med-about", 0, ShowAbout }, +#ifndef NDEBUG { "med-mark-start", 0, MarkStart }, { "med-mark-end", 0, MarkEnd }, +#endif // In group.c { "med-group-load", 0, LoadGroup }, diff --git a/main/editor/med.c b/main/editor/med.c index d9dd78de..751a57e3 100644 --- a/main/editor/med.c +++ b/main/editor/med.c @@ -1,4 +1,4 @@ -/* $Id: med.c,v 1.9 2005-04-01 03:21:32 chris Exp $ */ +/* $Id: med.c,v 1.10 2006-03-05 12:19:57 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -658,7 +658,9 @@ int DosShell() } int ToggleOutlineMode() -{ int mode; +{ +#ifndef NDEBUG + int mode; mode=toggle_outline_mode(); @@ -679,6 +681,9 @@ int ToggleOutlineMode() Update_flags |= UF_GAME_VIEW_CHANGED; return mode; +#else + return 1; +#endif } //@@int do_reset_orient() @@ -1448,7 +1453,7 @@ void dump_stuff(void) } - +#ifndef NDEBUG int MarkStart(void) { char mystr[30]; @@ -1467,4 +1472,4 @@ int MarkEnd(void) return 1; } - +#endif diff --git a/main/gamesave.c b/main/gamesave.c index e4a2527c..c8ebe6ac 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -1,4 +1,4 @@ -/* $Id: gamesave.c,v 1.34 2006-02-26 06:16:57 chris Exp $ */ +/* $Id: gamesave.c,v 1.35 2006-03-05 12:19:42 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char gamesave_rcsid[] = "$Id: gamesave.c,v 1.34 2006-02-26 06:16:57 chris Exp $"; +char gamesave_rcsid[] = "$Id: gamesave.c,v 1.35 2006-03-05 12:19:42 chris Exp $"; #endif #include @@ -1408,7 +1408,7 @@ int load_level(char * filename_passed) editor_status("Loaded NEW mine %s, \"%s\"",filename,Current_level_name); #endif - #ifdef EDITOR + #if !defined(NDEBUG) && !defined(COMPACT_SEGS) if (check_segment_connections()) nm_messagebox( "ERROR", 1, "Ok", "Connectivity errors detected in\n" diff --git a/main/object.c b/main/object.c index 84afc135..e4f60049 100644 --- a/main/object.c +++ b/main/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.19 2005-08-02 06:13:56 chris Exp $ */ +/* $Id: object.c,v 1.20 2006-03-05 12:19:42 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -134,7 +134,7 @@ int print_object_info = 0; window_rendered_data Window_rendered_data[MAX_RENDERED_WINDOWS]; -#ifndef NDEBUG +#if defined(EDITOR) || !defined(NDEBUG) char Object_type_names[MAX_OBJECT_TYPES][9] = { "WALL ", "FIREBALL", diff --git a/main/render.c b/main/render.c index df8d1f73..2c059d57 100644 --- a/main/render.c +++ b/main/render.c @@ -1,4 +1,4 @@ -/* $Id: render.c,v 1.24 2005-07-30 01:50:17 chris Exp $ */ +/* $Id: render.c,v 1.25 2006-03-05 12:19:42 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -2064,7 +2064,7 @@ void render_mine(int start_seg_num,fix eye_offset, int window_num) render_start_frame(); - #if defined(EDITOR) && !defined(NDEBUG) + #if defined(EDITOR) if (Show_only_curside) { rotate_list(8,Cursegp->verts); render_side(Cursegp,Curside); -- 2.39.2