projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up copyright notices. SPDX wants only one per file.
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index 275a35815f075a60a5cab46b6f9d96bba76a5e3b..9d3d63f4129a9215c737210e9fdfeabb3428e450 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-1,9
+1,8
@@
/*
* Scoring and wrap-up.
*
/*
* 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: Copyright 977, 2005 by Will Crowther and Don Woods, Copyright, 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-Clause
*/
#include <stdlib.h>
#include "advent.h"
*/
#include <stdlib.h>
#include "advent.h"
@@
-48,9
+47,9
@@
int score(enum termination mode)
k = 14;
if (i > CHEST)
k = 16;
k = 14;
if (i > CHEST)
k = 16;
- if (
game.prop[i] > STATE_NOTFOUND
)
+ if (
!PROP_IS_STASHED(i) && !PROP_IS_NOTFOUND(i)
)
score += 2;
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;
}
score += k - 2;
mxscor += k;
}
@@
-86,7
+85,7
@@
int score(enum termination mode)
mxscor += 45;
/* Did he come to Witt's End as he should? */
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;
score += 1;
mxscor += 1;
@@
-96,7
+95,7
@@
int score(enum termination mode)
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
for (int i = 0; i < NHINTS; i++) {
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
for (int i = 0; i < NHINTS; i++) {
- if (game.hint
ed[i]
)
+ if (game.hint
s[i].used
)
score = score - hints[i].penalty;
}
if (game.novice)
score = score - hints[i].penalty;
}
if (game.novice)
@@
-117,6
+116,9
@@
void terminate(enum termination mode)
/* End of game. Let's tell him all about it. */
{
int points = score(mode);
/* 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);
if (points + game.trnluz + 1 >= mxscor && game.trnluz != 0)
rspeak(TOOK_LONG);
@@
-126,13
+128,16
@@
void terminate(enum termination mode)
for (int i = 1; i <= (int)NCLASSES; i++) {
if (classes[i].threshold >= points) {
speak(classes[i].message);
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);
exit(EXIT_SUCCESS);
}
}
rspeak(OFF_SCALE);
- rspeak(NO_HIGHER);
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}