projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More tests, multilined yaml
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index 4e72950a56103df545578de140e63033de6c2b5b..e858681c40b535cbb82becdeb08c1e9d03741550 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-1,7
+1,6
@@
#include <stdlib.h>
#include "advent.h"
#include <stdlib.h>
#include "advent.h"
-#include "database.h"
-#include "newdb.h"
+#include "dungeon.h"
/*
* scoring and wrap-up
/*
* scoring and wrap-up
@@
-38,15
+37,17
@@
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++) {
* 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 (objects[i].inventory != 0) {
long k = 12;
- if (i == CHEST)k = 14;
- if (i > CHEST)k = 16;
- if (game.prop[i] >= 0)
+ if (i == CHEST)
+ k = 14;
+ if (i > CHEST)
+ k = 16;
+ if (game.prop[i] > STATE_NOTFOUND)
score += 2;
score += 2;
- if (game.place[i] == LOC_BUILDING && game.prop[i] ==
0
)
+ if (game.place[i] == LOC_BUILDING && game.prop[i] ==
STATE_GROUND
)
score += k - 2;
mxscor += k;
}
score += k - 2;
mxscor += k;
}
@@
-63,9
+64,11
@@
long score(enum termination mode)
if (mode == endgame)
score += 4;
mxscor += 4;
if (mode == endgame)
score += 4;
mxscor += 4;
- if (game.dflag != 0)score += 25;
+ if (game.dflag != 0)
+ score += 25;
mxscor += 25;
mxscor += 25;
- if (game.closng)score += 25;
+ if (game.closng)
+ score += 25;
mxscor += 25;
if (game.closed) {
if (game.bonus == 0)
mxscor += 25;
if (game.closed) {
if (game.bonus == 0)
@@
-122,12
+125,12
@@
void terminate(enum termination mode)
speak(classes[i].message);
i = classes[i].threshold + 1 - points;
rspeak(NEXT_HIGHER, i, i);
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);
}
}
rspeak(OFF_SCALE);
rspeak(NO_HIGHER);
- exit(
0
);
+ exit(
EXIT_SUCCESS
);
}
/* end */
}
/* end */