From 36baa90715d836d76a7db4c80898ed31c445189a Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Fri, 25 Feb 2005 14:55:49 +0000 Subject: [PATCH] use the Descent 2 definitions for maximum segments and vertices --- ChangeLog | 5 ++++- main/editor/mine.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0175cd00..13b247ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ allowing Mac OS 9 and X to both use conf.h but one can build for OpenGL while the other doesn't. + * main/editor/mine.c: use the Descent 2 definitions for maximum + segments and vertices + 2005-02-25 Bradley Bell * arch/dos/digi.c, arch/dos/digiallg.c, arch/dos/digimm.c, @@ -60,7 +63,7 @@ 2005-01-25 Chris Taylor * arch/carbon/conf.h, arch/ogl/gr.c, include/loadgl.h: on Carbon, - dynamically find and load the OpenGL library on carbon + dynamically find and load the OpenGL library * main/editor/macro.c: use physfs instead of non-existing cflib.h diff --git a/main/editor/mine.c b/main/editor/mine.c index 88a8a105..d5d2f234 100644 --- a/main/editor/mine.c +++ b/main/editor/mine.c @@ -1,4 +1,4 @@ -/* $Id: mine.c,v 1.6 2005-01-23 14:46:49 schaffner Exp $ */ +/* $Id: mine.c,v 1.7 2005-02-25 14:55:49 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: mine.c,v 1.6 2005-01-23 14:46:49 schaffner Exp $"; +static char rcsid[] = "$Id: mine.c,v 1.7 2005-02-25 14:55:49 chris Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -291,15 +291,15 @@ int save_mine_data_compiled(FILE * SaveFile) med_compress_mine(); warn_if_concave_segments(); - if (Highest_segment_index >= MAX_GAME_SEGMENTS) { + if (Highest_segment_index >= MAX_SEGMENTS) { char message[128]; - sprintf(message, "Error: Too many segments (%i > %i) for game (not editor)", Highest_segment_index+1, MAX_GAME_SEGMENTS); + sprintf(message, "Error: Too many segments (%i > %i) for game (not editor)", Highest_segment_index+1, MAX_SEGMENTS); MessageBox( -2, -2, 1, message, "Ok" ); } - if (Highest_vertex_index >= MAX_GAME_VERTICES) { + if (Highest_vertex_index >= MAX_VERTICES) { char message[128]; - sprintf(message, "Error: Too many vertices (%i > %i) for game (not editor)", Highest_vertex_index+1, MAX_GAME_VERTICES); + sprintf(message, "Error: Too many vertices (%i > %i) for game (not editor)", Highest_vertex_index+1, MAX_VERTICES); MessageBox( -2, -2, 1, message, "Ok" ); } @@ -370,15 +370,15 @@ int save_mine_data_compiled_new(FILE * SaveFile) med_compress_mine(); warn_if_concave_segments(); - if (Highest_segment_index >= MAX_GAME_SEGMENTS) { + if (Highest_segment_index >= MAX_SEGMENTS) { char message[128]; - sprintf(message, "Error: Too many segments (%i > %i) for game (not editor)", Highest_segment_index+1, MAX_GAME_SEGMENTS); + sprintf(message, "Error: Too many segments (%i > %i) for game (not editor)", Highest_segment_index+1, MAX_SEGMENTS); MessageBox( -2, -2, 1, message, "Ok" ); } - if (Highest_vertex_index >= MAX_GAME_VERTICES) { + if (Highest_vertex_index >= MAX_VERTICES) { char message[128]; - sprintf(message, "Error: Too many vertices (%i > %i) for game (not editor)", Highest_vertex_index+1, MAX_GAME_VERTICES); + sprintf(message, "Error: Too many vertices (%i > %i) for game (not editor)", Highest_vertex_index+1, MAX_VERTICES); MessageBox( -2, -2, 1, message, "Ok" ); } -- 2.39.2