X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions1.c;h=66bad5e89017bb127e544326673eac0a61f04bb6;hp=55413be36ea0ead8c13d010be8072d089eeecab6;hb=dc9d9e467b4efe76c30f15ccd23ceede2326f5e8;hpb=18767d52dd053cf6c851ded2597697674ca255c1

diff --git a/actions1.c b/actions1.c
index 55413be..66bad5e 100644
--- a/actions1.c
+++ b/actions1.c
@@ -11,10 +11,10 @@
  * similar label number for the caller to "goto".
  */
 
-/*  Analyse a verb.  remember what it was, go back for object if second word
+/*  Analyse a verb.  Remember what it was, go back for object if second word
  *  unless verb is "say", which snarfs arbitrary second word. */
 
-int action(long STARTAT) {
+int action(FILE *input, long STARTAT) {
 	switch(STARTAT) {
 	   case 4000: goto L4000;
 	   case 4090: goto L4090;
@@ -30,7 +30,7 @@ L4000:	VERB=K;
 
 /*  Analyse an intransitive verb (ie, no object given yet). */
 
-L4080:	switch (VERB-1) { case 0: goto L8010; case 1: return(8000); case 2:
+	switch (VERB-1) { case 0: goto L8010; case 1: return(8000); case 2:
 		return(8000); case 3: goto L8040; case 4: return(2009); case 5: goto L8040;
 		case 6: goto L8070; case 7: goto L8080; case 8: return(8000); case
 		9: return(8000); case 10: return(2011); case 11: goto L9120; case 12:
@@ -112,7 +112,7 @@ L5190:	if((VERB == FIND || VERB == INVENT) && WD2 <= 0) goto L5010;
 /*  Routines for performing the various action verbs */
 
 /*  Statement numbers in this section are 8000 for intransitive verbs, 9000 for
- *  transitive, plus ten times the verb number.  many intransitive verbs use the
+ *  transitive, plus ten times the verb number.  Many intransitive verbs use the
  *  transitive code, and some verbs use code for other verbs, as noted below. */
 
 /*  Carry, no object given yet.  OK if only one object present. */
@@ -269,7 +269,7 @@ L9094:	DROP(JADE,LOC);
 
 /*  Attack also moved into separate module. */
 
-L9120:	return(attack());
+L9120:	return(attack(input));
 
 /*  Pour.  If no object, or object is bottle, assume contents of bottle.
  *  special tests for pouring water or oil on plant or rusty door. */
@@ -302,7 +302,7 @@ L9132:	PROP[DOOR]=0;
 L9134:	OBJ=URN;
 	 goto L9220;
 
-/*  Eat.  Intransitive: assume food if present, else ask what.  transitive: food
+/*  Eat.  Intransitive: assume food if present, else ask what.  Transitive: food
  *  ok, some things lose appetite, rest are ridiculous. */
 
 L8140:	if(!HERE(FOOD)) return(8000);
@@ -316,7 +316,7 @@ L9140:	if(OBJ == FOOD) goto L8142;
 		OGRE)SPK=71;
 	 return(2011);
 
-/*  Drink.  If no object, assume water and look for it here.  if water is in
+/*  Drink.  If no object, assume water and look for it here.  If water is in
  *  the bottle, drink that, else must be at a water loc, so drink stream. */
 
 L9150:	if(OBJ == 0 && LIQLOC(LOC) != WATER && (LIQ(0) != WATER || !HERE(BOTTLE)))
@@ -349,11 +349,11 @@ L9160:	if(OBJ != LAMP)SPK=76;
 
 /*  Throw moved into separate module. */
 
-L9170:	return(throw());
+L9170:	return(throw(input));
 
-/*  Quit.  Intransitive only.  verify intent and exit if that's what he wants. */
+/*  Quit.  Intransitive only.  Verify intent and exit if that's what he wants. */
 
-L8180:	if(YES(22,54,54)) score(1);
+L8180:	if(YES(input,22,54,54)) score(1);
 	 return(2012);
 
 /*  Find.  Might be carrying it, or it might be here.  Else give caveat. */
@@ -435,8 +435,8 @@ L8260:	SPK=156;
 
 /*  Read.  Print stuff based on objtxt.  Oyster (?) is special case. */
 
-L8270:	/* 8275 */ for (I=1; I<=100; I++) {
-L8275:	if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I;
+L8270:	for (I=1; I<=100; I++) {
+	if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I;
 	} /* end loop */
 	if(OBJ > 100 || OBJ == 0 || DARK(0)) return(8000);
 
@@ -446,7 +446,7 @@ L9270:	if(DARK(0)) goto L5190;
 	PSPEAK(OBJ,OBJTXT[OBJ]+PROP[OBJ]);
 	 return(2012);
 
-L9275:	CLSHNT=YES(192,193,54);
+L9275:	CLSHNT=YES(input,192,193,54);
 	 return(2012);
 
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
@@ -475,11 +475,11 @@ L9290:	if(OBJ != DWARF || !CLOSED) return(2011);
 
 L8300:	SPK=201;
 	RSPEAK(260);
-	if(!YES(200,54,54)) return(2012);
+	if(!YES(input,200,54,54)) return(2012);
 	SAVED=SAVED+5;
 	KK= -1;
 
-/*  This next part is shared with the "resume" code.  the two cases are
+/*  This next part is shared with the "resume" code.  The two cases are
  *  distinguished by the value of kk (-1 for suspend, +1 for resume). */
 
 L8305:	DATIME(I,K);
@@ -491,8 +491,8 @@ L8305:	DATIME(I,K);
 /*  Herewith are all the variables whose values can change during a game,
  *  omitting a few (such as I, J, ATTACK) whose values between turns are
  *  irrelevant and some whose values when a game is
- *  suspended or resumed are guaranteed to match.  if unsure whether a value
- *  needs to be saved, include it.  overkill can't hurt.  pad the last savwds
+ *  suspended or resumed are guaranteed to match.  If unsure whether a value
+ *  needs to be saved, include it.  Overkill can't hurt.  Pad the last savwds
  *  with junk variables to bring it up to 7 values. */
 	SAVWDS(ABBNUM,BLKLIN,BONUS,CLOCK1,CLOCK2,CLOSED,CLOSNG);
 	SAVWDS(DETAIL,DFLAG,DKILL,DTOTAL,FOOBAR,HOLDNG,IWEST);
@@ -525,7 +525,7 @@ L8305:	DATIME(I,K);
 L8310:	KK=1;
 	if(LOC == 1 && ABB[1] == 1) goto L8305;
 	RSPEAK(268);
-	if(!YES(200,54,54)) return(2012);
+	if(!YES(input,200,54,54)) return(2012);
 	 goto L8305;
 
 L8312:	SETPRM(1,K/10,MOD(K,10));