From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 7 Jun 2017 14:06:14 +0000 (-0400)
Subject: Fully localize VERB.
X-Git-Tag: 1.1~564
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=inline;h=8d90b03ee412e7b26c48fe8d89a3303d669aa142;p=open-adventure.git

Fully localize VERB.
---

diff --git a/actions1.c b/actions1.c
index 9d9997b..e887e56 100644
--- a/actions1.c
+++ b/actions1.c
@@ -539,7 +539,7 @@ L8305:	DATIME(&I,&K);
 	SAVWDS(game.knfloc,game.limit,K,game.lmwarn,game.loc,game.newloc,game.numdie);
 	SAVWDS(K,game.oldlc2,game.oldloc,game.oldobj,game.panic,game.saved,game.setup);
 	SAVWDS(SPK,game.tally,game.thresh,game.trndex,game.trnluz,game.turns,OBJTXT[OYSTER]);
-	SAVWDS(VERB,WD1,WD1X,WD2,game.wzdark,game.zzword,OBJSND[BIRD]);
+	SAVWDS(K,WD1,WD1X,WD2,game.wzdark,game.zzword,OBJSND[BIRD]);
 	SAVWDS(OBJTXT[SIGN],game.clshnt,game.novice,K,K,K,K);
 	SAVARR(game.abbrev,LOCSIZ);
 	SAVARR(game.atloc,LOCSIZ);
diff --git a/advent.h b/advent.h
index 1c143e9..0072175 100644
--- a/advent.h
+++ b/advent.h
@@ -142,6 +142,6 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
    SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
    STREAM, THROW, TK[], TRIDNT, TROLL, TROLL2,
-   URN, V1, V2, VASE, VEND, VERB,
+   URN, V1, V2, VASE, VEND,
    VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;
 
diff --git a/main.c b/main.c
index c5e20a7..a90f77a 100644
--- a/main.c
+++ b/main.c
@@ -22,13 +22,12 @@ long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
 		CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
 		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
 		GRATE, HINT, I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
-		KNIFE, L, LAMP, LOCK, LOOK,
-		MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR,
-		NUGGET, NUL, OGRE, OIL, OYSTER, PEARL, PILLOW,
-		PLANT, PLANT2, PYRAM, RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
-		SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
-		STREAM, THROW, TK[21], TRIDNT, TROLL, TROLL2,
-		URN, V1, V2, VASE, VEND, VERB,
+		KNIFE, L, LAMP, LOCK, LOOK, MAGZIN, MAXDIE, MAXTRS,
+		MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OGRE, OIL, OYSTER,
+		PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,
+		RUBY, RUG, SAPPH, SAY, SCORE, SECT, SIGN, SNAKE, SPK,
+    		STEPS, STICK, STREAM, THROW, TK[21], TRIDNT, TROLL, TROLL2,
+		URN, V1, V2, VASE, VEND,
 		VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
 FILE  *logfp;
 bool oldstyle = false;
@@ -154,7 +153,7 @@ static bool fallback_handler(char *buf)
 }
 
 static bool do_command(FILE *cmdin) {
-	long LL, KQ;
+	long LL, KQ, VERB;
 	long obj;
 
 /*  Can't leave cave once it's closing (except by main office). */