projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to 0-indexing for hint handling code.
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index 8f91e44716ad0b6b95efeb6681fa0648d7399631..cd4b9e6d2ff779ce65ca37decc1667165adc9723 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-87,9
+87,9
@@
long score(enum termination mode)
mxscor += 2;
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
mxscor += 2;
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
- for (long i =
1; i <= HNTMAX
; i++) {
+ for (long i =
0; i < HINT_COUNT
; i++) {
if (game.hinted[i])
if (game.hinted[i])
- score = score - hints[i
-1
].penalty;
+ score = score - hints[i].penalty;
}
if (game.novice)
score -= 5;
}
if (game.novice)
score -= 5;
@@
-99,9
+99,7
@@
long score(enum termination mode)
/* Return to score command if that's where we came from. */
if (mode == scoregame) {
/* Return to score command if that's where we came from. */
if (mode == scoregame) {
- SETPRM(1, score, mxscor);
- SETPRM(3, game.turns, game.turns);
- RSPEAK(GARNERED_POINTS);
+ rspeak(GARNERED_POINTS, score, mxscor, game.turns, game.turns);
}
return score;
}
return score;
@@
-113,23
+111,20
@@
void terminate(enum termination mode)
long points = score(mode);
if (points + game.trnluz + 1 >= mxscor && game.trnluz != 0)
long points = score(mode);
if (points + game.trnluz + 1 >= mxscor && game.trnluz != 0)
-
RSPEAK
(TOOK_LONG);
+
rspeak
(TOOK_LONG);
if (points + game.saved + 1 >= mxscor && game.saved != 0)
if (points + game.saved + 1 >= mxscor && game.saved != 0)
- RSPEAK(WITHOUT_SUSPENDS);
- SETPRM(1, points, mxscor);
- SETPRM(3, game.turns, game.turns);
- RSPEAK(TOTAL_SCORE);
+ rspeak(WITHOUT_SUSPENDS);
+ rspeak(TOTAL_SCORE, points, mxscor, game.turns, game.turns);
for (long i = 1; i <= (long)CLSSES; i++) {
if (classes[i].threshold >= points) {
speak(classes[i].message);
i = classes[i].threshold + 1 - points;
for (long i = 1; i <= (long)CLSSES; i++) {
if (classes[i].threshold >= points) {
speak(classes[i].message);
i = classes[i].threshold + 1 - points;
- SETPRM(1, i, i);
- RSPEAK(NEXT_HIGHER);
+ rspeak(NEXT_HIGHER, i, i);
exit(0);
}
}
exit(0);
}
}
-
RSPEAK
(OFF_SCALE);
-
RSPEAK
(NO_HIGHER);
+
rspeak
(OFF_SCALE);
+
rspeak
(NO_HIGHER);
exit(0);
}
exit(0);
}