X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions2.c;h=f3a021ab0b79b4b216ff0d8eae255a31eddfa31c;hb=f840f3936146c02129a26848572b9f60dabe5af5;hp=8952a602518a4b0099862a5b9b587c3b7686f4b1;hpb=4fe6286cc6d432104eeb77ecfe4326d35725b445;p=open-adventure.git

diff --git a/actions2.c b/actions2.c
index 8952a60..f3a021a 100644
--- a/actions2.c
+++ b/actions2.c
@@ -5,44 +5,44 @@
  *  take one without the other).  Liquids also special, since they depend on
  *  status of bottle.  Also various side effects, etc. */
 
-int carry(void) {
-	if(TOTING(OBJ)) return(2011);
+int carry(long obj) {
+	if(TOTING(obj)) return(2011);
 	SPK=25;
-	if(OBJ == PLANT && game.prop[PLANT] <= 0)SPK=115;
-	if(OBJ == BEAR && game.prop[BEAR] == 1)SPK=169;
-	if(OBJ == CHAIN && game.prop[BEAR] != 0)SPK=170;
-	if(OBJ == URN)SPK=215;
-	if(OBJ == CAVITY)SPK=217;
-	if(OBJ == BLOOD)SPK=239;
-	if(OBJ == RUG && game.prop[RUG] == 2)SPK=222;
-	if(OBJ == SIGN)SPK=196;
-	if(OBJ != MESSAG) goto L9011;
+	if(obj == PLANT && game.prop[PLANT] <= 0)SPK=115;
+	if(obj == BEAR && game.prop[BEAR] == 1)SPK=169;
+	if(obj == CHAIN && game.prop[BEAR] != 0)SPK=170;
+	if(obj == URN)SPK=215;
+	if(obj == CAVITY)SPK=217;
+	if(obj == BLOOD)SPK=239;
+	if(obj == RUG && game.prop[RUG] == 2)SPK=222;
+	if(obj == SIGN)SPK=196;
+	if(obj != MESSAG) goto L9011;
 	SPK=190;
 	DSTROY(MESSAG);
-L9011:	if(game.fixed[OBJ] != 0) return(2011);
-	if(OBJ != WATER && OBJ != OIL) goto L9017;
-	K=OBJ;
-	OBJ=BOTTLE;
+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) && game.prop[BOTTLE] == 1) return(fill());
+	if(TOTING(BOTTLE) && game.prop[BOTTLE] == 1) return(fill(obj));
 	if(game.prop[BOTTLE] != 1)SPK=105;
 	if(!TOTING(BOTTLE))SPK=104;
 	 return(2011);
 L9017:	SPK=92;
 	if(game.holdng >= 7) return(2011);
-	if(OBJ != BIRD || game.prop[BIRD] == 1 || -1-game.prop[BIRD] == 1) goto L9014;
+	if(obj != BIRD || game.prop[BIRD] == 1 || -1-game.prop[BIRD] == 1) goto L9014;
 	if(game.prop[BIRD] == 2) goto L9015;
 	if(!TOTING(CAGE))SPK=27;
 	if(TOTING(ROD))SPK=26;
 	if(SPK/2 == 13) return(2011);
 	game.prop[BIRD]=1;
-L9014:	if((OBJ == BIRD || OBJ == CAGE) && (game.prop[BIRD] == 1 || -1-game.prop[BIRD] ==
-		1))CARRY(BIRD+CAGE-OBJ,game.loc);
-	CARRY(OBJ,game.loc);
+L9014:	if((obj == BIRD || obj == CAGE) && (game.prop[BIRD] == 1 || -1-game.prop[BIRD] ==
+		1))CARRY(BIRD+CAGE-obj,game.loc);
+	CARRY(obj,game.loc);
 	K=LIQ(0);
-	if(OBJ == BOTTLE && K != 0)game.place[K]= -1;
-	if(!GSTONE(OBJ) || game.prop[OBJ] == 0) return(2009);
-	game.prop[OBJ]=0;
+	if(obj == BOTTLE && K != 0)game.place[K]= -1;
+	if(!GSTONE(obj) || game.prop[obj] == 0) return(2009);
+	game.prop[obj]=0;
 	game.prop[CAVITY]=1;
 	 return(2009);
 
@@ -55,35 +55,35 @@ L9015:	SPK=238;
  *  bird (might attack snake or dragon) and cage (might contain bird) and vase.
  *  Drop coins at vending machine for extra batteries. */
 
-int discard(bool just_do_it) {
+int discard(long obj, bool just_do_it) {
 	if(just_do_it) goto L9021;
-	if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2;
-	if(!TOTING(OBJ)) return(2011);
-	if(OBJ != BIRD || !HERE(SNAKE)) goto L9023;
+	if(TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
+	if(!TOTING(obj)) return(2011);
+	if(obj != BIRD || !HERE(SNAKE)) goto L9023;
 	RSPEAK(30);
 	if(game.closed) return(19000);
 	DSTROY(SNAKE);
 /*  SET game.prop FOR USE BY TRAVEL OPTIONS */
 	game.prop[SNAKE]=1;
 L9021:	K=LIQ(0);
-	if(K == OBJ)OBJ=BOTTLE;
-	if(OBJ == BOTTLE && K != 0)game.place[K]=0;
-	if(OBJ == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
-	DROP(OBJ,game.loc);
-	if(OBJ != BIRD) return(2012);
+	if(K == obj)obj=BOTTLE;
+	if(obj == BOTTLE && K != 0)game.place[K]=0;
+	if(obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
+	DROP(obj,game.loc);
+	if(obj != BIRD) return(2012);
 	game.prop[BIRD]=0;
 	if(FOREST(game.loc))game.prop[BIRD]=2;
 	 return(2012);
 
-L9023:	if(!(GSTONE(OBJ) && AT(CAVITY) && game.prop[CAVITY] != 0)) goto L9024;
+L9023:	if(!(GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) goto L9024;
 	RSPEAK(218);
-	game.prop[OBJ]=1;
+	game.prop[obj]=1;
 	game.prop[CAVITY]=0;
-	if(!HERE(RUG) || !((OBJ == EMRALD && game.prop[RUG] != 2) || (OBJ == RUBY &&
+	if(!HERE(RUG) || !((obj == EMRALD && game.prop[RUG] != 2) || (obj == RUBY &&
 		game.prop[RUG] == 2))) goto L9021;
 	SPK=219;
 	if(TOTING(RUG))SPK=220;
-	if(OBJ == RUBY)SPK=221;
+	if(obj == RUBY)SPK=221;
 	RSPEAK(SPK);
 	if(SPK == 220) goto L9021;
 	K=2-game.prop[RUG];
@@ -92,19 +92,19 @@ L9023:	if(!(GSTONE(OBJ) && AT(CAVITY) && game.prop[CAVITY] != 0)) goto L9024;
 	MOVE(RUG+NOBJECTS,K);
 	 goto L9021;
 
-L9024:	if(OBJ != COINS || !HERE(VEND)) goto L9025;
+L9024:	if(obj != COINS || !HERE(VEND)) goto L9025;
 	DSTROY(COINS);
 	DROP(BATTER,game.loc);
 	PSPEAK(BATTER,0);
 	 return(2012);
 
-L9025:	if(OBJ != BIRD || !AT(DRAGON) || game.prop[DRAGON] != 0) goto L9026;
+L9025:	if(obj != BIRD || !AT(DRAGON) || game.prop[DRAGON] != 0) goto L9026;
 	RSPEAK(154);
 	DSTROY(BIRD);
 	game.prop[BIRD]=0;
 	 return(2012);
 
-L9026:	if(OBJ != BEAR || !AT(TROLL)) goto L9027;
+L9026:	if(obj != BEAR || !AT(TROLL)) goto L9027;
 	RSPEAK(163);
 	MOVE(TROLL,0);
 	MOVE(TROLL+NOBJECTS,0);
@@ -114,7 +114,7 @@ L9026:	if(OBJ != BEAR || !AT(TROLL)) goto L9027;
 	game.prop[TROLL]=2;
 	 goto L9021;
 
-L9027:	if(OBJ == VASE && game.loc != PLAC[PILLOW]) goto L9028;
+L9027:	if(obj == VASE && game.loc != PLAC[PILLOW]) goto L9028;
 	RSPEAK(54);
 	 goto L9021;
 
@@ -129,52 +129,50 @@ L9028:	game.prop[VASE]=2;
  *  objects fall into two categories: enemies (snake, dwarf, etc.)  and others
  *  (bird, clam, machine).  Ambiguous if 2 enemies, or no enemies but 2 others. */
 
-int attack(FILE *input) {
+int attack(FILE *input, long obj, long verb) {
 	I=ATDWRF(game.loc);
-	if(OBJ != 0) goto L9124;
-	if(I > 0)OBJ=DWARF;
-	if(HERE(SNAKE))OBJ=OBJ*NOBJECTS+SNAKE;
-	if(AT(DRAGON) && game.prop[DRAGON] == 0)OBJ=OBJ*NOBJECTS+DRAGON;
-	if(AT(TROLL))OBJ=OBJ*NOBJECTS+TROLL;
-	if(AT(OGRE))OBJ=OBJ*NOBJECTS+OGRE;
-	if(HERE(BEAR) && game.prop[BEAR] == 0)OBJ=OBJ*NOBJECTS+BEAR;
-	if(OBJ > NOBJECTS) return(8000);
-	if(OBJ != 0) goto L9124;
+	if(obj != 0) goto L9124;
+	if(I > 0)obj=DWARF;
+	if(HERE(SNAKE))obj=obj*NOBJECTS+SNAKE;
+	if(AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON;
+	if(AT(TROLL))obj=obj*NOBJECTS+TROLL;
+	if(AT(OGRE))obj=obj*NOBJECTS+OGRE;
+	if(HERE(BEAR) && game.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*NOBJECTS+VEND;
+	if(HERE(BIRD) && verb != THROW)obj=BIRD;
+	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=NOBJECTS*OBJ+CLAM;
-	if(OBJ > NOBJECTS) return(8000);
-L9124:	if(OBJ == BIRD) {
+	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);
 		game.prop[BIRD]=0;
 		SPK=45;
 	}
-L9125:	if(OBJ != VEND) goto L9126;
+L9125:	if(obj != VEND) goto L9126;
 	PSPEAK(VEND,game.prop[VEND]+2);
 	game.prop[VEND]=3-game.prop[VEND];
 	 return(2012);
 
-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)SPK=167;
-	if(OBJ == TROLL)SPK=157;
-	if(OBJ == OGRE)SPK=203;
-	if(OBJ == OGRE && I > 0) goto L9128;
-	if(OBJ == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
-	if(OBJ != DRAGON || game.prop[DRAGON] != 0) return(2011);
+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)SPK=167;
+	if(obj == TROLL)SPK=157;
+	if(obj == OGRE)SPK=203;
+	if(obj == OGRE && I > 0) goto L9128;
+	if(obj == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
+	if(obj != DRAGON || game.prop[DRAGON] != 0) return(2011);
 /*  Fun stuff for dragon.  If he insists on attacking it, win!  Set game.prop to dead,
  *  move dragon to central loc (still fixed), move rug there (not fixed), and
  *  move him there, too.  Then do a null motion to get new description. */
 	RSPEAK(49);
-	VERB=0;
-	OBJ=0;
 	GETIN(input,WD1,WD1X,WD2,WD2X);
 	if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607);
 	PSPEAK(DRAGON,3);
@@ -186,8 +184,8 @@ L9126:	if(OBJ == 0)SPK=44;
 	MOVE(DRAGON,K);
 	MOVE(RUG,K);
 	DROP(BLOOD,K);
-	for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
-	if(game.place[OBJ] == PLAC[DRAGON] || game.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 */
 	game.loc=K;
@@ -213,12 +211,12 @@ L9128:	RSPEAK(SPK);
  *  and if dwarf is present then one might be killed.  (Only way to do so!)
  *  Axe also special for dragon, bear, and troll.  Treasures special for troll. */
 
-int throw(FILE *cmdin) {
-	if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2;
-	if(!TOTING(OBJ)) return(2011);
-	if(OBJ >= 50 && OBJ <= MAXTRS && AT(TROLL)) goto L9178;
-	if(OBJ == FOOD && HERE(BEAR)) goto L9177;
-	if(OBJ != AXE) return(discard(false));
+int throw(FILE *cmdin, long obj, long verb) {
+	if(TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
+	if(!TOTING(obj)) return(2011);
+	if(obj >= 50 && obj <= MAXTRS && AT(TROLL)) goto L9178;
+	if(obj == FOOD && HERE(BEAR)) goto L9177;
+	if(obj != AXE) return(discard(obj, false));
 	I=ATDWRF(game.loc);
 	if(I > 0) goto L9172;
 	SPK=152;
@@ -228,8 +226,8 @@ int throw(FILE *cmdin) {
 	SPK=203;
 	if(AT(OGRE)) goto L9175;
 	if(HERE(BEAR) && game.prop[BEAR] == 0) goto L9176;
-	OBJ=0;
-	return(attack(cmdin));
+	obj=0;
+	return(attack(cmdin, obj, verb));
 
 L9172:	SPK=48;
 	if(randrange(NDWARVES+1) < game.dflag) goto L9175;
@@ -252,12 +250,12 @@ L9176:	SPK=164;
 	 return(2011);
 
 /*  But throwing food is another story. */
-L9177:	OBJ=BEAR;
-	return(feed());
+L9177:	obj=BEAR;
+	return(feed(obj));
 
 L9178:	SPK=159;
 /*  Snarf a treasure for the troll. */
-	DROP(OBJ,0);
+	DROP(obj,0);
 	MOVE(TROLL,0);
 	MOVE(TROLL+NOBJECTS,0);
 	DROP(TROLL2,PLAC[TROLL]);
@@ -269,28 +267,28 @@ L9178:	SPK=159;
 /*  Feed.  If bird, no seed.  Snake, dragon, troll: quip.  If dwarf, make him
  *  mad.  Bear, special. */
 
-int feed() {
-	if(OBJ != BIRD) goto L9212;
+int feed(long obj) {
+	if(obj != BIRD) goto L9212;
 	SPK=100;
 	 return(2011);
 
-L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
+L9212:	if(obj != SNAKE && obj != DRAGON && obj != TROLL) goto L9213;
 	SPK=102;
-	if(OBJ == DRAGON && game.prop[DRAGON] != 0)SPK=110;
-	if(OBJ == TROLL)SPK=182;
-	if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
+	if(obj == DRAGON && game.prop[DRAGON] != 0)SPK=110;
+	if(obj == TROLL)SPK=182;
+	if(obj != SNAKE || game.closed || !HERE(BIRD)) return(2011);
 	SPK=101;
 	DSTROY(BIRD);
 	game.prop[BIRD]=0;
 	 return(2011);
 
-L9213:	if(OBJ != DWARF) goto L9214;
+L9213:	if(obj != DWARF) goto L9214;
 	if(!HERE(FOOD)) return(2011);
 	SPK=103;
 	game.dflag=game.dflag+2;
 	 return(2011);
 
-L9214:	if(OBJ != BEAR) goto L9215;
+L9214:	if(obj != BEAR) goto L9215;
 	if(game.prop[BEAR] == 0)SPK=102;
 	if(game.prop[BEAR] == 3)SPK=110;
 	if(!HERE(FOOD)) return(2011);
@@ -301,7 +299,7 @@ L9214:	if(OBJ != BEAR) goto L9215;
 	SPK=168;
 	 return(2011);
 
-L9215:	if(OBJ != OGRE) goto L9216;
+L9215:	if(obj != OGRE) goto L9216;
 	if(HERE(FOOD))SPK=202;
 	 return(2011);
 
@@ -311,11 +309,11 @@ L9216:	SPK=14;
 
 /*  Fill.  Bottle or urn must be empty, and liquid available.  (Vase is nasty.) */
 
-int fill() {
-	if(OBJ == VASE) goto L9222;
-	if(OBJ == URN) goto L9224;
-	if(OBJ != 0 && OBJ != BOTTLE) return(2011);
-	if(OBJ == 0 && !HERE(BOTTLE)) return(8000);
+int fill(long obj) {
+	if(obj == VASE) goto L9222;
+	if(obj == URN) goto L9224;
+	if(obj != 0 && obj != BOTTLE) return(2011);
+	if(obj == 0 && !HERE(BOTTLE)) return(8000);
 	SPK=107;
 	if(LIQLOC(game.loc) == 0)SPK=106;
 	if(HERE(URN) && game.prop[URN] != 0)SPK=214;
@@ -333,7 +331,7 @@ L9222:	SPK=29;
 	RSPEAK(145);
 	game.prop[VASE]=2;
 	game.fixed[VASE]= -1;
-	 return(discard(true));
+	return(discard(obj, true));
 
 L9224:	SPK=213;
 	if(game.prop[URN] != 0) return(2011);