X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions2.c;h=043913e1ca4abfeaaab2c3c8bb42e9e440b2574a;hb=0b02763bf07618d3b3b88d9a8c907d0d60b33014;hp=2c5f0c41020c4a7768c7efc46eb5177128f349bf;hpb=f72141fbe356cd7bfe90a91cf65353e2808197a8;p=open-adventure.git

diff --git a/actions2.c b/actions2.c
index 2c5f0c4..043913e 100644
--- a/actions2.c
+++ b/actions2.c
@@ -1,6 +1,4 @@
-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
 #include "funcs.h"
 
 /*  Carry an object.  Special cases for bird and cage (if bird in cage, can't
@@ -9,46 +7,46 @@
 
 int carry(void) {
 	if(TOTING(OBJ)) return(2011);
-	game.spk=25;
-	if(OBJ == PLANT && PROP[PLANT] <= 0)game.spk=115;
-	if(OBJ == BEAR && PROP[BEAR] == 1)game.spk=169;
-	if(OBJ == CHAIN && PROP[BEAR] != 0)game.spk=170;
-	if(OBJ == URN)game.spk=215;
-	if(OBJ == CAVITY)game.spk=217;
-	if(OBJ == BLOOD)game.spk=239;
-	if(OBJ == RUG && PROP[RUG] == 2)game.spk=222;
-	if(OBJ == SIGN)game.spk=196;
+	SPK=25;
+	if(OBJ == PLANT && PROP[PLANT] <= 0)SPK=115;
+	if(OBJ == BEAR && PROP[BEAR] == 1)SPK=169;
+	if(OBJ == CHAIN && PROP[BEAR] != 0)SPK=170;
+	if(OBJ == URN)SPK=215;
+	if(OBJ == CAVITY)SPK=217;
+	if(OBJ == BLOOD)SPK=239;
+	if(OBJ == RUG && PROP[RUG] == 2)SPK=222;
+	if(OBJ == SIGN)SPK=196;
 	if(OBJ != MESSAG) goto L9011;
-	game.spk=190;
+	SPK=190;
 	DSTROY(MESSAG);
-L9011:	if(FIXED[OBJ] != 0) return(2011);
+L9011:	if(game.fixed[OBJ] != 0) return(2011);
 	if(OBJ != WATER && OBJ != OIL) goto L9017;
 	K=OBJ;
 	OBJ=BOTTLE;
 	if(HERE(BOTTLE) && LIQ(0) == K) goto L9017;
 	if(TOTING(BOTTLE) && PROP[BOTTLE] == 1) return(fill());
-	if(PROP[BOTTLE] != 1)game.spk=105;
-	if(!TOTING(BOTTLE))game.spk=104;
+	if(PROP[BOTTLE] != 1)SPK=105;
+	if(!TOTING(BOTTLE))SPK=104;
 	 return(2011);
-L9017:	game.spk=92;
+L9017:	SPK=92;
 	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))game.spk=27;
-	if(TOTING(ROD))game.spk=26;
-	if(game.spk/2 == 13) return(2011);
+	if(!TOTING(CAGE))SPK=27;
+	if(TOTING(ROD))SPK=26;
+	if(SPK/2 == 13) return(2011);
 	PROP[BIRD]=1;
 L9014:	if((OBJ == BIRD || OBJ == CAGE) && (PROP[BIRD] == 1 || -1-PROP[BIRD] ==
 		1))CARRY(BIRD+CAGE-OBJ,LOC);
 	CARRY(OBJ,LOC);
 	K=LIQ(0);
-	if(OBJ == BOTTLE && K != 0)PLACE[K]= -1;
+	if(OBJ == BOTTLE && K != 0)game.place[K]= -1;
 	if(!GSTONE(OBJ) || PROP[OBJ] == 0) return(2009);
 	PROP[OBJ]=0;
 	PROP[CAVITY]=1;
 	 return(2009);
 
-L9015:	game.spk=238;
+L9015:	SPK=238;
 	DSTROY(BIRD);
 	 return(2011);
 }
@@ -69,7 +67,7 @@ int discard(bool just_do_it) {
 	PROP[SNAKE]=1;
 L9021:	K=LIQ(0);
 	if(K == OBJ)OBJ=BOTTLE;
-	if(OBJ == BOTTLE && K != 0)PLACE[K]=0;
+	if(OBJ == BOTTLE && K != 0)game.place[K]=0;
 	if(OBJ == CAGE && PROP[BIRD] == 1)DROP(BIRD,LOC);
 	DROP(OBJ,LOC);
 	if(OBJ != BIRD) return(2012);
@@ -83,15 +81,15 @@ L9023:	if(!(GSTONE(OBJ) && AT(CAVITY) && PROP[CAVITY] != 0)) goto L9024;
 	PROP[CAVITY]=0;
 	if(!HERE(RUG) || !((OBJ == EMRALD && PROP[RUG] != 2) || (OBJ == RUBY &&
 		PROP[RUG] == 2))) goto L9021;
-	game.spk=219;
-	if(TOTING(RUG))game.spk=220;
-	if(OBJ == RUBY)game.spk=221;
-	RSPEAK(game.spk);
-	if(game.spk == 220) goto L9021;
+	SPK=219;
+	if(TOTING(RUG))SPK=220;
+	if(OBJ == RUBY)SPK=221;
+	RSPEAK(SPK);
+	if(SPK == 220) goto L9021;
 	K=2-PROP[RUG];
 	PROP[RUG]=K;
 	if(K == 2)K=PLAC[SAPPH];
-	MOVE(RUG+100,K);
+	MOVE(RUG+NOBJECTS,K);
 	 goto L9021;
 
 L9024:	if(OBJ != COINS || !HERE(VEND)) goto L9025;
@@ -109,9 +107,9 @@ L9025:	if(OBJ != BIRD || !AT(DRAGON) || PROP[DRAGON] != 0) goto L9026;
 L9026:	if(OBJ != BEAR || !AT(TROLL)) goto L9027;
 	RSPEAK(163);
 	MOVE(TROLL,0);
-	MOVE(TROLL+100,0);
+	MOVE(TROLL+NOBJECTS,0);
 	MOVE(TROLL2,PLAC[TROLL]);
-	MOVE(TROLL2+100,FIXD[TROLL]);
+	MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
 	JUGGLE(CHASM);
 	PROP[TROLL]=2;
 	 goto L9021;
@@ -123,7 +121,7 @@ L9027:	if(OBJ == VASE && LOC != PLAC[PILLOW]) goto L9028;
 L9028:	PROP[VASE]=2;
 	if(AT(PILLOW))PROP[VASE]=0;
 	PSPEAK(VASE,PROP[VASE]+1);
-	if(PROP[VASE] != 0)FIXED[VASE]= -1;
+	if(PROP[VASE] != 0)game.fixed[VASE]= -1;
 	 goto L9021;
 }
 
@@ -135,40 +133,41 @@ int attack(FILE *input) {
 	I=ATDWRF(LOC);
 	if(OBJ != 0) goto L9124;
 	if(I > 0)OBJ=DWARF;
-	if(HERE(SNAKE))OBJ=OBJ*100+SNAKE;
-	if(AT(DRAGON) && PROP[DRAGON] == 0)OBJ=OBJ*100+DRAGON;
-	if(AT(TROLL))OBJ=OBJ*100+TROLL;
-	if(AT(OGRE))OBJ=OBJ*100+OGRE;
-	if(HERE(BEAR) && PROP[BEAR] == 0)OBJ=OBJ*100+BEAR;
-	if(OBJ > 100) return(8000);
+	if(HERE(SNAKE))OBJ=OBJ*NOBJECTS+SNAKE;
+	if(AT(DRAGON) && PROP[DRAGON] == 0)OBJ=OBJ*NOBJECTS+DRAGON;
+	if(AT(TROLL))OBJ=OBJ*NOBJECTS+TROLL;
+	if(AT(OGRE))OBJ=OBJ*NOBJECTS+OGRE;
+	if(HERE(BEAR) && PROP[BEAR] == 0)OBJ=OBJ*NOBJECTS+BEAR;
+	if(OBJ > NOBJECTS) return(8000);
 	if(OBJ != 0) goto L9124;
 /*  CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */
 	if(HERE(BIRD) && VERB != THROW)OBJ=BIRD;
-	if(HERE(VEND) && VERB != THROW)OBJ=OBJ*100+VEND;
+	if(HERE(VEND) && VERB != THROW)OBJ=OBJ*NOBJECTS+VEND;
 /*  CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
-	if(HERE(CLAM) || HERE(OYSTER))OBJ=100*OBJ+CLAM;
-	if(OBJ > 100) return(8000);
-L9124:	if(OBJ != BIRD) goto L9125;
-	game.spk=137;
-	if(game.closed) return(2011);
-	DSTROY(BIRD);
-	PROP[BIRD]=0;
-	game.spk=45;
+	if(HERE(CLAM) || HERE(OYSTER))OBJ=NOBJECTS*OBJ+CLAM;
+	if(OBJ > NOBJECTS) return(8000);
+L9124:	if(OBJ == BIRD) {
+		SPK=137;
+		if(game.closed) return(2011);
+		DSTROY(BIRD);
+		PROP[BIRD]=0;
+		SPK=45;
+	}
 L9125:	if(OBJ != VEND) goto L9126;
 	PSPEAK(VEND,PROP[VEND]+2);
 	PROP[VEND]=3-PROP[VEND];
 	 return(2012);
 
-L9126:	if(OBJ == 0)game.spk=44;
-	if(OBJ == CLAM || OBJ == OYSTER)game.spk=150;
-	if(OBJ == SNAKE)game.spk=46;
-	if(OBJ == DWARF)game.spk=49;
+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 && game.closed) return(19000);
-	if(OBJ == DRAGON)game.spk=167;
-	if(OBJ == TROLL)game.spk=157;
-	if(OBJ == OGRE)game.spk=203;
+	if(OBJ == DRAGON)SPK=167;
+	if(OBJ == TROLL)SPK=157;
+	if(OBJ == OGRE)SPK=203;
 	if(OBJ == OGRE && I > 0) goto L9128;
-	if(OBJ == BEAR)game.spk=165+(PROP[BEAR]+1)/2;
+	if(OBJ == BEAR)SPK=165+(PROP[BEAR]+1)/2;
 	if(OBJ != DRAGON || PROP[DRAGON] != 0) return(2011);
 /*  Fun stuff for dragon.  If he insists on attacking it, win!  Set PROP to dead,
  *  move dragon to central loc (still fixed), move rug there (not fixed), and
@@ -182,32 +181,32 @@ L9126:	if(OBJ == 0)game.spk=44;
 	PROP[DRAGON]=1;
 	PROP[RUG]=0;
 	K=(PLAC[DRAGON]+FIXD[DRAGON])/2;
-	MOVE(DRAGON+100,-1);
-	MOVE(RUG+100,0);
+	MOVE(DRAGON+NOBJECTS,-1);
+	MOVE(RUG+NOBJECTS,0);
 	MOVE(DRAGON,K);
 	MOVE(RUG,K);
 	DROP(BLOOD,K);
-	for (OBJ=1; OBJ<=100; OBJ++) {
-	if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
+	for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
+	if(game.place[OBJ] == PLAC[DRAGON] || game.place[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
 	/*etc*/ ;
 	} /* end loop */
 	LOC=K;
 	K=NUL;
 	 return(8);
 
-L9128:	RSPEAK(game.spk);
+L9128:	RSPEAK(SPK);
 	RSPEAK(6);
 	DSTROY(OGRE);
 	K=0;
-	/* 9129 */ for (I=1; I<=5; I++) {
-	if(DLOC[I] != LOC) goto L9129;
-	K=K+1;
-	DLOC[I]=61;
-	game.dseen[I]=false;
-L9129:	/*etc*/ ;
-	} /* end loop */
-	game.spk=game.spk+1+1/K;
-	 return(2011);
+	for (I=1; I < PIRATE; I++) {
+		if(game.dloc[I] == LOC) {
+			K=K+1;
+			game.dloc[I]=61;
+			game.dseen[I]=false;
+		}
+	}
+	SPK=SPK+1+1/K;
+	return(2011);
 }
 
 /*  Throw.  Same as discard unless axe.  Then same as attack except ignore bird,
@@ -222,32 +221,32 @@ int throw(FILE *cmdin) {
 	if(OBJ != AXE) return(discard(false));
 	I=ATDWRF(LOC);
 	if(I > 0) goto L9172;
-	game.spk=152;
+	SPK=152;
 	if(AT(DRAGON) && PROP[DRAGON] == 0) goto L9175;
-	game.spk=158;
+	SPK=158;
 	if(AT(TROLL)) goto L9175;
-	game.spk=203;
+	SPK=203;
 	if(AT(OGRE)) goto L9175;
 	if(HERE(BEAR) && PROP[BEAR] == 0) goto L9176;
 	OBJ=0;
 	return(attack(cmdin));
 
-L9172:	game.spk=48;
-	if(RAN(7) < game.dflag) goto L9175;
+L9172:	SPK=48;
+	if(randrange(NDWARVES+1) < game.dflag) goto L9175;
 	game.dseen[I]=false;
-	DLOC[I]=0;
-	game.spk=47;
+	game.dloc[I]=0;
+	SPK=47;
 	game.dkill=game.dkill+1;
-	if(game.dkill == 1)game.spk=149;
-L9175:	RSPEAK(game.spk);
+	if(game.dkill == 1)SPK=149;
+L9175:	RSPEAK(SPK);
 	DROP(AXE,LOC);
 	K=NUL;
 	 return(8);
 
 /*  This'll teach him to throw the axe at the bear! */
-L9176:	game.spk=164;
+L9176:	SPK=164;
 	DROP(AXE,LOC);
-	FIXED[AXE]= -1;
+	game.fixed[AXE]= -1;
 	PROP[AXE]=1;
 	JUGGLE(BEAR);
 	 return(2011);
@@ -256,13 +255,13 @@ L9176:	game.spk=164;
 L9177:	OBJ=BEAR;
 	return(feed());
 
-L9178:	game.spk=159;
+L9178:	SPK=159;
 /*  Snarf a treasure for the troll. */
 	DROP(OBJ,0);
 	MOVE(TROLL,0);
-	MOVE(TROLL+100,0);
+	MOVE(TROLL+NOBJECTS,0);
 	DROP(TROLL2,PLAC[TROLL]);
-	DROP(TROLL2+100,FIXD[TROLL]);
+	DROP(TROLL2+NOBJECTS,FIXD[TROLL]);
 	JUGGLE(CHASM);
 	 return(2011);
 }
@@ -272,41 +271,41 @@ L9178:	game.spk=159;
 
 int feed() {
 	if(OBJ != BIRD) goto L9212;
-	game.spk=100;
+	SPK=100;
 	 return(2011);
 
 L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
-	game.spk=102;
-	if(OBJ == DRAGON && PROP[DRAGON] != 0)game.spk=110;
-	if(OBJ == TROLL)game.spk=182;
+	SPK=102;
+	if(OBJ == DRAGON && PROP[DRAGON] != 0)SPK=110;
+	if(OBJ == TROLL)SPK=182;
 	if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
-	game.spk=101;
+	SPK=101;
 	DSTROY(BIRD);
 	PROP[BIRD]=0;
 	 return(2011);
 
 L9213:	if(OBJ != DWARF) goto L9214;
 	if(!HERE(FOOD)) return(2011);
-	game.spk=103;
+	SPK=103;
 	game.dflag=game.dflag+2;
 	 return(2011);
 
 L9214:	if(OBJ != BEAR) goto L9215;
-	if(PROP[BEAR] == 0)game.spk=102;
-	if(PROP[BEAR] == 3)game.spk=110;
+	if(PROP[BEAR] == 0)SPK=102;
+	if(PROP[BEAR] == 3)SPK=110;
 	if(!HERE(FOOD)) return(2011);
 	DSTROY(FOOD);
 	PROP[BEAR]=1;
-	FIXED[AXE]=0;
+	game.fixed[AXE]=0;
 	PROP[AXE]=0;
-	game.spk=168;
+	SPK=168;
 	 return(2011);
 
 L9215:	if(OBJ != OGRE) goto L9216;
-	if(HERE(FOOD))game.spk=202;
+	if(HERE(FOOD))SPK=202;
 	 return(2011);
 
-L9216:	game.spk=14;
+L9216:	SPK=14;
 	 return(2011);
 }
 
@@ -317,33 +316,33 @@ int fill() {
 	if(OBJ == URN) goto L9224;
 	if(OBJ != 0 && OBJ != BOTTLE) return(2011);
 	if(OBJ == 0 && !HERE(BOTTLE)) return(8000);
-	game.spk=107;
-	if(LIQLOC(LOC) == 0)game.spk=106;
-	if(HERE(URN) && PROP[URN] != 0)game.spk=214;
-	if(LIQ(0) != 0)game.spk=105;
-	if(game.spk != 107) return(2011);
+	SPK=107;
+	if(LIQLOC(LOC) == 0)SPK=106;
+	if(HERE(URN) && PROP[URN] != 0)SPK=214;
+	if(LIQ(0) != 0)SPK=105;
+	if(SPK != 107) return(2011);
 	PROP[BOTTLE]=MOD(COND[LOC],4)/2*2;
 	K=LIQ(0);
-	if(TOTING(BOTTLE))PLACE[K]= -1;
-	if(K == OIL)game.spk=108;
+	if(TOTING(BOTTLE))game.place[K]= -1;
+	if(K == OIL)SPK=108;
 	 return(2011);
 
-L9222:	game.spk=29;
-	if(LIQLOC(LOC) == 0)game.spk=144;
+L9222:	SPK=29;
+	if(LIQLOC(LOC) == 0)SPK=144;
 	if(LIQLOC(LOC) == 0 || !TOTING(VASE)) return(2011);
 	RSPEAK(145);
 	PROP[VASE]=2;
-	FIXED[VASE]= -1;
+	game.fixed[VASE]= -1;
 	 return(discard(true));
 
-L9224:	game.spk=213;
+L9224:	SPK=213;
 	if(PROP[URN] != 0) return(2011);
-	game.spk=144;
+	SPK=144;
 	K=LIQ(0);
 	if(K == 0 || !HERE(BOTTLE)) return(2011);
-	PLACE[K]=0;
+	game.place[K]=0;
 	PROP[BOTTLE]=1;
 	if(K == OIL)PROP[URN]=1;
-	game.spk=211+PROP[URN];
+	SPK=211+PROP[URN];
 	 return(2011);
 }