projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abolish as many undifferentiated long variables as possible.
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index e858681c40b535cbb82becdeb08c1e9d03741550..ba7d98b7518ddbac1a4513f43726bfadf14f280f 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-6,13
+6,13
@@
* scoring and wrap-up
*/
* scoring and wrap-up
*/
-static
long mxscor;
/* ugh..the price for having score() not exit. */
+static
int mxscor;
/* ugh..the price for having score() not exit. */
long score(enum termination mode)
/* mode is 'scoregame' if scoring, 'quitgame' if quitting, 'endgame' if died
* or won */
{
long score(enum termination mode)
/* mode is 'scoregame' if scoring, 'quitgame' if quitting, 'endgame' if died
* or won */
{
-
long
score = 0;
+
int
score = 0;
/* The present scoring algorithm is as follows:
* Objective: Points: Present total possible:
/* The present scoring algorithm is as follows:
* Objective: Points: Present total possible:
@@
-40,14
+40,14
@@
long score(enum termination mode)
if (!objects[i].is_treasure)
continue;
if (objects[i].inventory != 0) {
if (!objects[i].is_treasure)
continue;
if (objects[i].inventory != 0) {
-
long
k = 12;
+
int
k = 12;
if (i == CHEST)
k = 14;
if (i > CHEST)
k = 16;
if (game.prop[i] > STATE_NOTFOUND)
score += 2;
if (i == CHEST)
k = 14;
if (i > CHEST)
k = 16;
if (game.prop[i] > STATE_NOTFOUND)
score += 2;
- if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_
GR
OUND)
+ if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_
F
OUND)
score += k - 2;
mxscor += k;
}
score += k - 2;
mxscor += k;
}
@@
-71,13
+71,13
@@
long score(enum termination mode)
score += 25;
mxscor += 25;
if (game.closed) {
score += 25;
mxscor += 25;
if (game.closed) {
- if (game.bonus ==
0
)
+ if (game.bonus ==
none
)
score += 10;
score += 10;
- if (game.bonus ==
SPLATTER_MESSAGE
)
+ if (game.bonus ==
splatter
)
score += 25;
score += 25;
- if (game.bonus ==
DEFEAT_MESSAGE
)
+ if (game.bonus ==
defeat
)
score += 30;
score += 30;
- if (game.bonus ==
VICTORY_MESSAGE
)
+ if (game.bonus ==
victory
)
score += 45;
}
mxscor += 45;
score += 45;
}
mxscor += 45;
@@
-92,7
+92,7
@@
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 = 0; i < NHINTS; i++) {
+ for (
int
i = 0; i < NHINTS; i++) {
if (game.hinted[i])
score = score - hints[i].penalty;
}
if (game.hinted[i])
score = score - hints[i].penalty;
}