X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=a1115a6cc2b342d4bca8a20aab619fd865ef06af;hb=a101fc86797569ffe911ad613acba7e5dc5dc7fe;hp=06d43679760594dc3cf15aa289c35b6ed43a3e97;hpb=3178f5d9948e6bf1ad74069b9512e7b256b0ff08;p=open-adventure.git

diff --git a/main.c b/main.c
index 06d4367..a1115a6 100644
--- a/main.c
+++ b/main.c
@@ -39,7 +39,9 @@ long AMBER, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
 		RUBY, RUG, SAPPH, SAY, SIGN, SNAKE,
     		STEPS, STREAM, THROW, TRIDNT, TROLL, TROLL2,
 		URN, VASE, VEND, VOLCAN, WATER;
-long K, SPK, WD1, WD1X, WD2, WD2X;
+long WD1, WD1X, WD2, WD2X;
+
+static int K;	/* information leak, should go away */
 
 FILE  *logfp;
 bool oldstyle = false;
@@ -418,11 +420,11 @@ static bool dwarfmove(void)
 	return true;
     if (game.dflag == 2)game.dflag=3;
     SETPRM(1,attack,0);
-    K=6;
-    if (attack > 1)K=250;
-    RSPEAK(K);
+    int k=6;
+    if (attack > 1)k=250;
+    RSPEAK(k);
     SETPRM(1,stick,0);
-    RSPEAK(K+1+2/(1+stick));
+    RSPEAK(k+1+2/(1+stick));
     if (stick == 0)
 	return true;
     game.oldlc2=game.loc;
@@ -567,15 +569,15 @@ static bool playermove(FILE *cmdin, token_t verb)
 	if (TRAVEL[KK] < 0) {
 	    /*  Non-applicable motion.  Various messages depending on
 	     *  word given. */
-	    SPK=12;
-	    if (K >= 43 && K <= 50)SPK=52;
-	    if (K == 29 || K == 30)SPK=52;
-	    if (K == 7 || K == 36 || K == 37)SPK=10;
-	    if (K == 11 || K == 19)SPK=11;
-	    if (verb == FIND || verb == INVENT)SPK=59;
-	    if (K == 62 || K == 65)SPK=42;
-	    if (K == 17)SPK=80;
-	    RSPEAK(SPK);
+	    int spk=12;
+	    if (K >= 43 && K <= 50)spk=52;
+	    if (K == 29 || K == 30)spk=52;
+	    if (K == 7 || K == 36 || K == 37)spk=10;
+	    if (K == 11 || K == 19)spk=11;
+	    if (verb == FIND || verb == INVENT)spk=59;
+	    if (K == 62 || K == 65)spk=42;
+	    if (K == 17)spk=80;
+	    RSPEAK(spk);
 	    return true;
 	}
 	++KK;
@@ -961,10 +963,10 @@ L2607:	game.foobar=(game.foobar>0 ? -game.foobar : 0);
 	} else if (game.limit <= 30) {
 	    if (!game.lmwarn && HERE(LAMP)) {
 		game.lmwarn=true;
-		SPK=187;
-		if (game.place[BATTER] == 0)SPK=183;
-		if (game.prop[BATTER] == 1)SPK=189;
-		RSPEAK(SPK);
+		int spk=187;
+		if (game.place[BATTER] == 0)spk=183;
+		if (game.prop[BATTER] == 1)spk=189;
+		RSPEAK(spk);
 	    }
 	}
 L19999: K=43;
@@ -1025,32 +1027,32 @@ L4090:	part=transitive; goto Laction;
 L5000:	part=unknown; obj = K;
 Laction:
 	 switch (action(cmdin, part, VERB, obj)) {
-	   case 2: return true;
-	   case 8: goto L8;
-	   case 2000: goto L2000;
-	   case 2012: goto L2012;
-	   case 2600: goto L2600;
-	   case 2607: goto L2607;
-	   case 2630: goto L2630;
-	   case 2800:
-	      /* Get second word for analysis. */
-	       WD1=WD2;
-	       WD1X=WD2X;
-	       WD2=0;
-	       goto L2620;
-	   case 8000:
-	       /*  Random intransitive verbs come here.  Clear obj just in case
-		*  (see attack()). */
-	       SETPRM(1,WD1,WD1X);
-	       RSPEAK(257);
-	       obj=0;
-	       goto L2600;
-	   case 19000:
-	       /*  Oh dear, he's disturbed the dwarves. */
-	       RSPEAK(136);
-	       score(0);
-	       return true;
-	   }
+	 case 2: return true;
+	 case 8: K=NUL; goto L8;
+	 case 2000: goto L2000;
+	 case 2012: goto L2012;
+	 case 2600: goto L2600;
+	 case 2607: goto L2607;
+	 case 2630: goto L2630;
+	 case 2800:
+	     /* Get second word for analysis. */
+	     WD1=WD2;
+	     WD1X=WD2X;
+	     WD2=0;
+	     goto L2620;
+	 case 8000:
+	     /*  Random intransitive verbs come here.  Clear obj just in case
+	      *  (see attack()). */
+	     SETPRM(1,WD1,WD1X);
+	     RSPEAK(257);
+	     obj=0;
+	     goto L2600;
+	 case 19000:
+	     /*  Oh dear, he's disturbed the dwarves. */
+	     RSPEAK(136);
+	     score(0);
+	     return true;
+	     }
 	BUG(99);
 
 	/*  Figure out the new location */