X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=6b617904046efb3bfb402615e431296c1eb96736;hb=c68b92d9dab2976bcee4e695be459a0a3d0577e1;hp=33e16e6874641a671d03d4045ec18ec309b83971;hpb=4d6078d8a8a8288fd26e7fadcdb46c5e9bd06087;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 33e16e6..6b61790 100644
--- a/misc.c
+++ b/misc.c
@@ -12,7 +12,7 @@
 
 /*  I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
 
-void SPEAK(long N) {
+void SPEAK(vocab_t N) {
 long BLANK, CASE, I, K, L, NEG, NPARMS, PARM, PRMTYP, STATE;
 
 /*  Print the message which starts at LINES(N).  Precede it with a blank line
@@ -111,7 +111,7 @@ L40:	if(BLANK)TYPE0();
 	return;
 }
 
-void PSPEAK(long MSG,long SKIP) {
+void PSPEAK(vocab_t MSG,int SKIP) {
 long I, M;
 
 /*  Find the skip+1st message from msg and print it.  MSG should be the index of
@@ -129,7 +129,7 @@ L9:	SPEAK(M);
 	return;
 }
 
-void RSPEAK(long I) {
+void RSPEAK(vocab_t I) {
 
 /*  Print the I-TH "random" message (section 6 of database). */
 
@@ -194,8 +194,8 @@ L22:	JUNK=GETTXT(false,true,true);
 #undef WORD2X
 #define GETIN(SRC,WORD1,WORD1X,WORD2,WORD2X) fGETIN(SRC,&WORD1,&WORD1X,&WORD2,&WORD2X)
 
-long YES(FILE *input, long X, long Y, long Z) {
-long YEAH, REPLY, JUNK1, JUNK2, JUNK3;
+long YES(FILE *input, vocab_t X, vocab_t Y, vocab_t Z) {
+token_t YEAH, REPLY, JUNK1, JUNK2, JUNK3;
 
 /*  Print message X, wait for yes/no answer.  If yes, print Y and return true;
  *  if no, print Z and return false. */
@@ -223,7 +223,7 @@ L20:	YEAH=false;
  *  machine dependent i/o stuff is on the following page.  See that page
  *  for a description of MAPCOM's inline array. */
 
-long GETTXT(long SKIP,long ONEWRD, long UPPER) {
+long GETTXT(bool SKIP,bool ONEWRD, bool UPPER) {
 /*  Take characters from an input line and pack them into 30-bit words.
  *  Skip says to skip leading blanks.  ONEWRD says stop if we come to a
  *  blank.  UPPER says to map all letters to uppercase.  If we reach the
@@ -245,7 +245,7 @@ long GETTXT(long SKIP,long ONEWRD, long UPPER) {
   }
 
   TEXT=0;
-  for (int I=1; I<=5; I++) {
+  for (int I=1; I<=TOKLEN; I++) {
     TEXT=TEXT*64;
     if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0))
       continue;
@@ -272,25 +272,24 @@ long GETTXT(long SKIP,long ONEWRD, long UPPER) {
   return(TEXT);
 }
 
-long MAKEWD(long LETTRS) {
+token_t MAKEWD(long LETTRS) {
 long I, L, WORD;
 
-/*  Combine five uppercase letters (represented by pairs of decimal digits
- *  in lettrs) to form a 30-bit value matching the one that GETTXT would
- *  return given those characters plus trailing blanks.  Caution:
- *  lettrs will overflow 31 bits if 5-letter word starts with V-Z.  As a
- *  kludgey workaround, you can increment a letter by 5 by adding 50 to
- *  the next pair of digits. */
-
+/*  Combine TOKLEN (currently 5) uppercase letters (represented by
+ *  pairs of decimal digits in lettrs) to form a 30-bit value matching
+ *  the one that GETTXT would return given those characters plus
+ *  trailing blanks.  Caution: lettrs will overflow 31 bits if
+ *  5-letter word starts with V-Z.  As a kludgey workaround, you can
+ *  increment a letter by 5 by adding 50 to the next pair of
+ *  digits. */
 
 	WORD=0;
 	I=1;
-	L=LETTRS;
-L10:	WORD=WORD+I*(MOD(L,50)+10);
-	I=I*64;
-	if(MOD(L,100) > 50)WORD=WORD+I*5;
-	L=L/100;
-	if(L != 0) goto L10;
+	for (L=LETTRS; L != 0; L=L/100) {
+		WORD=WORD+I*(MOD(L,50)+10);
+		I=I*64;
+		if(MOD(L,100) > 50)WORD=WORD+I*5;
+	}
 	I=64L*64L*64L*64L*64L/I;
 	WORD=WORD*I;
 	return(WORD);
@@ -298,18 +297,20 @@ L10:	WORD=WORD+I*(MOD(L,50)+10);
 
 
 #define STATE (*sTATE)
-void fPUTTXT(long WORD, long *sTATE, long CASE) {
+void fPUTTXT(token_t WORD, long *sTATE, long CASE) {
 long ALPH1, ALPH2, BYTE, DIV, I, W;
 
-/*  Unpack the 30-bit value in word to obtain up to 5 integer-encoded chars,
- *  and store them in inline starting at LNPOSN.  If LNLENG>=LNPOSN, shift
- *  existing characters to the right to make room.  STATE will be zero when
- *  puttxt is called with the first of a sequence of words, but is thereafter
- *  unchanged by the caller, so PUTTXT can use it to maintain state across
- *  calls.  LNPOSN and LNLENG are incremented by the number of chars stored.
- *  If CASE=1, all letters are made uppercase; if -1, lowercase; if 0, as is.
- *  any other value for case is the same as 0 but also causes trailing blanks
- *  to be included (in anticipation of subsequent additional text). */
+/*  Unpack the 30-bit value in word to obtain up to TOKLEN (currently
+ *  5) integer-encoded chars, and store them in inline starting at
+ *  LNPOSN.  If LNLENG>=LNPOSN, shift existing characters to the right
+ *  to make room.  STATE will be zero when puttxt is called with the
+ *  first of a sequence of words, but is thereafter unchanged by the
+ *  caller, so PUTTXT can use it to maintain state across calls.
+ *  LNPOSN and LNLENG are incremented by the number of chars stored.
+ *  If CASE=1, all letters are made uppercase; if -1, lowercase; if 0,
+ *  as is.  any other value for case is the same as 0 but also causes
+ *  trailing blanks to be included (in anticipation of subsequent
+ *  additional text). */
 
 
 	ALPH1=13*CASE+24;
@@ -318,7 +319,7 @@ long ALPH1, ALPH2, BYTE, DIV, I, W;
 /*  ALPH1&2 DEFINE RANGE OF WRONG-CASE CHARS, 11-36 OR 37-62 OR EMPTY. */
 	DIV=64L*64L*64L*64L;
 	W=WORD;
-	/* 18 */ for (I=1; I<=5; I++) {
+	/* 18 */ for (I=1; I<=TOKLEN; I++) {
 	if(W <= 0 && STATE == 0 && labs(CASE) <= 1)return;
 	BYTE=W/DIV;
 	if(STATE != 0 || BYTE != 63) goto L12;
@@ -511,7 +512,7 @@ long I, J;
 	I=PLACE[OBJECT];
 	J=FIXED[OBJECT];
 	MOVE(OBJECT,I);
-	MOVE(OBJECT+100,J);
+	MOVE(OBJECT+NOBJECTS,J);
 	return;
 }
 
@@ -523,10 +524,10 @@ long FROM;
  *  are not at any loc, since carry wants to remove objects from ATLOC chains. */
 
 
-	if(OBJECT > 100) goto L1;
+	if(OBJECT > NOBJECTS) goto L1;
 	FROM=PLACE[OBJECT];
 	 goto L2;
-L1:	{long x = OBJECT-100; FROM=FIXED[x];}
+L1:	{long x = OBJECT-NOBJECTS; FROM=FIXED[x];}
 L2:	if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM);
 	DROP(OBJECT,WHERE);
 	return;
@@ -547,10 +548,10 @@ void CARRY(long OBJECT, long WHERE) {
 long TEMP;
 
 /*  Start toting an object, removing it from the list of things at its former
- *  location.  Incr holdng unless it was already being toted.  If OBJECT>100
+ *  location.  Incr holdng unless it was already being toted.  If OBJECT>NOBJECTS
  *  (moving "fixed" second loc), don't change PLACE or HOLDNG. */
 
-	if(OBJECT > 100) goto L5;
+	if(OBJECT > NOBJECTS) goto L5;
 	if(PLACE[OBJECT] == -1)return;
 	PLACE[OBJECT]= -1;
 	HOLDNG=HOLDNG+1;
@@ -569,11 +570,11 @@ void DROP(long OBJECT, long WHERE) {
 /*  Place an object at a given loc, prefixing it onto the ATLOC list.  Decr
  *  HOLDNG if the object was being toted. */
 
-	if(OBJECT > 100) goto L1;
+	if(OBJECT > NOBJECTS) goto L1;
 	if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1;
 	PLACE[OBJECT]=WHERE;
 	 goto L2;
-L1:	{long x = OBJECT-100; FIXED[x]=WHERE;}
+L1:	{long x = OBJECT-NOBJECTS; FIXED[x]=WHERE;}
 L2:	if(WHERE <= 0)return;
 	LINK[OBJECT]=ATLOC[WHERE];
 	ATLOC[WHERE]=OBJECT;
@@ -593,9 +594,9 @@ long AT, I;
 	AT=0;
 	if(DFLAG < 2)return(AT);
 	AT= -1;
-	for (I=1; I<=5; I++) {
-	if(DLOC[I] == WHERE) goto L2;
-	if(DLOC[I] != 0)AT=0;
+	for (I=1; I<=NDWARVES-1; I++) {
+	if(game.dloc[I] == WHERE) goto L2;
+	if(game.dloc[I] != 0)AT=0;
 	} /* end loop */
 	return(AT);