X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions2.c;h=208a453b402768e76d1fdc39466bfe0ac6868bee;hb=07c0020a7aaa0ab34ee0e4f6e3a9ae0e1fe06c25;hp=ae2c2f4228f79ad0bca66eb26841bfba076a38ec;hpb=18767d52dd053cf6c851ded2597697674ca255c1;p=open-adventure.git

diff --git a/actions2.c b/actions2.c
index ae2c2f4..208a453 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
@@ -91,7 +89,7 @@ L9023:	if(!(GSTONE(OBJ) && AT(CAVITY) && PROP[CAVITY] != 0)) goto L9024;
 	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;
@@ -131,29 +129,30 @@ L9028:	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() {
+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;
-	SPK=137;
-	if(CLOSED) return(2011);
-	DSTROY(BIRD);
-	PROP[BIRD]=0;
-	SPK=45;
+	if(HERE(CLAM) || HERE(OYSTER))OBJ=NOBJECTS*OBJ+CLAM;
+	if(OBJ > NOBJECTS) return(8000);
+L9124:	if(OBJ == BIRD) {
+		SPK=137;
+		if(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];
@@ -172,24 +171,24 @@ L9126:	if(OBJ == 0)SPK=44;
 	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
- *  move him there, too.  then do a null motion to get new description. */
+ *  move him there, too.  Then do a null motion to get new description. */
 	RSPEAK(49);
 	VERB=0;
 	OBJ=0;
-	GETIN(WD1,WD1X,WD2,WD2X);
+	GETIN(input,WD1,WD1X,WD2,WD2X);
 	if(WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607);
 	PSPEAK(DRAGON,3);
 	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);
-	/* 9127 */ for (OBJ=1; OBJ<=100; OBJ++) {
+	for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
 	if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
-L9127:	/*etc*/ ;
+	/*etc*/ ;
 	} /* end loop */
 	LOC=K;
 	K=NUL;
@@ -199,22 +198,22 @@ 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;
-	DSEEN[I]=false;
-L9129:	/*etc*/ ;
-	} /* end loop */
+	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);
+	return(2011);
 }
 
 /*  Throw.  Same as discard unless axe.  Then same as attack except ignore bird,
  *  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() {
+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;
@@ -230,12 +229,12 @@ int throw() {
 	if(AT(OGRE)) goto L9175;
 	if(HERE(BEAR) && PROP[BEAR] == 0) goto L9176;
 	OBJ=0;
-	return(attack());
+	return(attack(cmdin));
 
 L9172:	SPK=48;
-	if(RAN(7) < DFLAG) goto L9175;
-	DSEEN[I]=false;
-	DLOC[I]=0;
+	if(randrange(NDWARVES+1) < DFLAG) goto L9175;
+	game.dseen[I]=false;
+	game.dloc[I]=0;
 	SPK=47;
 	DKILL=DKILL+1;
 	if(DKILL == 1)SPK=149;
@@ -260,14 +259,14 @@ 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);
 }
 
-/*  Feed.  If bird, no seed.  snake, dragon, troll: quip.  If dwarf, make him
+/*  Feed.  If bird, no seed.  Snake, dragon, troll: quip.  If dwarf, make him
  *  mad.  Bear, special. */
 
 int feed() {