X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=e89b2ad3b00b156b0103ff5ec224a6ef7e382790;hb=4c100261c4f5f8d457c5402c5daa5d58256e8bd5;hp=bc3c1cc9ee885289fc037372ab0fd900a96eff7d;hpb=04eca720d9a5282b47f51c5d19910a094f3d1882;p=open-adventure.git

diff --git a/advent.h b/advent.h
index bc3c1cc..e89b2ad 100644
--- a/advent.h
+++ b/advent.h
@@ -5,17 +5,18 @@
 #include "common.h"
 
 #define LINESIZE	100
-#define NDWARVES	6
+#define NDWARVES	6		/* number of dwarves */
 #define PIRATE		NDWARVES	/* must be NDWARVES-1 when zero-origin */
 #define DALTLC		LOC_NUGGET	/* alternate dwarf location */
-#define MINTRS		50
-#define MAXTRS		79
-#define MAXPARMS	25
-#define INVLIMIT	7
+#define MINTRS		50		/* index of lowest reasure */
+#define MAXTRS		79		/* index of highest reasure */
+#define MAXPARMS	25		/* Max parameters for speak() */
+#define INVLIMIT	7		/* inverntory limit (# of objects) */
 #define INTRANSITIVE	-1		/* illegal object number */
 #define SPECIALBASE	300		/* base number of special rooms */
 #define WARNTIME	30		/* late game starts at game.limit-this */
 #define PANICTIME	15		/* time left after closing */
+#define BATTERYLIFE	2500		/* turn limit increment from batteries */
 
 typedef long token_t;	/* word token - someday this will be char[TOKLEN+1] */
 typedef long vocab_t;	/* index into a vocabulary array */
@@ -94,7 +95,7 @@ extern void SETPRM(long,long,long);
 extern bool GETIN(FILE *,token_t*,token_t*,token_t*,token_t*);
 extern void echo_input(FILE*, char*, char*);
 extern char* get_input(void);
-extern bool YES(vocab_t, vocab_t, vocab_t);
+extern bool YES(const char*, const char*, const char*);
 extern long GETTXT(bool,bool,bool);
 extern token_t MAKEWD(long);
 extern long VOCAB(long,long);
@@ -147,7 +148,7 @@ extern int restore(FILE *);
 #define FORCED(LOC)	(COND[LOC] == 2)
 #define DARK(DUMMY)	((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
 #define PCT(N)		(randrange(100) < (N))
-#define GSTONE(OBJ)	((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
+#define GSTONE(OBJ)	((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)	((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
 #define VOCWRD(LETTRS,SECT)	(VOCAB(MAKEWD(LETTRS),SECT))
 #define SPECIAL(LOC)	((LOC) > SPECIALBASE)
@@ -162,15 +163,15 @@ extern int restore(FILE *);
 #define INDEEP(LOC)	((LOC) >= LOC_MISTHALL && !OUTSID(LOC) && (LOC) != LOC_FOOF1)
 
 /* vocabulary items */ 
-extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
+extern long AMBER, ATTACK, AXE, BACK, BATTERY, BEAR,
    BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
    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,
+   EMERALD, ENTER, ENTRNC, FIND, FISSURE, FOOD, GRATE, HINT, INVENT,
+   JADE, KEYS, KNIFE, LAMP, LOCK, LOOK, MAGAZINE, MESSAG, MIRROR, NUGGET, NUL,
+   OGRE, OIL, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAMID,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, SIGN, SNAKE,
-   STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
-   URN, VASE, VEND, VOLCAN, WATER;
+   STEPS, STICK, STREAM, THROW, TRIDENT, TROLL, TROLL2,
+   URN, VASE, VEND, VOLCANO, WATER;
 
 enum speechpart {unknown, intransitive, transitive};
 
@@ -187,7 +188,6 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj);
 #define GO_CLEAROBJ	2012
 #define GO_CHECKHINT	2600
 #define GO_CHECKFOO	2607
-#define GO_CLOSEJUMP	2610
 #define GO_DIRECTION	2620
 #define GO_LOOKUP	2630
 #define GO_WORD2	2800