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

diff --git a/main.c b/main.c
index e102398..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, 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;
@@ -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 */