X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=score.c;h=7e6b28c26ae9ee02a96f3d596983f39a6abae393;hb=94e7cc65050ddfd04a8a1606f8899c7e5be496e8;hp=368b1df439dfcc6f4e9eca5585d7443f8f9c0b3a;hpb=782c5c3f290555fa9368208efdb3b428f45468eb;p=open-adventure.git

diff --git a/score.c b/score.c
index 368b1df..7e6b28c 100644
--- a/score.c
+++ b/score.c
@@ -11,7 +11,7 @@
 
 static int mxscor;	/* ugh..the price for having score() not exit. */
 
-long score(enum termination mode)
+int score(enum termination mode)
 /* mode is 'scoregame' if scoring, 'quitgame' if quitting, 'endgame' if died
  * or won */
 {
@@ -116,23 +116,26 @@ long score(enum termination mode)
 void terminate(enum termination mode)
 /* End of game.  Let's tell him all about it. */
 {
-    long points = score(mode);
+    int points = score(mode);
 
     if (points + game.trnluz + 1 >= mxscor && game.trnluz != 0)
         rspeak(TOOK_LONG);
     if (points + game.saved + 1 >= mxscor && game.saved != 0)
         rspeak(WITHOUT_SUSPENDS);
     rspeak(TOTAL_SCORE, points, mxscor, game.turns, game.turns);
-    for (int i = 1; i <= (long)NCLASSES; i++) {
+    for (int i = 1; i <= (int)NCLASSES; i++) {
         if (classes[i].threshold >= points) {
             speak(classes[i].message);
-            i = classes[i].threshold + 1 - points;
-            rspeak(NEXT_HIGHER, i, i);
+	    if (i < (int)NCLASSES) {
+		int nxt = classes[i].threshold + 1 - points;
+		rspeak(NEXT_HIGHER, nxt, nxt);
+	    } else {
+		rspeak(NO_HIGHER);
+	    }
             exit(EXIT_SUCCESS);
         }
     }
     rspeak(OFF_SCALE);
-    rspeak(NO_HIGHER);
     exit(EXIT_SUCCESS);
 }