X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=score.c;h=4ef68adda45949738704be1b78d8fdbb8b7e8d41;hp=3940dd1773aa12c35e258e38d96182c9c21c7935;hb=28583348450b28bd4811d37fa5fe50bcbcfcfb12;hpb=fa1f8591629eccdaf53da24c29fdf02acb84255f

diff --git a/score.c b/score.c
index 3940dd1..4ef68ad 100644
--- a/score.c
+++ b/score.c
@@ -2,6 +2,7 @@
 #include "misc.h"
 #include "main.h"
 #include "share.h"
+#include "database.h"
 
 /*
  * scoring and wrap-up
@@ -18,7 +19,7 @@ void score(long MODE) {
  *  Each treasure > chest    16                   224
  *  Surviving             (MAX-NUM)*10             30
  *  Not quitting              4                     4
- *  Reaching "game.closng"        25                    25
+ *  Reaching "CLOSNG"        25                    25
  *  "Closed": Quit/Killed    10
  *            Klutzed        25
  *            Wrong way      30
@@ -46,26 +47,26 @@ 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
- *  how well he survived.  game.dflag will
- *  tell us if he ever got suitably deep into the cave.  game.closng still indicates
+/*  Now look at how he finished and how far he got.  MAXDIE and NUMDIE tell us
+ *  how well he survived.  DFLAG will
+ *  tell us if he ever got suitably deep into the cave.  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 "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;
-	if(game.dflag != 0)SCORE=SCORE+25;
+	if(DFLAG != 0)SCORE=SCORE+25;
 	MXSCOR=MXSCOR+25;
-	if(game.closng)SCORE=SCORE+25;
+	if(CLOSNG)SCORE=SCORE+25;
 	MXSCOR=MXSCOR+25;
-	if(!game.closed) goto L20020;
-	if(game.bonus == 0)SCORE=SCORE+10;
-	if(game.bonus == 135)SCORE=SCORE+25;
-	if(game.bonus == 134)SCORE=SCORE+30;
-	if(game.bonus == 133)SCORE=SCORE+45;
+	if(!CLOSED) goto L20020;
+	if(BONUS == 0)SCORE=SCORE+10;
+	if(BONUS == 135)SCORE=SCORE+25;
+	if(BONUS == 134)SCORE=SCORE+30;
+	if(BONUS == 133)SCORE=SCORE+45;
 L20020: MXSCOR=MXSCOR+45;
 
 /*  Did he come to Witt's End as he should? */
@@ -83,9 +84,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-TRNLUZ-game.saved;
+	SCORE=SCORE-TRNLUZ-SAVED;
 
 /*  Return to score command if that's where we came from. */
 
@@ -94,7 +95,7 @@ L20020: MXSCOR=MXSCOR+45;
 /*  that should be good enough.  Let's tell him all about it. */
 
 	if(SCORE+TRNLUZ+1 >= MXSCOR && TRNLUZ != 0)RSPEAK(242);
-	if(SCORE+game.saved+1 >= MXSCOR && game.saved != 0)RSPEAK(143);
+	if(SCORE+SAVED+1 >= MXSCOR && SAVED != 0)RSPEAK(143);
 	SETPRM(1,SCORE,MXSCOR);
 	SETPRM(3,TURNS,TURNS);
 	RSPEAK(262);