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 */
{
void terminate(enum termination mode)
/* End of game. Let's tell him all about it. */
{
- long points = score(mode);
+ int points = score(mode);
+#if defined ADVENT_AUTOSAVE
+ autosave();
+#endif
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);
}