X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=0d00266f52e68f6585e5c92304afade1b0a54573;hb=8bf31a9c193e0e27966933be1a033602bbbeac00;hp=a90f77af7e9c0174fe9fa12faa3ad2ae625ba21e;hpb=8d90b03ee412e7b26c48fe8d89a3303d669aa142;p=open-adventure.git

diff --git a/main.c b/main.c
index a90f77a..0d00266 100644
--- a/main.c
+++ b/main.c
@@ -14,20 +14,20 @@
 
 struct game_t game;
 
-long LNLENG, LNPOSN, PARMS[26];
+long LNLENG, LNPOSN, PARMS[MAXPARMS+1];
 char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
 long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
 		BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
-		CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
+		CLAM, COINS, 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,
+		GRATE, HINT, I, INVENT, J, JADE, K, KEYS,
+		KNIFE, L, LAMP, LOCK, LOOK, MAGZIN,
+		MESSAG, MIRROR, 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,
+		RUBY, RUG, SAPPH, SAY, SECT, SIGN, SNAKE, SPK,
+    		STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
+		URN, VASE, VEND,
 		VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
 FILE  *logfp;
 bool oldstyle = false;
@@ -90,8 +90,6 @@ int main(int argc, char *argv[]) {
  *  game.panic says whether he's found out he's trapped in the cave
  *  game.wzdark says whether the loc he's leaving was dark */
 
-#include "funcs.h"
-
 /* Initialize our LCG PRNG with parameters tested against Knuth vol. 2. by the original authors */
 
 	lcgstate.a = 1093;
@@ -153,8 +151,10 @@ static bool fallback_handler(char *buf)
 }
 
 static bool do_command(FILE *cmdin) {
-	long LL, KQ, VERB;
+	long LL, KQ, VERB, KK, K2, V1, V2;
 	long obj;
+	long TK[21];
+	static long IGO = 0;
 
 /*  Can't leave cave once it's closing (except by main office). */