X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=score.c;h=718314b0a32b2a7fb200b3d64ad0531503bf4c77;hp=4e72950a56103df545578de140e63033de6c2b5b;hb=aa1dd666a9e5a972cb8e29c70cebb9c35a785ddf;hpb=2fac8d1aefb3526618ba0f1e7d25c7c7c81dddf4 diff --git a/score.c b/score.c index 4e72950..718314b 100644 --- a/score.c +++ b/score.c @@ -1,7 +1,6 @@ #include #include "advent.h" -#include "database.h" -#include "newdb.h" +#include "dungeon.h" /* * scoring and wrap-up @@ -38,12 +37,14 @@ long score(enum termination mode) * Give the poor guy 2 points just for finding each treasure. */ mxscor = 0; for (int i = 1; i <= NOBJECTS; i++) { - if (!objects[i].is_treasure) - continue; + 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) @@ -63,9 +64,11 @@ long score(enum termination mode) 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)