X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions2.c;h=f208a4978520ef6c44fa76b92685c2ef56ef27d0;hp=4385ad94fa4570e13e0cbd3995233fb41f0e605e;hb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb;hpb=f89f63c6d1a6bc786febc8f22c3ecd8cd3f1f6ae

diff --git a/actions2.c b/actions2.c
index 4385ad9..f208a49 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
@@ -131,7 +129,7 @@ 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;
@@ -176,7 +174,7 @@ L9126:	if(OBJ == 0)SPK=44;
 	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;
@@ -214,7 +212,7 @@ L9129:	/*etc*/ ;
  *  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,10 +228,10 @@ 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;
+	if(randrange(7) < DFLAG) goto L9175;
 	DSEEN[I]=false;
 	DLOC[I]=0;
 	SPK=47;