From 5c493286c621de29ddcd9715f7cabcad26d9bb61 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 3 Apr 2003 07:12:46 +0000 Subject: [PATCH] don't die when trying to toggle nonexistent segment... vertigo level 10 is buggy! --- ChangeLog | 3 +++ main/wall.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c8d3aa7..d56d0b38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-04-02 Bradley Bell + * main/wall.c: don't die when trying to toggle nonexistent + segment... vertigo level 10 is buggy! + * main/gamemine.c: comments/formatting 2003-03-31 Micah J. Lieske diff --git a/main/wall.c b/main/wall.c index a736c7b4..a3221c80 100644 --- a/main/wall.c +++ b/main/wall.c @@ -1,4 +1,4 @@ -/* $Id: wall.c,v 1.8 2003-03-19 23:20:59 btb Exp $ */ +/* $Id: wall.c,v 1.9 2003-04-03 07:12:46 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: wall.c,v 1.8 2003-03-19 23:20:59 btb Exp $"; +static char rcsid[] = "$Id: wall.c,v 1.9 2003-04-03 07:12:46 btb Exp $"; #endif #include @@ -1123,9 +1123,13 @@ int wall_hit_process(segment *seg, int side, fix damage, int playernum, object * // Opens doors/destroys wall/shuts off triggers. void wall_toggle(segment *seg, int side) { - int wall_num; + int wall_num; - Assert( seg-Segments <= Highest_segment_index); + if (seg - Segments > Highest_segment_index) + { + Warning("Can't toggle side %d of segment %d - nonexistent segment!\n", side, seg-Segments); + return; + } Assert( side < MAX_SIDES_PER_SEGMENT ); wall_num = seg->sides[side].wall_num; -- 2.39.2