Move from random message numbers to ARB_* symbols generate from YAML.

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index 3c94f83827e3c76974ca83e66f1936653498cf5e..bf47792a5125ab833fdd9deb6c2cf42c00598e9f 100644 (file)
--- a/score.c
+++ b/score.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "advent.h"
 #include "database.h"
+#include "newdb.h"
 
 /*
  * scoring and wrap-up
@@ -33,15 +34,15 @@ void score(long mode)
     /*  First tally up the treasures.  Must be in building and not broken.
      *  Give the poor guy 2 points just for finding each treasure. */
     for (i=MINTRS; i<=MAXTRS; i++) {
-       if(PTEXT[i] != 0) {
+       if(object_descriptions[i].inventory != 0) {
            k=12;
            if(i == CHEST)k=14;
            if(i > CHEST)k=16;
            if(game.prop[i] >= 0)
-               score=score+2;
+               score += 2;
            if(game.place[i] == 3 && game.prop[i] == 0)
-               score=score+k-2;
-           mxscor=mxscor+k;
+               score += k-2;
+           mxscor += k;
        }
     }
 
@@ -51,34 +52,34 @@ void score(long mode)
      *  indicates whether he reached the endgame.  And if he got as far as
      *  "cave closed" (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;
-    mxscor=mxscor+MAXDIE*10;
-    if(mode == 0)score=score+4;
-    mxscor=mxscor+4;
-    if(game.dflag != 0)score=score+25;
-    mxscor=mxscor+25;
-    if(game.closng)score=score+25;
-    mxscor=mxscor+25;
+    score += (MAXDIE-game.numdie)*10;
+    mxscor += MAXDIE*10;
+    if(mode == 0)score += 4;
+    mxscor += 4;
+    if(game.dflag != 0)score += 25;
+    mxscor += 25;
+    if(game.closng)score += 25;
+    mxscor += 25;
     if(game.closed) {
        if(game.bonus == 0)
-           score=score+10;
+           score += 10;
        if(game.bonus == 135)
-           score=score+25;
+           score += 25;
        if(game.bonus == 134)
-           score=score+30;
+           score += 30;
        if(game.bonus == 133)
-           score=score+45;
+           score += 45;
     }
-    mxscor=mxscor+45;
+    mxscor += 45;
 
     /* Did he come to Witt's End as he should? */
     if(game.place[MAGZIN] == 108)
-       score=score+1;
-    mxscor=mxscor+1;
+       score += 1;
+    mxscor += 1;
 
     /* Round it off. */
-    score=score+2;
-    mxscor=mxscor+2;
+    score += 2;
+    mxscor += 2;
 
     /* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
     for (i=1; i<=HNTMAX; i++) {
@@ -86,38 +87,38 @@ void score(long mode)
            score=score-HINTS[i][2];
     }
     if(game.novice)
-       score=score-5;
+       score -= 5;
     if(game.clshnt)
-       score=score-10;
+       score -= 10;
     score=score-game.trnluz-game.saved;
 
     /* Return to score command if that's where we came from. */
     if(mode < 0) {
        SETPRM(1,score,mxscor);
        SETPRM(3,game.turns,game.turns);
-       RSPEAK(259);
+       RSPEAK(ARB_259);
        return;
     }
 
     /* that should be good enough.  Let's tell him all about it. */
     if(score+game.trnluz+1 >= mxscor && game.trnluz != 0)
-       RSPEAK(242);
+       RSPEAK(ARB_242);
     if(score+game.saved+1 >= mxscor && game.saved != 0)
-       RSPEAK(143);
+       RSPEAK(ARB_143);
     SETPRM(1,score,mxscor);
     SETPRM(3,game.turns,game.turns);
-    RSPEAK(262);
+    RSPEAK(ARB_262);
     for (i=1; i<=CLSSES; i++) {
        if(CVAL[i] >= score) {
-           SPEAK(CTEXT[i]);
+           newspeak(class_messages[i]);
            i=CVAL[i]+1-score;
            SETPRM(1,i,i);
-           RSPEAK(263);
+           RSPEAK(ARB_263);
            exit(0);
        }
     }
-    RSPEAK(265);
-    RSPEAK(264);
+    RSPEAK(ARB_265);
+    RSPEAK(ARB_264);
     exit(0);
 
 }