Move more globals into the game state block.

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index 1b3736efc52eac3773db1c8d1c95b0207e9be734..bee722d504f4e3052c72c2825e233da35b639eb1 100644 (file)
--- a/score.c
+++ b/score.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
+#include "database.h"
 
 /*
  * scoring and wrap-up
@@ -46,14 +45,14 @@ void score(long MODE) {
 L20010: /*etc*/ ;
        } /* end loop */
 
-/*  Now look at how he finished and how far he got.  MAXDIE and game.numdie tell us
+/*  Now look at how he finished and how far he got.  MAXDIE and NUMDIE tell us
  *  how well he survived.  game.dflag will
  *  tell us if he ever got suitably deep into the cave.  game.closng still indicates
  *  whether he reached the endgame.  And if he got as far as "cave closed"
- *  (indicated by "game.closed"), then game.bonus is zero for mundane exits or 133, 134,
+ *  (indicated by "game.closed"), then bonus is zero for mundane exits or 133, 134,
  *  135 if he blew it (so to speak). */
 
-       SCORE=SCORE+(MAXDIE-game.numdie)*10;
+       SCORE=SCORE+(MAXDIE-NUMDIE)*10;
        MXSCOR=MXSCOR+MAXDIE*10;
        if(MODE == 0)SCORE=SCORE+4;
        MXSCOR=MXSCOR+4;
@@ -83,9 +82,9 @@ L20020: MXSCOR=MXSCOR+45;
        for (I=1; I<=HNTMAX; I++) {
        if(HINTED[I])SCORE=SCORE-HINTS[I][2];
        } /* end loop */
-       if(game.novice)SCORE=SCORE-5;
+       if(NOVICE)SCORE=SCORE-5;
        if(CLSHNT)SCORE=SCORE-10;
-       SCORE=SCORE-game.trnluz-game.saved;
+       SCORE=SCORE-TRNLUZ-SAVED;
 
 /*  Return to score command if that's where we came from. */
 
@@ -93,25 +92,25 @@ L20020: MXSCOR=MXSCOR+45;
 
 /*  that should be good enough.  Let's tell him all about it. */
 
-       if(SCORE+game.trnluz+1 >= MXSCOR && game.trnluz != 0)RSPEAK(242);
-       if(SCORE+game.saved+1 >= MXSCOR && game.saved != 0)RSPEAK(143);
+       if(SCORE+TRNLUZ+1 >= MXSCOR && TRNLUZ != 0)RSPEAK(242);
+       if(SCORE+SAVED+1 >= MXSCOR && SAVED != 0)RSPEAK(143);
        SETPRM(1,SCORE,MXSCOR);
-       SETPRM(3,game.turns,game.turns);
+       SETPRM(3,TURNS,TURNS);
        RSPEAK(262);
        for (I=1; I<=CLSSES; I++) {
        if(CVAL[I] >= SCORE) goto L20210;
        /*etc*/ ;
        } /* end loop */
-       game.spk=265;
+       SPK=265;
         goto L25000;
 
 L20210: SPEAK(CTEXT[I]);
-       game.spk=264;
+       SPK=264;
        if(I >= CLSSES) goto L25000;
        I=CVAL[I]+1-SCORE;
        SETPRM(1,I,I);
-       game.spk=263;
-L25000: RSPEAK(game.spk);
+       SPK=263;
+L25000: RSPEAK(SPK);
        exit(0);
 
 }