#include <stdlib.h>
#include "advent.h"
-#include "database.h"
-#include "newdb.h"
+#include "dungeon.h"
/*
* scoring and wrap-up
/* First tally up the treasures. Must be in building and not broken.
* Give the poor guy 2 points just for finding each treasure. */
mxscor = 0;
- for (long i = MINTRS; i <= MAXTRS; i++) {
- if (object_descriptions[i].inventory != 0) {
+ for (int i = 1; i <= NOBJECTS; i++) {
+ if (!objects[i].is_treasure)
+ continue;
+ if (objects[i].inventory != 0) {
long k = 12;
- if (i == CHEST)k = 14;
- if (i > CHEST)k = 16;
+ if (i == CHEST)
+ k = 14;
+ if (i > CHEST)
+ k = 16;
if (game.prop[i] >= 0)
score += 2;
if (game.place[i] == LOC_BUILDING && game.prop[i] == 0)
if (mode == endgame)
score += 4;
mxscor += 4;
- if (game.dflag != 0)score += 25;
+ if (game.dflag != 0)
+ score += 25;
mxscor += 25;
- if (game.closng)score += 25;
+ if (game.closng)
+ score += 25;
mxscor += 25;
if (game.closed) {
if (game.bonus == 0)
speak(classes[i].message);
i = classes[i].threshold + 1 - points;
rspeak(NEXT_HIGHER, i, i);
- exit(0);
+ exit(EXIT_SUCCESS);
}
}
rspeak(OFF_SCALE);
rspeak(NO_HIGHER);
- exit(0);
+ exit(EXIT_SUCCESS);
}
/* end */