projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate globals.
[open-adventure.git]
/
score.c
diff --git
a/score.c
b/score.c
index c8428d78ba5c5044be0dd10ed22f3940d5a438bb..d0915b28887aedf3e832785daf86b7513fdb68bf 100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-7,7
+7,8
@@
*/
void score(long MODE) {
*/
void score(long MODE) {
- /* <0 if scoring, >0 if quitting, =0 if died or won */
+/* arg is <0 if scoring, >0 if quitting, =0 if died or won */
+ long MXSCOR = 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:
@@
-39,8
+40,8
@@
void score(long MODE) {
K=12;
if(I == CHEST)K=14;
if(I > CHEST)K=16;
K=12;
if(I == CHEST)K=14;
if(I > CHEST)K=16;
- if(
PROP
[I] >= 0)SCORE=SCORE+2;
- if(
PLACE[I] == 3 && PROP
[I] == 0)SCORE=SCORE+K-2;
+ if(
game.prop
[I] >= 0)SCORE=SCORE+2;
+ if(
game.place[I] == 3 && game.prop
[I] == 0)SCORE=SCORE+K-2;
MXSCOR=MXSCOR+K;
L20010: /*etc*/ ;
} /* end loop */
MXSCOR=MXSCOR+K;
L20010: /*etc*/ ;
} /* end loop */
@@
-69,7
+70,7
@@
L20020: MXSCOR=MXSCOR+45;
/* Did he come to Witt's End as he should? */
/* Did he come to Witt's End as he should? */
- if(
PLACE
[MAGZIN] == 108)SCORE=SCORE+1;
+ if(
game.place
[MAGZIN] == 108)SCORE=SCORE+1;
MXSCOR=MXSCOR+1;
/* Round it off. */
MXSCOR=MXSCOR+1;
/* Round it off. */
@@
-80,7
+81,7
@@
L20020: MXSCOR=MXSCOR+45;
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
for (I=1; I<=HNTMAX; I++) {
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
for (I=1; I<=HNTMAX; I++) {
- if(
HINTED
[I])SCORE=SCORE-HINTS[I][2];
+ if(
game.hinted
[I])SCORE=SCORE-HINTS[I][2];
} /* end loop */
if(game.novice)SCORE=SCORE-5;
if(game.clshnt)SCORE=SCORE-10;
} /* end loop */
if(game.novice)SCORE=SCORE-5;
if(game.clshnt)SCORE=SCORE-10;
@@
-88,7
+89,12
@@
L20020: MXSCOR=MXSCOR+45;
/* Return to score command if that's where we came from. */
/* Return to score command if that's where we came from. */
- if(MODE < 0) return;
+ if(MODE < 0) {
+ SETPRM(1,SCORE,MXSCOR);
+ SETPRM(3,game.turns,game.turns);
+ RSPEAK(259);
+ return;
+ }
/* that should be good enough. Let's tell him all about it. */
/* that should be good enough. Let's tell him all about it. */