projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test consolidation into bigfail.log.
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index 1e4e5c2d4e81acdb9e9a98d3ee15aa7b52db2895..8bd3cce1793af69a20c7b186a99ba58f7c27de1b 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-41,11
+41,13
@@
long score(enum termination mode)
continue;
if (objects[i].inventory != 0) {
long k = 12;
continue;
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_FOUND
)
score += k - 2;
mxscor += k;
}
score += k - 2;
mxscor += k;
}
@@
-62,18
+64,20
@@
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) {
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;
@@
-121,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 */