X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=score.c;h=c0f28faa2c8d1f075f2a3250daabf61f18a719bf;hp=7b0269d8a1c87806cdcb5763945b9d04ff5c8120;hb=b3057f038bc990e216c1763f7de1f485892296d2;hpb=a37e578f6381e4271459d3acd07b3c5870142d74 diff --git a/score.c b/score.c index 7b0269d..c0f28fa 100644 --- a/score.c +++ b/score.c @@ -34,17 +34,17 @@ void score(enum termination mode) /* First tally up the treasures. Must be in building and not broken. * Give the poor guy 2 points just for finding each treasure. */ - for (long i=MINTRS; i<=MAXTRS; i++) { - if(object_descriptions[i].inventory != 0) { - long k=12; - if(i == CHEST)k=14; - if(i > CHEST)k=16; - if(game.prop[i] >= 0) - score += 2; - if(game.place[i] == LOC_BUILDING && game.prop[i] == 0) - score += k-2; - mxscor += k; - } + for (long i = MINTRS; i <= MAXTRS; i++) { + if (object_descriptions[i].inventory != 0) { + long k = 12; + if (i == CHEST)k = 14; + if (i > CHEST)k = 16; + if (game.prop[i] >= 0) + score += 2; + if (game.place[i] == LOC_BUILDING && game.prop[i] == 0) + score += k - 2; + mxscor += k; + } } /* Now look at how he finished and how far he got. MAXDIE and @@ -53,30 +53,30 @@ void score(enum termination mode) * indicates whether he reached the endgame. And if he got as far as * "cave closed" (indicated by "game.closed"), then bonus is zero for * mundane exits or 133, 134, 135 if he blew it (so to speak). */ - score += (MAXDIE-game.numdie)*10; - mxscor += MAXDIE*10; - if(mode == endgame) - score += 4; + score += (MAXDIE - game.numdie) * 10; + mxscor += MAXDIE * 10; + if (mode == endgame) + score += 4; mxscor += 4; - if(game.dflag != 0)score += 25; + if (game.dflag != 0)score += 25; mxscor += 25; - if(game.closng)score += 25; + if (game.closng)score += 25; mxscor += 25; - if(game.closed) { - if(game.bonus == 0) - score += 10; - if(game.bonus == SPLATTER_MESSAGE) - score += 25; - if(game.bonus == DEFEAT_MESSAGE) - score += 30; - if(game.bonus == VICTORY_MESSAGE) - score += 45; + if (game.closed) { + if (game.bonus == 0) + score += 10; + if (game.bonus == SPLATTER_MESSAGE) + score += 25; + if (game.bonus == DEFEAT_MESSAGE) + score += 30; + if (game.bonus == VICTORY_MESSAGE) + score += 45; } mxscor += 45; /* Did he come to Witt's End as he should? */ - if(game.place[MAGZIN] == LOC_WITTSEND) - score += 1; + if (game.place[MAGZIN] == LOC_WITTSEND) + score += 1; mxscor += 1; /* Round it off. */ @@ -84,40 +84,40 @@ void score(enum termination mode) mxscor += 2; /* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */ - for (long i=1; i<=HNTMAX; i++) { - if(game.hinted[i]) - score=score-HINTS[i][2]; + for (long i = 1; i <= HNTMAX; i++) { + if (game.hinted[i]) + score = score - HINTS[i][2]; } - if(game.novice) - score -= 5; - if(game.clshnt) - score -= 10; - score=score-game.trnluz-game.saved; + if (game.novice) + score -= 5; + if (game.clshnt) + score -= 10; + score = score - game.trnluz - game.saved; /* 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); - return; + if (mode == scoregame) { + SETPRM(1, score, mxscor); + SETPRM(3, game.turns, game.turns); + RSPEAK(GARNERED_POINTS); + return; } /* that should be good enough. Let's tell him all about it. */ - if(score+game.trnluz+1 >= mxscor && game.trnluz != 0) - RSPEAK(TOOK_LONG); - if(score+game.saved+1 >= mxscor && game.saved != 0) - RSPEAK(WITHOUT_SUSPENDS); - SETPRM(1,score,mxscor); - SETPRM(3,game.turns,game.turns); + if (score + game.trnluz + 1 >= mxscor && game.trnluz != 0) + RSPEAK(TOOK_LONG); + if (score + game.saved + 1 >= mxscor && game.saved != 0) + RSPEAK(WITHOUT_SUSPENDS); + SETPRM(1, score, mxscor); + SETPRM(3, game.turns, game.turns); RSPEAK(TOTAL_SCORE); - for (long i=1; i<=(long)CLSSES; i++) { - if(CVAL[i] >= score) { - newspeak(class_messages[i]); - i=CVAL[i]+1-score; - SETPRM(1,i,i); - RSPEAK(NEXT_HIGHER); - exit(0); - } + for (long i = 1; i <= (long)CLSSES; i++) { + if (CVAL[i] >= score) { + newspeak(class_messages[i]); + i = CVAL[i] + 1 - score; + SETPRM(1, i, i); + RSPEAK(NEXT_HIGHER); + exit(0); + } } RSPEAK(OFF_SCALE); RSPEAK(NO_HIGHER);