projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve test coverage
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 1f2bd8c893d18c1ef40a0009992b67c1746bef6b..77c8079e6160ead8a349ae39d268f8ba9e975fe4 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-14,6
+14,7
@@
#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 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 */
typedef long token_t; /* word token - someday this will be char[TOKLEN+1] */
typedef long vocab_t; /* index into a vocabulary array */
typedef long token_t; /* word token - someday this will be char[TOKLEN+1] */
typedef long vocab_t; /* index into a vocabulary array */
@@
-84,7
+85,7
@@
extern bool oldstyle, editline, prompt;
#define WRITE_MODE "wb"
extern char* xstrdup(const char*);
extern void packed_to_token(long, char token[]);
#define WRITE_MODE "wb"
extern char* xstrdup(const char*);
extern void packed_to_token(long, char token[]);
-extern void
newspeak(
char*);
+extern void
speak(const
char*);
extern void PSPEAK(vocab_t,int);
extern void RSPEAK(vocab_t);
extern void SETPRM(long,long,long);
extern void PSPEAK(vocab_t,int);
extern void RSPEAK(vocab_t);
extern void SETPRM(long,long,long);
@@
-92,9
+93,7
@@
extern bool GETIN(FILE *,token_t*,token_t*,token_t*,token_t*);
extern long YES(FILE *,vocab_t,vocab_t,vocab_t);
extern long GETTXT(bool,bool,bool);
extern token_t MAKEWD(long);
extern long YES(FILE *,vocab_t,vocab_t,vocab_t);
extern long GETTXT(bool,bool,bool);
extern token_t MAKEWD(long);
-extern void TYPE0(void);
extern long VOCAB(long,long);
extern long VOCAB(long,long);
-extern void DSTROY(long);
extern void JUGGLE(long);
extern void MOVE(long,long);
extern long PUT(long,long,long);
extern void JUGGLE(long);
extern void MOVE(long,long);
extern long PUT(long,long,long);
@@
-106,7
+105,6
@@
extern bool TSTBIT(long,int);
extern long RNDVOC(long,long);
extern void BUG(long) __attribute__((noreturn));
extern bool MAPLIN(FILE *);
extern long RNDVOC(long,long);
extern void BUG(long) __attribute__((noreturn));
extern bool MAPLIN(FILE *);
-extern void TYPE(void);
extern void DATIME(long*, long*);
enum termination {endgame, quitgame, scoregame};
extern void DATIME(long*, long*);
enum termination {endgame, quitgame, scoregame};
@@
-114,8
+112,11
@@
enum termination {endgame, quitgame, scoregame};
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(enum termination);
-extern int saveresume(FILE *, bool);
+extern long score(enum termination);
+extern void terminate(enum termination) __attribute__((noreturn));
+extern int suspend(FILE *);
+extern int resume(FILE *);
+extern int restore(FILE *);
/*
* MOD(N,M) = Arithmetic modulus
/*
* MOD(N,M) = Arithmetic modulus
@@
-131,8
+132,9
@@
extern int saveresume(FILE *, bool);
* PCT(N) = true N% of the time (N integer from 0 to 100)
* TOTING(OBJ) = true if the OBJ is being carried */
* PCT(N) = true N% of the time (N integer from 0 to 100)
* TOTING(OBJ) = true if the OBJ is being carried */
+#define DESTROY(N) MOVE(N, NOWHERE)
#define MOD(N,M) ((N) % (M))
#define MOD(N,M) ((N) % (M))
-#define TOTING(OBJ) (game.place[OBJ] ==
-1
)
+#define TOTING(OBJ) (game.place[OBJ] ==
CARRIED
)
#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 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))
@@
-141,7
+143,7
@@
extern int saveresume(FILE *, bool);
#define CNDBIT(L,N) (TSTBIT(COND[L],N))
#define FORCED(LOC) (COND[LOC] == 2)
#define DARK(DUMMY) ((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
#define CNDBIT(L,N) (TSTBIT(COND[L],N))
#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 PCT(N)
(randrange(100) < (N))
#define GSTONE(OBJ) ((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) ((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
#define VOCWRD(LETTRS,SECT) (VOCAB(MAKEWD(LETTRS),SECT))
#define GSTONE(OBJ) ((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) ((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
#define VOCWRD(LETTRS,SECT) (VOCAB(MAKEWD(LETTRS),SECT))
@@
-169,6
+171,9
@@
extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
enum speechpart {unknown, intransitive, transitive};
enum speechpart {unknown, intransitive, transitive};
+void initialise(void);
+int action(FILE *input, enum speechpart part, long verb, token_t obj);
+
/* Phase codes for action returns.
* These were at one time FORTRAN line numbers.
* The values don't matter, but perturb their order at your peril.
/* Phase codes for action returns.
* These were at one time FORTRAN line numbers.
* The values don't matter, but perturb their order at your peril.
@@
-207,6
+212,10
@@
enum speechpart {unknown, intransitive, transitive};
#define HOGRE 19 /* Trying to deal with ogre */
#define HJADE 20 /* Found all treasures except jade */
#define HOGRE 19 /* Trying to deal with ogre */
#define HJADE 20 /* Found all treasures except jade */
+/* Special object statuses in game.place - can also be a location number (> 0) */
+#define CARRIED -1 /* Player is toting it */
+#define NOWHERE 0 /* It's destroyed */
+
/* hack to ignore GCC Unused Result */
#define IGNORE(r) do{if (r){}}while(0)
/* hack to ignore GCC Unused Result */
#define IGNORE(r) do{if (r){}}while(0)