X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=score.c;h=9b3f8f3ea17ee71a1ecd05daf93d28896463fef0;hp=8bd3cce1793af69a20c7b186a99ba58f7c27de1b;hb=9e2cb3c19196a26af8e20803314f42b69dc0e014;hpb=3d2ba1835544af309723e7502d0311d5f14ec99d diff --git a/score.c b/score.c index 8bd3cce..9b3f8f3 100644 --- a/score.c +++ b/score.c @@ -6,13 +6,13 @@ * 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 = 0; + int score = 0; /* The present scoring algorithm is as follows: * Objective: Points: Present total possible: @@ -40,7 +40,7 @@ long score(enum termination mode) 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) @@ -92,7 +92,7 @@ long score(enum termination mode) 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; } @@ -120,7 +120,7 @@ void terminate(enum termination mode) if (points + game.saved + 1 >= mxscor && game.saved != 0) rspeak(WITHOUT_SUSPENDS); rspeak(TOTAL_SCORE, points, mxscor, game.turns, game.turns); - for (long i = 1; i <= (long)NCLASSES; i++) { + for (int i = 1; i <= (long)NCLASSES; i++) { if (classes[i].threshold >= points) { speak(classes[i].message); i = classes[i].threshold + 1 - points;