projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve test coverage.
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index 734ea196ebad7fae0fc8a9af59dc890895ae07f1..7b0269d8a1c87806cdcb5763945b9d04ff5c8120 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-8,7
+8,8
@@
*/
void score(enum termination mode)
*/
void score(enum termination mode)
-/* mode is 'report' if scoring, 'quit' if quitting, 'end' if died or won */
+/* mode is 'scoregame' if scoring, 'quitgame' if quitting, 'endgame' if died
+ * or won */
{
long score = 0, mxscor = 0;
{
long score = 0, mxscor = 0;
@@
-40,7
+41,7
@@
void score(enum termination mode)
if(i > CHEST)k=16;
if(game.prop[i] >= 0)
score += 2;
if(i > CHEST)k=16;
if(game.prop[i] >= 0)
score += 2;
- if(game.place[i] ==
3
&& game.prop[i] == 0)
+ if(game.place[i] ==
LOC_BUILDING
&& game.prop[i] == 0)
score += k-2;
mxscor += k;
}
score += k-2;
mxscor += k;
}
@@
-64,17
+65,17
@@
void score(enum termination mode)
if(game.closed) {
if(game.bonus == 0)
score += 10;
if(game.closed) {
if(game.bonus == 0)
score += 10;
- if(game.bonus ==
135
)
+ if(game.bonus ==
SPLATTER_MESSAGE
)
score += 25;
score += 25;
- if(game.bonus ==
134
)
+ if(game.bonus ==
DEFEAT_MESSAGE
)
score += 30;
score += 30;
- if(game.bonus ==
133
)
+ if(game.bonus ==
VICTORY_MESSAGE
)
score += 45;
}
mxscor += 45;
/* Did he come to Witt's End as he should? */
score += 45;
}
mxscor += 45;
/* Did he come to Witt's End as he should? */
- if(game.place[MAGZIN] ==
108
)
+ if(game.place[MAGZIN] ==
LOC_WITTSEND
)
score += 1;
mxscor += 1;
score += 1;
mxscor += 1;
@@
-109,7
+110,7
@@
void score(enum termination mode)
SETPRM(1,score,mxscor);
SETPRM(3,game.turns,game.turns);
RSPEAK(TOTAL_SCORE);
SETPRM(1,score,mxscor);
SETPRM(3,game.turns,game.turns);
RSPEAK(TOTAL_SCORE);
- for (long i=1; i<=CLSSES; i++) {
+ for (long i=1; i<=
(long)
CLSSES; i++) {
if(CVAL[i] >= score) {
newspeak(class_messages[i]);
i=CVAL[i]+1-score;
if(CVAL[i] >= score) {
newspeak(class_messages[i]);
i=CVAL[i]+1-score;