Localize V1 and V2 in main.c

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index ed39d8e84a2af66257b48638e2adf84d3208b125..3e208158b9594eb1a566872f2f22e7369b8fccc3 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -6,6 +6,11 @@
 #define LINESIZE       100
 #define NDWARVES       6
 #define PIRATE         NDWARVES        /* must be NDWARVES-1 when zero-origin */
 #define LINESIZE       100
 #define NDWARVES       6
 #define PIRATE         NDWARVES        /* must be NDWARVES-1 when zero-origin */

+#define DALTLC         18              /* alternate dwarf location; low room */
+#define MINTRS         50
+#define MAXTRS         79
+#define MAXPARMS       25
+#define INVLIMIT       7

 
 typedef struct lcg_state
 {
 
 typedef struct lcg_state
 {


@@ -37,6 +42,7 @@ struct game_t {
     long knfloc;
     long limit;
     long lmwarn;
     long knfloc;
     long limit;
     long lmwarn;

+    long loc;

     long newloc;
     long novice;
     long numdie;
     long newloc;
     long novice;
     long numdie;


@@ -62,6 +68,8 @@ struct game_t {
     long link[NOBJECTS*2 + 1];
     long place[NOBJECTS+1];
     long hinted[HNTSIZ+1];
     long link[NOBJECTS*2 + 1];
     long place[NOBJECTS+1];
     long hinted[HNTSIZ+1];

+    long hintlc[HNTSIZ+1];
+    long prop[NOBJECTS+1];

 };
 
 extern struct game_t game;
 };
 
 extern struct game_t game;


@@ -126,21 +134,61 @@ extern long MOD(long,long);
 extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
 extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);

-

 extern void score(long);
 extern void score(long);

+extern int carry(long);
+extern int discard(long, bool);
+extern int attack(FILE *, long, long);
+extern int throw(FILE *, long, long);
+extern int feed(long);
+extern int fill(long);
+
+/*  Statement functions
+ *
+ *  AT(OBJ)    = true if on either side of two-placed object
+ *  CNDBIT(L,N) = true if COND(L) has bit n set (bit 0 is units bit)
+ *  DARK(DUMMY) = true if location "LOC" is dark
+ *  FORCED(LOC) = true if LOC moves without asking for input (COND=2)
+ *  FOREST(LOC)  = true if LOC is part of the forest
+ *  GSTONE(OBJ)  = true if OBJ is a gemstone
+ *  HERE(OBJ)  = true if the OBJ is at "LOC" (or is being carried)
+ *  LIQ(DUMMY) = object number of liquid in bottle
+ *  LIQLOC(LOC) = object number of liquid (if any) at LOC
+ *  PCT(N)       = true N% of the time (N integer from 0 to 100)
+ *  TOTING(OBJ) = true if the OBJ is being carried */
+
+#define TOTING(OBJ)    (game.place[OBJ] == -1)
+#define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
+#define HERE(OBJ)      (AT(OBJ) || TOTING(OBJ))
+#define LIQ2(PBOTL)    ((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL))
+#define LIQ(DUMMY)     (LIQ2(game.prop[BOTTLE]<0 ? -1-game.prop[BOTTLE] : game.prop[BOTTLE]))
+#define LIQLOC(LOC)    (LIQ2((MOD(COND[LOC]/2*2,8)-5)*MOD(COND[LOC]/4,2)+1))
+#define CNDBIT(L,N)    (TSTBIT(COND[L],N))
+#define FORCED(LOC)    (COND[LOC] == 2)
+#define DARK(DUMMY)    ((!CNDBIT(game.loc,0)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
+#define PCT(N) (randrange(100) < (N))
+#define GSTONE(OBJ)    ((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
+#define FOREST(LOC)    ((LOC) >= 145 && (LOC) <= 166)
+#define VOCWRD(LETTRS,SECT)    (VOCAB(MAKEWD(LETTRS),SECT))
+
+/*  The following two functions were added to fix a bug (game.clock1 decremented
+ *  while in forest).  They should probably be replaced by using another
+ *  "cond" bit.  For now, however, a quick fix...  OUTSID(LOC) is true if
+ *  LOC is outside, INDEEP(LOC) is true if LOC is "deep" in the cave (hall
+ *  of mists or deeper).  Note special kludges for "Foof!" locs. */
+
+#define OUTSID(LOC)    ((LOC) <= 8 || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == 180 || (LOC) == 182)
+#define INDEEP(LOC)    ((LOC) >= 15 && !OUTSID(LOC) && (LOC) != 179)
+
+/* vocabulary items */ 

 extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
 extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,

-   CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
-   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
-   GRATE, HINT, HINTLC[],
-   I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
-   KNIFE, KQ, L, LAMP, LL, LOC, LOCK, LOOK,
-   MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OBJ,
-   OGRE, OIL, OLDOBJ, OYSTER,
-   PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
-   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,
-   VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;
+   CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
+   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD, GRATE, HINT, INVENT,
+   JADE, KEYS, KNIFE, LAMP, LOCK, LOOK, MAGZIN, MESSAG, MIRROR, NUGGET, NUL,
+   OGRE, OIL, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAM,
+   RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, SECT, SIGN, SNAKE,
+   STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
+   URN, VASE, VEND, VOLCAN, WATER;
+/* everything else */
+extern long I, J, K, L, SPK, VRSION, WD1, WD1X, WD2, WD2X;