From acabce7d2ef4016e1cb03688c57235ca3b57d0ae Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sat, 23 Oct 2004 17:42:13 +0000 Subject: [PATCH] delete file main/compbit.h and adapt users to use text.c/text.h --- ChangeLog | 8 ++++++++ VisualC/d2x/d2x.dsp | 4 ---- VisualC/d2xgl/d2xgl.dsp | 4 ---- VisualCE/d2x/d2x.vcp | 20 -------------------- main/Makefile.am | 4 ++-- main/bmread.c | 9 ++------- main/compbit.h | 28 ---------------------------- main/credits.c | 17 ++++++----------- main/endlevel.c | 17 +++++------------ main/inferno.c | 13 +++---------- main/text.c | 9 +++++---- main/text.h | 5 ++--- main/titles.c | 19 +++++++++---------- 13 files changed, 42 insertions(+), 115 deletions(-) delete mode 100644 main/compbit.h diff --git a/ChangeLog b/ChangeLog index d041ba34..9b899779 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-10-23 Martin Schaffner + + * main/Makefile.am, main/inferno.c, main/credits.c, main/endlevel.c, + main/bmread.c, main/titles.c, main/compbit.h, main/text.c,main/text.h, + VisualC/d2x/d2x.dsp, VisualC/d2xgl/d2xgl.dsp, VisualCE/d2x/d2x.vcp: + delete file compbit.h, move functionality to text.c, modify all + previous users of compbit.h to use existing function in text.h + 2004-10-23 Chris Taylor * cfile/cfile.c: declare variable on top of block diff --git a/VisualC/d2x/d2x.dsp b/VisualC/d2x/d2x.dsp index 6321e15e..1114e9b8 100644 --- a/VisualC/d2x/d2x.dsp +++ b/VisualC/d2x/d2x.dsp @@ -712,10 +712,6 @@ SOURCE=..\..\main\collide.h # End Source File # Begin Source File -SOURCE=..\..\main\compbit.h -# End Source File -# Begin Source File - SOURCE=..\..\include\CON_console.h # End Source File # Begin Source File diff --git a/VisualC/d2xgl/d2xgl.dsp b/VisualC/d2xgl/d2xgl.dsp index 002ec6e9..fec7a13e 100644 --- a/VisualC/d2xgl/d2xgl.dsp +++ b/VisualC/d2xgl/d2xgl.dsp @@ -716,10 +716,6 @@ SOURCE=..\..\main\collide.h # End Source File # Begin Source File -SOURCE=..\..\main\compbit.h -# End Source File -# Begin Source File - SOURCE=..\..\include\CON_console.h # End Source File # Begin Source File diff --git a/VisualCE/d2x/d2x.vcp b/VisualCE/d2x/d2x.vcp index e9860601..a41fbcbe 100644 --- a/VisualCE/d2x/d2x.vcp +++ b/VisualCE/d2x/d2x.vcp @@ -5068,7 +5068,6 @@ SOURCE=..\..\main\credits.c DEP_CPP_CREDI=\ "..\..\main\aistruct.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -5111,7 +5110,6 @@ NODEP_CPP_CREDI=\ DEP_CPP_CREDI=\ "..\..\main\aistruct.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -5154,7 +5152,6 @@ NODEP_CPP_CREDI=\ DEP_CPP_CREDI=\ "..\..\main\aistruct.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -5236,7 +5233,6 @@ DEP_CPP_CREDI=\ "..\..\include\u_mem.h"\ "..\..\include\vecmat.h"\ "..\..\main\aistruct.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -5417,7 +5413,6 @@ SOURCE=..\..\main\endlevel.c DEP_CPP_ENDLE=\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\digi.h"\ "..\..\main\endlevel.h"\ "..\..\main\fireball.h"\ @@ -5471,7 +5466,6 @@ NODEP_CPP_ENDLE=\ DEP_CPP_ENDLE=\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\digi.h"\ "..\..\main\endlevel.h"\ "..\..\main\fireball.h"\ @@ -5525,7 +5519,6 @@ NODEP_CPP_ENDLE=\ DEP_CPP_ENDLE=\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\digi.h"\ "..\..\main\endlevel.h"\ "..\..\main\fireball.h"\ @@ -5595,7 +5588,6 @@ DEP_CPP_ENDLE=\ "..\..\include\vecmat.h"\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\digi.h"\ "..\..\main\endlevel.h"\ "..\..\main\fireball.h"\ @@ -9298,7 +9290,6 @@ DEP_CPP_INFER=\ "..\..\main\aistruct.h"\ "..\..\main\automap.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\config.h"\ "..\..\main\desc_id.h"\ "..\..\main\digi.h"\ @@ -9376,7 +9367,6 @@ DEP_CPP_INFER=\ "..\..\main\aistruct.h"\ "..\..\main\automap.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\config.h"\ "..\..\main\desc_id.h"\ "..\..\main\digi.h"\ @@ -9454,7 +9444,6 @@ DEP_CPP_INFER=\ "..\..\main\aistruct.h"\ "..\..\main\automap.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\config.h"\ "..\..\main\desc_id.h"\ "..\..\main\digi.h"\ @@ -9577,7 +9566,6 @@ DEP_CPP_INFER=\ "..\..\main\aistruct.h"\ "..\..\main\automap.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\config.h"\ "..\..\main\desc_id.h"\ "..\..\main\digi.h"\ @@ -15022,7 +15010,6 @@ SOURCE=..\..\main\text.c !IF "$(CFG)" == "d2x - Win32 (WCE emulator) Release" DEP_CPP_TEXT_=\ - "..\..\main\compbit.h"\ "..\..\main\inferno.h"\ "..\..\main\text.h"\ @@ -15036,7 +15023,6 @@ NODEP_CPP_TEXT_=\ !ELSEIF "$(CFG)" == "d2x - Win32 (WCE emulator) Debug" DEP_CPP_TEXT_=\ - "..\..\main\compbit.h"\ "..\..\main\inferno.h"\ "..\..\main\text.h"\ @@ -15050,7 +15036,6 @@ NODEP_CPP_TEXT_=\ !ELSEIF "$(CFG)" == "d2x - Win32 (WCE ARMV4) Release" DEP_CPP_TEXT_=\ - "..\..\main\compbit.h"\ "..\..\main\inferno.h"\ "..\..\main\text.h"\ @@ -15071,7 +15056,6 @@ DEP_CPP_TEXT_=\ "..\..\include\pstypes.h"\ "..\..\include\u_mem.h"\ "..\..\include\vecmat.h"\ - "..\..\main\compbit.h"\ "..\..\main\inferno.h"\ "..\..\main\text.h"\ @@ -15088,7 +15072,6 @@ SOURCE=..\..\main\titles.c DEP_CPP_TITLE=\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -15143,7 +15126,6 @@ NODEP_CPP_TITLE=\ DEP_CPP_TITLE=\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -15198,7 +15180,6 @@ NODEP_CPP_TITLE=\ DEP_CPP_TITLE=\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ @@ -15292,7 +15273,6 @@ DEP_CPP_TITLE=\ "..\..\include\vecmat.h"\ "..\..\main\aistruct.h"\ "..\..\main\bm.h"\ - "..\..\main\compbit.h"\ "..\..\main\desw.h"\ "..\..\main\digi.h"\ "..\..\main\game.h"\ diff --git a/main/Makefile.am b/main/Makefile.am index bc57cadb..417d2086 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -40,8 +40,8 @@ EXTRA_DIST = ${EXTRA_SUBDIRS} \ descent.cfg inferno.ini \ link.bat \ ai.h aistruct.h automap.h bm.h bmread.h cntrlcen.h collide.h \ -compbit.h config.h controls.h credits.h desc_id.h desw.h digi.h \ -effects.h endlevel.h escort.h \ +config.h controls.h credits.h desc_id.h desw.h digi.h effects.h \ +endlevel.h escort.h \ fireball.h fuelcen.h fvi.h fvi_a.h game.h gamefont.h gamemine.h \ gamepal.h gamesave.h gameseg.h gameseq.h gamestat.h gauges.h \ hostage.h hudmsg.h inferno.h joydefs.h kconfig.h \ diff --git a/main/bmread.c b/main/bmread.c index 47fa5494..0f10c8d5 100644 --- a/main/bmread.c +++ b/main/bmread.c @@ -1,4 +1,4 @@ -/* $Id: bmread.c,v 1.6 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: bmread.c,v 1.7 2004-10-23 17:42:13 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -62,7 +62,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "player.h" #include "endlevel.h" #include "cntrlcen.h" -#include "compbit.h" #include "args.h" @@ -509,11 +508,7 @@ int bm_init_use_tbl() } if (have_bin_tbl) { // is this a binary tbl file - for (i = 0; i < strlen(inputline) - 1; i++) { - encode_rotate_left(&(inputline[i])); - inputline[i] = inputline[i] ^ BITMAP_TBL_XOR; - encode_rotate_left(&(inputline[i])); - } + decode_text_line (inputline); } else { while (inputline[(l=strlen(inputline))-2]=='\\') { if (!isspace(inputline[l-3])) { //if not space before backslash... diff --git a/main/compbit.h b/main/compbit.h deleted file mode 100644 index 08bae1d0..00000000 --- a/main/compbit.h +++ /dev/null @@ -1,28 +0,0 @@ -/* $Id: compbit.h,v 1.3 2004-08-28 23:17:45 schaffner Exp $ */ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - -/* - * - * Contains encryption key for bitmaps.tbl - * - */ - -#ifndef _COMPBIT_H -#define _COMPBIT_H - -#define BITMAP_TBL_XOR 0xD3 - -extern void encode_rotate_left(char *); - -#endif /* _COMPBIT_H */ diff --git a/main/credits.c b/main/credits.c index c3ccdff3..5833a26e 100644 --- a/main/credits.c +++ b/main/credits.c @@ -1,4 +1,4 @@ -/* $Id: credits.c,v 1.10 2004-08-29 17:57:23 schaffner Exp $ */ +/* $Id: credits.c,v 1.11 2004-10-23 17:42:13 schaffner 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 -static char rcsid[] = "$Id: credits.c,v 1.10 2004-08-29 17:57:23 schaffner Exp $"; +static char rcsid[] = "$Id: credits.c,v 1.11 2004-10-23 17:42:13 schaffner Exp $"; #endif #ifdef WINDOWS @@ -61,9 +61,9 @@ static char rcsid[] = "$Id: credits.c,v 1.10 2004-08-29 17:57:23 schaffner Exp $ #include "digi.h" #include "cfile.h" -#include "compbit.h" +#include "text.h" #include "songs.h" -#include "menu.h" // for MenuHires +#include "menu.h" // for MenuHires #if defined(POLY_ACC) #include "poly_acc.h" @@ -278,13 +278,8 @@ WIN(DDGRUNLOCK(dd_grd_curcanv)); get_line:; if (cfgets( buffer[buffer_line], 80, file )) { char *p; - if (have_bin_file) { // is this a binary tbl file - for (i = 0; i < strlen(buffer[buffer_line]); i++) { - encode_rotate_left(&(buffer[buffer_line][i])); - buffer[buffer_line][i] ^= BITMAP_TBL_XOR; - encode_rotate_left(&(buffer[buffer_line][i])); - } - } + if (have_bin_file) // is this a binary tbl file + decode_text_line (buffer[buffer_line]); p = buffer[buffer_line]; if (p[0] == ';') goto get_line; diff --git a/main/endlevel.c b/main/endlevel.c index 02160186..35e16be9 100644 --- a/main/endlevel.c +++ b/main/endlevel.c @@ -1,4 +1,4 @@ -/* $Id: endlevel.c,v 1.23 2004-10-09 15:59:28 schaffner Exp $ */ +/* $Id: endlevel.c,v 1.24 2004-10-23 17:42:13 schaffner 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 -static char rcsid[] = "$Id: endlevel.c,v 1.23 2004-10-09 15:59:28 schaffner Exp $"; +static char rcsid[] = "$Id: endlevel.c,v 1.24 2004-10-23 17:42:13 schaffner Exp $"; #endif //#define SLEW_ON 1 @@ -71,7 +71,6 @@ static char rcsid[] = "$Id: endlevel.c,v 1.23 2004-10-09 15:59:28 schaffner Exp #include "text.h" #include "digi.h" #include "cfile.h" -#include "compbit.h" #include "songs.h" #include "movie.h" #include "render.h" @@ -1466,7 +1465,7 @@ void load_endlevel_data(int level_num) char line[LINE_LEN],*p; CFILE *ifile; int var,segnum,sidenum; - int exit_side=0, i; + int exit_side = 0; int have_binary = 0; endlevel_data_loaded = 0; //not loaded yet @@ -1512,14 +1511,8 @@ try_again: while (cfgets(line,LINE_LEN,ifile)) { - if (have_binary) { - for (i = 0; i < strlen(line); i++) { - encode_rotate_left(&(line[i])); - line[i] = line[i] ^ BITMAP_TBL_XOR; - encode_rotate_left(&(line[i])); - } - p = line; - } + if (have_binary) + decode_text_line (line); if ((p=strchr(line,';'))!=NULL) *p = 0; //cut off comment diff --git a/main/inferno.c b/main/inferno.c index 54bf4853..ea55c77b 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.89 2004-08-29 17:57:23 schaffner Exp $ */ +/* $Id: inferno.c,v 1.90 2004-10-23 17:42:13 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -95,7 +95,6 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR #include "gamepal.h" #include "mission.h" #include "movie.h" -#include "compbit.h" #include "d_io.h" // # include "3dfx_des.h" @@ -199,14 +198,8 @@ void print_commandline_help() // This is the only use of cfgets that needs the CR *end++ = '\n'; - if (have_binary) { - int i; - for (i = 0; i < strlen(line) - 1; i++) { - encode_rotate_left(&(line[i])); - line[i] = line[i] ^ BITMAP_TBL_XOR; - encode_rotate_left(&(line[i])); - } - } + if (have_binary) + decode_text_line (line); if (line[0] == ';') continue; //don't show comments diff --git a/main/text.c b/main/text.c index f3ca5d38..b13a3115 100644 --- a/main/text.c +++ b/main/text.c @@ -1,4 +1,4 @@ -/* $Id: text.c,v 1.14 2004-10-14 16:43:23 schaffner Exp $ */ +/* $Id: text.c,v 1.15 2004-10-23 17:42:13 schaffner 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 -static char rcsid[] = "$Id: text.c,v 1.14 2004-10-14 16:43:23 schaffner Exp $"; +static char rcsid[] = "$Id: text.c,v 1.15 2004-10-23 17:42:13 schaffner Exp $"; #endif #include @@ -37,7 +37,6 @@ static char rcsid[] = "$Id: text.c,v 1.14 2004-10-14 16:43:23 schaffner Exp $"; #include "inferno.h" #include "text.h" #include "args.h" -#include "compbit.h" #define SHAREWARE_TEXTSIZE 14677 @@ -64,7 +63,9 @@ encode_rotate_left(char *c) *c |= 0x01; } -//decode and encoded line of text +#define BITMAP_TBL_XOR 0xD3 + +//decode an encoded line of text of bitmaps.tbl void decode_text_line(char *p) { for (;*p;p++) { diff --git a/main/text.h b/main/text.h index 3447ad46..1804fdc2 100644 --- a/main/text.h +++ b/main/text.h @@ -1,4 +1,4 @@ -/* $Id: text.h,v 1.5 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: text.h,v 1.6 2004-10-23 17:42:13 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -748,8 +748,7 @@ extern char *Text_string[]; #define MENU_DIFFICULTY_TEXT(difficulty) (*(&TXT_DIFFICULTY_1 + (difficulty))) #define MENU_DETAIL_TEXT(detail) (*(&TXT_DETAIL_1 + (detail))) -//Load function - +void decode_text_line(char *text_line); // decryption for bitmaps.tbl void load_text(void); #endif /* _TEXT_H */ diff --git a/main/titles.c b/main/titles.c index 0fa1534c..9d559123 100644 --- a/main/titles.c +++ b/main/titles.c @@ -1,4 +1,4 @@ -/* $Id: titles.c,v 1.31 2004-10-09 15:59:28 schaffner Exp $ */ +/* $Id: titles.c,v 1.32 2004-10-23 17:42:13 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -54,7 +54,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "multi.h" #include "player.h" #include "digi.h" -#include "compbit.h" #include "text.h" #include "kmatrix.h" #include "piggy.h" @@ -1254,15 +1253,15 @@ int load_screen_text(char *filename, char **buf) } if (have_binary) { - char *ptr; - - for (i = 0, ptr = *buf; i < len; i++, ptr++) { - if (*ptr != '\n') { - encode_rotate_left(ptr); - *ptr = *ptr ^ BITMAP_TBL_XOR; - encode_rotate_left(ptr); - } + char *ptr = *buf; + char *endline; + while ((endline = strchr (ptr, '\n')) != NULL) { + *endline = '\0'; + decode_text_line (ptr); + *endline = '\n'; + ptr = endline + 1; } + decode_text_line (ptr); } return (1); -- 2.39.2