X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=698163aeea417b686e2edc2efff69e91a79ba129;hb=3b8122ae3a12281d8b8a8e10a6ffe49a5ba35154;hp=120642b247670447f99534fa89c8076688711b45;hpb=fd10d380df6804dca3b19ea68dc32df2de6090bd;p=open-adventure.git

diff --git a/main.c b/main.c
index 120642b..698163a 100644
--- a/main.c
+++ b/main.c
@@ -14,7 +14,7 @@
 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
 		DLOC[7], FIXED[NOBJECTS+1], HOLDNG,
-		LINK[201], LNLENG, LNPOSN,
+		LINK[NOBJECTS*2 + 1], LNLENG, LNPOSN,
 		PARMS[26], PLACE[NOBJECTS+1],
 		SETUP = 0;
 char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
@@ -23,7 +23,7 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
 		CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
 		COINS, CONDS, DALTLC, DETAIL,
-		 DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS,
+		DKILL, DOOR, DPRSSN, DRAGON, DSEEN[NDWARVES+1], DTOTAL, DWARF, EGGS,
 		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
 		GRATE, HINT, HINTED[21], HINTLC[21],
 		I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
@@ -32,7 +32,7 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		MAGZIN, MAXDIE, MAXTRS,
 		MESSAG, MIRROR, MXSCOR,
 		NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
-		ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
+		ODLOC[NDWARVES+1], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
 		PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[NOBJECTS+1], PYRAM,
 		RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
 		SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
@@ -179,7 +179,7 @@ static bool do_command(FILE *cmdin) {
  *  (dwarves rooted in place) let him get out (and attacked). */
 
 L71:	if(NEWLOC == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74;
-	/* 73 */ for (I=1; I<=5; I++) {
+	/* 73 */ for (I=1; I<=NDWARVES-1; I++) {
 	if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73;
 	NEWLOC=LOC;
 	RSPEAK(2);
@@ -210,10 +210,10 @@ L6000:	if(DFLAG != 1) goto L6010;
 	if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
 	DFLAG=2;
 	for (I=1; I<=2; I++) {
-	J=1+randrange(5);
+	J=1+randrange(NDWARVES-1);
 	if(PCT(50))DLOC[J]=0;
 	} /* end loop */
-	for (I=1; I<=5; I++) {
+	for (I=1; I<=NDWARVES-1; I++) {
 	if(DLOC[I] == LOC)DLOC[I]=DALTLC;
 	ODLOC[I]=DLOC[I];
 	} /* end loop */
@@ -229,7 +229,7 @@ L6000:	if(DFLAG != 1) goto L6010;
 L6010:	DTOTAL=0;
 	ATTACK=0;
 	STICK=0;
-	/* 6030 */ for (I=1; I<=6; I++) {
+	/* 6030 */ for (I=1; I<=NDWARVES; I++) {
 	if(DLOC[I] == 0) goto L6030;
 /*  Fill TK array with all the places this dwarf might go. */
 	J=1;
@@ -423,13 +423,15 @@ L2605:	WZDARK=DARK(0);
 
 L2607:	FOOBAR=(FOOBAR>0 ? -FOOBAR : 0);
 	TURNS=TURNS+1;
-	if(TURNS != THRESH) goto L2608;
+	if(TURNS == THRESH) {
 	SPEAK(TTEXT[TRNDEX]);
 	TRNLUZ=TRNLUZ+TRNVAL[TRNDEX]/100000;
 	TRNDEX=TRNDEX+1;
 	THRESH= -1;
-	if(TRNDEX <= TRNVLS)THRESH=MOD(TRNVAL[TRNDEX],100000)+1;
-L2608:	if(VERB == SAY && WD2 > 0)VERB=0;
+	if(TRNDEX <= TRNVLS)
+	    THRESH=MOD(TRNVAL[TRNDEX],100000)+1;
+	}
+	if(VERB == SAY && WD2 > 0)VERB=0;
 	if(VERB == SAY) goto L4090;
 	if(TALLY == 0 && INDEEP(LOC) && LOC != 33)CLOCK1=CLOCK1-1;
 	if(CLOCK1 == 0) goto L10000;
@@ -449,12 +451,13 @@ L19999: K=43;
 	if((V1 != 1000+WATER && V1 != 1000+OIL) || (V2 != 1000+PLANT && V2 !=
 		1000+DOOR)) goto L2610;
 	{long x = V2-1000; if(AT(x))WD2=MAKEWD(16152118);}
-L2610:	if(V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) &&
-		HERE(BIRD))WD1=MAKEWD(301200308);
-L2620:	if(WD1 != MAKEWD(23051920)) goto L2625;
-	IWEST=IWEST+1;
-	if(IWEST == 10)RSPEAK(17);
-L2625:	if(WD1 != MAKEWD( 715) || WD2 == 0) goto L2630;
+L2610:	if(V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) && HERE(BIRD))
+		WD1=MAKEWD(301200308);
+L2620:	if(WD1 == MAKEWD(23051920)) {
+		IWEST=IWEST+1;
+		if(IWEST == 10)RSPEAK(17);
+	}
+	if(WD1 != MAKEWD( 715) || WD2 == 0) goto L2630;
 	IGO=IGO+1;
 	if(IGO == 10)RSPEAK(276);
 L2630:	I=VOCAB(WD1,-1);
@@ -631,20 +634,24 @@ L20:	K=OLDLOC;
 	return true;
 
 L21:	LL=MOD((labs(TRAVEL[KK])/1000),1000);
-	if(LL == K) goto L25;
-	if(LL > 300) goto L22;
-	J=KEY[LL];
-	if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K)K2=KK;
-L22:	if(TRAVEL[KK] < 0) goto L23;
-	KK=KK+1;
-	 goto L21;
-
-L23:	KK=K2;
-	if(KK != 0) goto L25;
-	RSPEAK(140);
-	return true;
+	if(LL != K) {
+		if(LL <= 300) {
+			J=KEY[LL];
+			if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K)
+				K2=KK;
+		}
+		if(TRAVEL[KK] < 0) goto L23;
+		KK=KK+1;
+		goto L21;
+
+L23:		KK=K2;
+		if(KK == 0) {
+			RSPEAK(140);
+			return true;
+		}
+	}
 
-L25:	K=MOD(labs(TRAVEL[KK]),1000);
+	K=MOD(labs(TRAVEL[KK]),1000);
 	KK=KEY[LOC];
 	 goto L9;
 
@@ -827,7 +834,7 @@ L41000: if(TALLY == 1 && PROP[JADE] < 0) goto L40010;
 
 L10000: PROP[GRATE]=0;
 	PROP[FISSUR]=0;
-	for (I=1; I<=6; I++) {
+	for (I=1; I<=NDWARVES; I++) {
 	DSEEN[I]=false;
 	DLOC[I]=0;
 	} /* end loop */
@@ -884,7 +891,8 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1);
 	FIXED[MIRROR]=116;
 
 	for (I=1; I<=NOBJECTS; I++) {
-	if(TOTING(I))DSTROY(I);
+		if(TOTING(I))
+			DSTROY(I);
 	} /* end loop */
 
 	RSPEAK(132);