+/*
+ * Scoring and wrap-up.
+ *
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
#include <stdlib.h>
#include "advent.h"
#include "dungeon.h"
-/*
- * scoring and wrap-up
- */
-
-static long mxscor; /* ugh..the price for having score() not exit. */
+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 */
{
- long score = 0;
+ int score = 0;
/* The present scoring algorithm is as follows:
* Objective: Points: Present total possible:
if (!objects[i].is_treasure)
continue;
if (objects[i].inventory != 0) {
- long k = 12;
+ int k = 12;
if (i == CHEST)
k = 14;
if (i > CHEST)
k = 16;
- if (game.prop[i] >= 0)
+ if (!PROP_IS_STASHED(i) && !PROP_IS_NOTFOUND(i))
score += 2;
- if (game.place[i] == LOC_BUILDING && game.prop[i] == 0)
+ if (game.objects[i].place == LOC_BUILDING && PROP_IS_FOUND(i))
score += k - 2;
mxscor += k;
}
score += 25;
mxscor += 25;
if (game.closed) {
- if (game.bonus == 0)
+ if (game.bonus == none)
score += 10;
- if (game.bonus == SPLATTER_MESSAGE)
+ if (game.bonus == splatter)
score += 25;
- if (game.bonus == DEFEAT_MESSAGE)
+ if (game.bonus == defeat)
score += 30;
- if (game.bonus == VICTORY_MESSAGE)
+ if (game.bonus == victory)
score += 45;
}
mxscor += 45;
/* Did he come to Witt's End as he should? */
- if (game.place[MAGAZINE] == LOC_WITTSEND)
+ if (game.objects[MAGAZINE].place == LOC_WITTSEND)
score += 1;
mxscor += 1;
mxscor += 2;
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
- for (long i = 0; i < NHINTS; i++) {
- if (game.hinted[i])
+ for (int i = 0; i < NHINTS; i++) {
+ if (game.hints[i].used)
score = score - hints[i].penalty;
}
if (game.novice)
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 (long 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);
}