X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=funcs.h;h=34f69cdfc261d6c2502b890abca3539c9a20e0fc;hp=e86fb2cdf4bf90869c4d3bd411ea0f036bda47b4;hb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb;hpb=18767d52dd053cf6c851ded2597697674ca255c1

diff --git a/funcs.h b/funcs.h
index e86fb2c..34f69cd 100644
--- a/funcs.h
+++ b/funcs.h
@@ -1,4 +1,5 @@
 #include <stdbool.h>
+#include "database.h"
 
 /*  Statement functions
  *
@@ -23,7 +24,7 @@
 #define CNDBIT(L,N)	(TSTBIT(COND[L],N))
 #define FORCED(LOC)	(COND[LOC] == 2)
 #define DARK(DUMMY)	((!CNDBIT(LOC,0)) && (PROP[LAMP] == 0 || !HERE(LAMP)))
-#define PCT(N)	(RAN(100) < (N))
+#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))
@@ -32,12 +33,12 @@
  *  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. */
+ *  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)
 
-extern int carry(void), discard(bool), attack(void), throw(void), feed(void), fill(void);
+extern int carry(void), discard(bool), attack(FILE *), throw(FILE *), feed(void), fill(void);
 void score(long);