X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=2027607c15736d32e4c34100b0116435f15be4fc;hb=f9eb6383f1fc75589d186d9eb88e4190e26042a7;hp=0ccfccefa3dbc2dbf31e09748902972c0bbb443e;hpb=c3add5c2066face7535108706bb86dc41971ad9f;p=open-adventure.git

diff --git a/main.c b/main.c
index 0ccfcce..2027607 100644
--- a/main.c
+++ b/main.c
@@ -18,11 +18,11 @@ long ABB[186], ATAB[331], ATLOC[186],
 		TABSIZ = 330;
 signed char INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
-long ACTVERB[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
+long ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
 		 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
-		CLAM, CLSHNT, CLSMAX = 12, CLSSES,
+		CLAM, CLSMAX = 12, CLSSES,
 		COINS, COND[186], CONDS, CTEXT[13], CVAL[13], DALTLC,
-		DOOR, DPRSSN, DRAGON, DSEEN[7], DWARF, EGGS,
+		DOOR, DPRSSN, DRAGON, DWARF, EGGS,
 		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FIXD[101], FOOD,
 		GRATE, HINT, HINTED[21], HINTLC[21], HINTS[21][5], HNTMAX,
 		HNTSIZ = 20, I, INVENT, IGO, J, JADE, K, K2, KEY[186], KEYS, KK,
@@ -37,8 +37,7 @@ long ACTVERB[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
 		STREAM, TABNDX, THROW, TK[21], TRAVEL[886], TRIDNT,
 		TRNSIZ = 5, TRNVAL[6], TRNVLS, TROLL, TROLL2, TRVS,
 		TRVSIZ = 885, TTEXT[6], URN, V1, V2, VASE, VEND, VERB,
-		VOLCAN, VRBSIZ = 35, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X,
-		ZZWORD;
+		VOLCAN, VRBSIZ = 35, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
 struct game_t game = {.blklin = true};
 FILE  *logfp;
 bool oldstyle = false;
@@ -85,7 +84,7 @@ int main(int argc, char *argv[]) {
  *
  *  game.closed says whether we're all the way closed
  *  game.closng says whether it's closing time yet
- *  CLSHNT says whether he's read the clue in the endgame
+ *  game.clshint says whether he's read the clue in the endgame
  *  game.lmwarn says whether he's been warned about lamp going dim
  *  game.novice says whether he asked for instructions at start-up
  *  game.panic says whether he's found out he's trapped in the cave
@@ -117,7 +116,7 @@ int main(int argc, char *argv[]) {
 
 L1:	game.setup= -1;
 	I=RAN(-1);
-	ZZWORD=RNDVOC(3,0)+MESH*2;
+	game.zzword=RNDVOC(3,0)+MESH*2;
 	game.novice=YES(stdin, 65,1,0);
 	game.newloc=1;
 	LOC=1;
@@ -145,7 +144,7 @@ L2:	if(!OUTSID(game.newloc) || game.newloc == 0 || !game.closng) goto L71;
 
 L71:	if(game.newloc == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74;
 	/* 73 */ for (I=1; I<=5; I++) {
-	if(ODLOC[I] != game.newloc || !DSEEN[I]) goto L73;
+	    if(ODLOC[I] != game.newloc || !game.dseen[I]) goto L73;
 	game.newloc=LOC;
 	RSPEAK(2);
 	 goto L74;
@@ -216,8 +215,8 @@ L6016:	TK[J]=ODLOC[I];
 	J=1+RAN(J);
 	ODLOC[I]=DLOC[I];
 	DLOC[I]=TK[J];
-	DSEEN[I]=(DSEEN[I] && INDEEP(LOC)) || (DLOC[I] == LOC || ODLOC[I] == LOC);
-	if(!DSEEN[I]) goto L6030;
+	game.dseen[I]=(game.dseen[I] && INDEEP(LOC)) || (DLOC[I] == LOC || ODLOC[I] == LOC);
+	if(!game.dseen[I]) goto L6030;
 	DLOC[I]=LOC;
 	if(I != 6) goto L6027;
 
@@ -252,7 +251,7 @@ L6023:	/*etc*/ ;
 	} /* end loop */
 L6024:	DLOC[6]=CHLOC;
 	ODLOC[6]=CHLOC;
-	DSEEN[6]=false;
+	game.dseen[6]=false;
 	 goto L6030;
 
 L6025:	RSPEAK(186);
@@ -798,7 +797,7 @@ L41000: if(game.tally == 1 && PROP[JADE] < 0) goto L40010;
 L10000: PROP[GRATE]=0;
 	PROP[FISSUR]=0;
 	for (I=1; I<=6; I++) {
-	DSEEN[I]=false;
+	game.dseen[I]=false;
 	DLOC[I]=0;
 	} /* end loop */
 	MOVE(TROLL,0);