X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions2.c;h=30784088192abf3d8a5c3ba749b96187db0f922d;hb=91ad0185ffcbda83f115433c630b40e4ea6f7a41;hp=a169c481960affea6b660277414d151473f71ebb;hpb=fd10d380df6804dca3b19ea68dc32df2de6090bd;p=open-adventure.git

diff --git a/actions2.c b/actions2.c
index a169c48..3078408 100644
--- a/actions2.c
+++ b/actions2.c
@@ -29,7 +29,7 @@ L9011:	if(FIXED[OBJ] != 0) return(2011);
 	if(!TOTING(BOTTLE))SPK=104;
 	 return(2011);
 L9017:	SPK=92;
-	if(HOLDNG >= 7) return(2011);
+	if(game.holdng >= 7) return(2011);
 	if(OBJ != BIRD || PROP[BIRD] == 1 || -1-PROP[BIRD] == 1) goto L9014;
 	if(PROP[BIRD] == 2) goto L9015;
 	if(!TOTING(CAGE))SPK=27;
@@ -61,7 +61,7 @@ int discard(bool just_do_it) {
 	if(!TOTING(OBJ)) return(2011);
 	if(OBJ != BIRD || !HERE(SNAKE)) goto L9023;
 	RSPEAK(30);
-	if(CLOSED) return(19000);
+	if(game.closed) return(19000);
 	DSTROY(SNAKE);
 /*  SET PROP FOR USE BY TRAVEL OPTIONS */
 	PROP[SNAKE]=1;
@@ -148,7 +148,7 @@ int attack(FILE *input) {
 	if(OBJ > NOBJECTS) return(8000);
 L9124:	if(OBJ == BIRD) {
 		SPK=137;
-		if(CLOSED) return(2011);
+		if(game.closed) return(2011);
 		DSTROY(BIRD);
 		PROP[BIRD]=0;
 		SPK=45;
@@ -162,7 +162,7 @@ L9126:	if(OBJ == 0)SPK=44;
 	if(OBJ == CLAM || OBJ == OYSTER)SPK=150;
 	if(OBJ == SNAKE)SPK=46;
 	if(OBJ == DWARF)SPK=49;
-	if(OBJ == DWARF && CLOSED) return(19000);
+	if(OBJ == DWARF && game.closed) return(19000);
 	if(OBJ == DRAGON)SPK=167;
 	if(OBJ == TROLL)SPK=157;
 	if(OBJ == OGRE)SPK=203;
@@ -198,11 +198,11 @@ L9128:	RSPEAK(SPK);
 	RSPEAK(6);
 	DSTROY(OGRE);
 	K=0;
-	for (I=1; I<=5; I++) {
-		if(DLOC[I] == LOC) {
+	for (I=1; I < PIRATE; I++) {
+		if(game.dloc[I] == LOC) {
 			K=K+1;
-			DLOC[I]=61;
-			DSEEN[I]=false;
+			game.dloc[I]=61;
+			game.dseen[I]=false;
 		}
 	}
 	SPK=SPK+1+1/K;
@@ -232,12 +232,12 @@ int throw(FILE *cmdin) {
 	return(attack(cmdin));
 
 L9172:	SPK=48;
-	if(randrange(7) < DFLAG) goto L9175;
-	DSEEN[I]=false;
-	DLOC[I]=0;
+	if(randrange(NDWARVES+1) < game.dflag) goto L9175;
+	game.dseen[I]=false;
+	game.dloc[I]=0;
 	SPK=47;
-	DKILL=DKILL+1;
-	if(DKILL == 1)SPK=149;
+	game.dkill=game.dkill+1;
+	if(game.dkill == 1)SPK=149;
 L9175:	RSPEAK(SPK);
 	DROP(AXE,LOC);
 	K=NUL;
@@ -278,7 +278,7 @@ L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
 	SPK=102;
 	if(OBJ == DRAGON && PROP[DRAGON] != 0)SPK=110;
 	if(OBJ == TROLL)SPK=182;
-	if(OBJ != SNAKE || CLOSED || !HERE(BIRD)) return(2011);
+	if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
 	SPK=101;
 	DSTROY(BIRD);
 	PROP[BIRD]=0;
@@ -287,7 +287,7 @@ L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
 L9213:	if(OBJ != DWARF) goto L9214;
 	if(!HERE(FOOD)) return(2011);
 	SPK=103;
-	DFLAG=DFLAG+2;
+	game.dflag=game.dflag+2;
 	 return(2011);
 
 L9214:	if(OBJ != BEAR) goto L9215;