Reapply "Clean up logic for exiting input loop and scoring."

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 71d61c9f08d72e088f270c0c7124250e2e57e94d..6cfc411fdd79651cc1aa3d49b0d8de4163f89fc7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -42,6 +42,7 @@ long ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BO
                WZDARK = false, ZZWORD;
 FILE  *logfp;
 bool oldstyle = false;
+lcg_state lcgstate;
 
 extern void initialise();
 extern void score(long);
@@ -51,7 +52,7 @@ extern int action(FILE *, long);
  * MAIN PROGRAM
  */
 
-static void do_command(FILE *);
+static bool do_command(FILE *);
 
 int main(int argc, char *argv[]) {
        int ch;
@@ -69,7 +70,7 @@ int main(int argc, char *argv[]) {
        while ((ch = getopt(argc, argv, "l:o")) != EOF) {
                switch (ch) {
                case 'l':
-                       logfp = fopen(optarg, "w+");
+                       logfp = fopen(optarg, "w");
                        if (logfp == NULL)
                                fprintf(stderr,
                                        "advent: can't open logfile %s for write\n",
@@ -93,6 +94,13 @@ int main(int argc, char *argv[]) {
 
 #include "funcs.h"
 
+/* Initialize our LCG PRNG with parameters tested against Knuth vol. 2. by the original authors */
+
+       lcgstate.a = 1093;
+       lcgstate.c = 221587;
+       lcgstate.m = 1048576;
+       set_seed_from_time();
+
 /*  Read the database if we have not yet done so */
 
        LINES = (long *)calloc(LINSIZ+1,sizeof(long));
@@ -116,7 +124,7 @@ int main(int argc, char *argv[]) {
 /*  Start-up, dwarf stuff */
 
 L1:    SETUP= -1;
-       I=RAN(-1);
+       I=0;
        ZZWORD=RNDVOC(3,0)+MESH*2;
        NOVICE=YES(stdin, 65,1,0);
        NEWLOC=1;
@@ -125,15 +133,17 @@ L1:       SETUP= -1;
        if(NOVICE)LIMIT=1000;
 
        for (;;) {
-           do_command(stdin);
+           if (!do_command(stdin))
+               break;
        }
+       score(1);
 }
 
-static void do_command(FILE *cmdin) {
+static bool do_command(FILE *cmdin) {
 
 /*  Can't leave cave once it's closing (except by main office). */
 
-L2:    if(!OUTSID(NEWLOC) || NEWLOC == 0 || !CLOSNG) goto L71;
+       if(!OUTSID(NEWLOC) || NEWLOC == 0 || !CLOSNG) goto L71;
        RSPEAK(130);
        NEWLOC=LOC;
        if(!PANIC)CLOCK2=15;
@@ -175,7 +185,7 @@ L6000:      if(DFLAG != 1) goto L6010;
        if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
        DFLAG=2;
        for (I=1; I<=2; I++) {
-       J=1+RAN(5);
+       J=1+randrange(5);
        if(PCT(50))DLOC[J]=0;
        } /* end loop */
        for (I=1; I<=5; I++) {
@@ -213,7 +223,7 @@ L6014:      KK=KK+1;
        {long x = KK-1; if(TRAVEL[x] >= 0) goto L6012;}
 L6016: TK[J]=ODLOC[I];
        if(J >= 2)J=J-1;
-       J=1+RAN(J);
+       J=1+randrange(J);
        ODLOC[I]=DLOC[I];
        DLOC[I]=TK[J];
        DSEEN[I]=(DSEEN[I] && INDEEP(LOC)) || (DLOC[I] == LOC || ODLOC[I] == LOC);
@@ -266,7 +276,7 @@ L6027:      DTOTAL=DTOTAL+1;
        if(ODLOC[I] != DLOC[I]) goto L6030;
        ATTACK=ATTACK+1;
        if(KNFLOC >= 0)KNFLOC=LOC;
-       if(RAN(1000) < 95*(DFLAG-2))STICK=STICK+1;
+       if(randrange(1000) < 95*(DFLAG-2))STICK=STICK+1;
 L6030: /*etc*/ ;
        } /* end loop */
 
@@ -380,8 +390,9 @@ L2603:      if(!CLOSED) goto L2605;
        } /* end loop */
 L2605: WZDARK=DARK(0);
        if(KNFLOC > 0 && KNFLOC != LOC)KNFLOC=0;
-       I=RAN(1);
-       GETIN(cmdin, WD1,WD1X,WD2,WD2X);
+       I=0;
+       if (!GETIN(cmdin, WD1,WD1X,WD2,WD2X))
+           return false;
 
 /*  Every input, check "FOOBAR" flag.  If zero, nothing's going on.  If pos,
  *  make neg.  If neg, he skipped a word, so make it zero. */
@@ -450,7 +461,7 @@ L4090:      I=4090; goto Laction;
 L5000: I=5000;
 Laction:
         switch (action(cmdin, I)) {
-          case 2: return;
+          case 2: return true;
           case 8: goto L8;
           case 2000: goto L2000;
           case 2009: goto L2009;
@@ -486,7 +497,7 @@ L8000:      SETPRM(1,WD1,WD1X);
 L8:    KK=KEY[LOC];
        NEWLOC=LOC;
        if(KK == 0)BUG(26);
-       if(K == NUL) return;
+       if(K == NUL) return true;
        if(K == BACK) goto L20;
        if(K == LOOK) goto L30;
        if(K == CAVE) goto L40;
@@ -517,11 +528,11 @@ L13:      if(NEWLOC <= 100) goto L14;
 
 L14:   if(NEWLOC != 0 && !PCT(NEWLOC)) goto L12;
 L16:   NEWLOC=MOD(LL,1000);
-       if(NEWLOC <= 300) return;
+       if(NEWLOC <= 300) return true;
        if(NEWLOC <= 500) goto L30000;
        RSPEAK(NEWLOC-500);
        NEWLOC=LOC;
-        return;
+        return true;
 
 /*  Special motions come here.  Labelling convention: statement numbers NNNXX
  *  (XX=00-99) are used for special case number NNN (NNN=301-500). */
@@ -536,10 +547,10 @@ L30000: NEWLOC=NEWLOC-300;
  *  be used for actual motion, but can be spotted by "go back". */
 
 L30100: NEWLOC=99+100-LOC;
-       if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return;
+       if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true;
        NEWLOC=LOC;
        RSPEAK(117);
-        return;
+       return true;
 
 /*  Travel 302.  Plover transport.  Drop the emerald (only use special travel if
  *  toting it), so he's forced to use the plover-passage to get it out.  Having
@@ -563,11 +574,11 @@ L30300: if(PROP[TROLL] != 1) goto L30310;
        MOVE(TROLL+100,FIXD[TROLL]);
        JUGGLE(CHASM);
        NEWLOC=LOC;
-        return;
+       return true;
 
 L30310: NEWLOC=PLAC[TROLL]+FIXD[TROLL]-LOC;
        if(PROP[TROLL] == 0)PROP[TROLL]=1;
-       if(!TOTING(BEAR)) return;
+       if(!TOTING(BEAR)) return true;
        RSPEAK(162);
        PROP[CHASM]=1;
        PROP[TROLL]=2;
@@ -591,7 +602,7 @@ L20:        K=OLDLOC;
        if(CNDBIT(LOC,4))K2=274;
        if(K2 == 0) goto L21;
        RSPEAK(K2);
-        return;
+       return true;
 
 L21:   LL=MOD((IABS(TRAVEL[KK])/1000),1000);
        if(LL == K) goto L25;
@@ -605,7 +616,7 @@ L22:        if(TRAVEL[KK] < 0) goto L23;
 L23:   KK=K2;
        if(KK != 0) goto L25;
        RSPEAK(140);
-        return;
+       return true;
 
 L25:   K=MOD(IABS(TRAVEL[KK]),1000);
        KK=KEY[LOC];
@@ -618,14 +629,14 @@ L30:      if(DETAIL < 3)RSPEAK(15);
        DETAIL=DETAIL+1;
        WZDARK=false;
        ABB[LOC]=0;
-        return;
+       return true;
 
 /*  Cave.  Different messages depending on whether above ground. */
 
 L40:   K=58;
        if(OUTSID(LOC) && LOC != 8)K=57;
        RSPEAK(K);
-        return;
+       return true;
 
 /*  Non-applicable motion.  Various messages depending on word given. */
 
@@ -638,11 +649,7 @@ L50:       SPK=12;
        if(K == 62 || K == 65)SPK=42;
        if(K == 17)SPK=80;
        RSPEAK(SPK);
-        return;
-
-
-
-
+       return true;
 
 /*  "You're dead, Jim."
  *
@@ -856,7 +863,7 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1);
 
        RSPEAK(132);
        CLOSED=true;
-        return;
+       return true;
 
 /*  Another way we can force an end to things is by having the lamp give out.
  *  When it gets close, we come here to warn him.  We go to 12000 if the lamp