X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=ba49245aeaa6521a060eab0a93dacc9dd04cc642;hb=4ab32f98a6e92952c00dd26cec61ecd3d3cc80dd;hp=51ab3138b15e14b3f29f13bcaeb9670223f39858;hpb=040f19adde85fdd78628eb390a685907804f85ae;p=open-adventure.git

diff --git a/init.c b/init.c
index 51ab313..ba49245 100644
--- a/init.c
+++ b/init.c
@@ -35,7 +35,7 @@
 /*  Description of the database format
  *
  *
- *  The data file contains several sections.  each begins with a line containing
+ *  The data file contains several sections.  Each begins with a line containing
  *  a number identifying the section, and ends with a line containing "-1".
  *
  *  Section 1: Long form descriptions.  Each line contains a location number,
@@ -150,7 +150,7 @@
 
 /*  The various messages (sections 1, 2, 5, 6, etc.) may include certain
  *  special character sequences to denote that the program must provide
- *  parameters to insert into a message when the message is printed.  these
+ *  parameters to insert into a message when the message is printed.  These
  *  sequences are:
  *	%S = The letter 'S' or nothing (if a given value is exactly 1)
  *	%W = A word (up to 10 characters)
@@ -173,7 +173,8 @@ static int finish_init(void);
 static void quick_io(void);
 
 void initialise(void) {
-	printf("Initialising...\n");
+	if (oldstyle)
+		printf("Initialising...\n");
 	if(!quick_init()){raw_init(); report(); quick_save();}
 	finish_init();
 }
@@ -214,7 +215,7 @@ L1001:	/*etc*/ ;
 	CLSSES=0;
 	TRNVLS=0;
 
-/*  Start new data section.  sect is the section number. */
+/*  Start new data section.  Sect is the section number. */
 
 L1002:	SECT=GETNUM(OPENED);
 	OLDLOC= -1;
@@ -237,7 +238,7 @@ L1005:	LINUSE=KK;
 	if(LNLENG < LNPOSN)BUG(1);
 L1006:	KK=KK+1;
 	if(KK >= LINSIZ)BUG(2);
-	LINES[KK]=GETTXT(false,false,false,KK);
+	LINES[KK]=GETTXT(false,false,false);
 	if(LINES[KK] != -1) goto L1006;
 	LINES[LINUSE]=KK;
 	if(LOC == OLDLOC) goto L1005;
@@ -276,7 +277,7 @@ L1014:	TRNVLS=TRNVLS+1;
 	 goto L1005;
 
 /*  The stuff for section 3 is encoded here.  Each "from-location" gets a
- *  contiguous section of the "TRAVEL" array.  each entry in travel is
+ *  contiguous section of the "TRAVEL" array.  Each entry in travel is
  *  NEWLOC*1000 + KEYWORD (from section 4, motion verbs), and is negated if
  *  this is the last entry for this location.  KEY(N) is the index in travel
  *  of the first option at location N. */
@@ -299,17 +300,14 @@ L1039:	TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
 
 /*  Here we read in the vocabulary.  KTAB(N) is the word number, ATAB(N) is
  *  the corresponding word.  The -1 at the end of section 4 is left in KTAB
- *  as an end-marker.  The words are given a minimal hash to make deciphering
- *  the core-image harder.  (We don't use gettxt's hash since that would force
- *  us to hash each input line to make comparisons work, and that in turn
- *  would make it harder to detect particular input words.) */
+ *  as an end-marker. */
 
 L1040:	J=10000;
 	for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++) {
 	KTAB[TABNDX]=GETNUM(OPENED);
 	if(KTAB[TABNDX] == -1) goto L1002;
 	J=J+7;
-	ATAB[TABNDX]=GETTXT(true,true,true,0)+J*J;
+	ATAB[TABNDX]=GETTXT(true,true,true);
 	} /* end loop */
 	BUG(4);
 
@@ -434,7 +432,7 @@ L1106:	/*etc*/ ;
 	HINTLC[I]=0;
 	} /* end loop */
 
-/*  Define some handy mnemonics.  these correspond to object numbers. */
+/*  Define some handy mnemonics.  These correspond to object numbers. */
 
 	AXE=VOCWRD(12405,1);
 	BATTER=VOCWRD(201202005,1);