X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=score.c;h=7b0269d8a1c87806cdcb5763945b9d04ff5c8120;hb=900822d38f1eddfeaba3feb14516025b70be0a8f;hp=a9ab765aed73e90261230c6f08f1a5e12ad853eb;hpb=0d5f9064c70eaef3fe51f0b30284fe4eb946d99b;p=open-adventure.git

diff --git a/score.c b/score.c
index a9ab765..7b0269d 100644
--- a/score.c
+++ b/score.c
@@ -41,7 +41,7 @@ void score(enum termination mode)
 	    if(i > CHEST)k=16;
 	    if(game.prop[i] >= 0)
 		score += 2;
-	    if(game.place[i] == 3 && game.prop[i] == 0)
+	    if(game.place[i] == LOC_BUILDING && game.prop[i] == 0)
 		score += k-2;
 	    mxscor += k;
 	}
@@ -65,17 +65,17 @@ void score(enum termination mode)
     if(game.closed) {
 	if(game.bonus == 0)
 	    score += 10;
-	if(game.bonus == 135)
+	if(game.bonus == SPLATTER_MESSAGE)
 	    score += 25;
-	if(game.bonus == 134)
+	if(game.bonus == DEFEAT_MESSAGE)
 	    score += 30;
-	if(game.bonus == 133)
+	if(game.bonus == VICTORY_MESSAGE)
 	    score += 45;
     }
     mxscor += 45;
 
     /* Did he come to Witt's End as he should? */
-    if(game.place[MAGZIN] == 108)
+    if(game.place[MAGZIN] == LOC_WITTSEND)
 	score += 1;
     mxscor += 1;
 
@@ -110,7 +110,7 @@ void score(enum termination mode)
     SETPRM(1,score,mxscor);
     SETPRM(3,game.turns,game.turns);
     RSPEAK(TOTAL_SCORE);
-    for (long i=1; i<=CLSSES; i++) {
+    for (long i=1; i<=(long)CLSSES; i++) {
 	if(CVAL[i] >= score) {
 	    newspeak(class_messages[i]);
 	    i=CVAL[i]+1-score;