Translate some loops out of FORTRAN.

[open-adventure.git] / actions2.c

diff --git a/actions2.c b/actions2.c
index dcc649da04b43856bcace8eab25df80c5168c3f0..ea236a37eb27e590eb326b64bbf88307e15b1700 100644 (file)
--- 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
@@ -148,12 +146,13 @@ int attack(FILE *input) {
 /*  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;
+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];
@@ -199,15 +198,15 @@ 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<=5; I++) {
+               if(DLOC[I] == LOC) {
+                       K=K+1;
+                       DLOC[I]=61;
+                       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,
@@ -233,7 +232,7 @@ int throw(FILE *cmdin) {
        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;