Abolish funcs.h.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index c6a1eef1e7537d82317435a3e5401feea464080e..04bb5088ea722dddc2a27c298c3786fd2ae4849d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -14,7 +14,7 @@
 
 struct game_t game;
 
 
 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,
 char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
 long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,


@@ -22,10 +22,10 @@ long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
                GRATE, HINT, I, INVENT, J, JADE, K, KEYS,
                CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
                GRATE, HINT, I, INVENT, J, JADE, K, KEYS,

-               KNIFE, L, LAMP, LOCK, LOOK, MAGZIN, MAXDIE,
+               KNIFE, L, LAMP, LOCK, LOOK, MAGZIN,

                MESSAG, MIRROR, NUGGET, NUL, OGRE, OIL, OYSTER,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,
                MESSAG, MIRROR, NUGGET, NUL, OGRE, OIL, OYSTER,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,

-               RUBY, RUG, SAPPH, SAY, SCORE, SECT, SIGN, SNAKE, SPK,
+               RUBY, RUG, SAPPH, SAY, SECT, SIGN, SNAKE, SPK,

                STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
                URN, V1, V2, VASE, VEND,
                VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
                STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
                URN, V1, V2, VASE, VEND,
                VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;


@@ -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 */
 
  *  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;
 /* Initialize our LCG PRNG with parameters tested against Knuth vol. 2. by the original authors */
 
        lcgstate.a = 1093;