/*
* Scoring and wrap-up.
*
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * 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"
k = 14;
if (i > CHEST)
k = 16;
- if (game.prop[i] > STATE_NOTFOUND)
+ if (!PROP_IS_STASHED(i) && !PROP_IS_NOTFOUND(i))
score += 2;
- if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_FOUND)
+ if (game.objects[i].place == LOC_BUILDING && PROP_IS_FOUND(i))
score += k - 2;
mxscor += k;
}
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;
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
for (int i = 0; i < NHINTS; i++) {
- if (game.hinted[i])
+ if (game.hints[i].used)
score = score - hints[i].penalty;
}
if (game.novice)
/* End of game. Let's tell him all about it. */
{
int points = score(mode);
+#if defined ADVENT_AUTOSAVE
+ autosave();
+#endif
if (points + game.trnluz + 1 >= mxscor && game.trnluz != 0)
rspeak(TOOK_LONG);
for (int i = 1; i <= (int)NCLASSES; i++) {
if (classes[i].threshold >= points) {
speak(classes[i].message);
- int nxt = classes[i].threshold + 1 - points;
- rspeak(NEXT_HIGHER, nxt, nxt);
+ 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);
}