Reapply "Clean up logic for exiting input loop and scoring."

[open-adventure.git] / misc.h

diff --git a/misc.h b/misc.h
index 561ac52fe82e62f61e656d016544d8cc5c1df8f4..095efba590ac739a385f681b2f6cc79db7f70123 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,5 +1,6 @@
 #include <time.h>
 #include <stdio.h>
+#include <stdbool.h>
 
 /* b is not needed for POSIX but harmless */
 #define READ_MODE "rb"
@@ -13,7 +14,7 @@ extern void fRSPEAK(long);
 #define RSPEAK(I) fRSPEAK(I)
 extern void fSETPRM(long,long,long);
 #define SETPRM(FIRST,P1,P2) fSETPRM(FIRST,P1,P2)
-extern void fGETIN(FILE *,long*,long*,long*,long*);
+extern bool fGETIN(FILE *,long*,long*,long*,long*);
 #define GETIN(input,WORD1,WORD1X,WORD2,WORD2X) fGETIN(input,&WORD1,&WORD1X,&WORD2,&WORD2X)
 extern long fYES(FILE *,long,long,long);
 #define YES(input,X,Y,Z) fYES(input,X,Y,Z)
@@ -55,8 +56,6 @@ extern long fSETBIT(long);
 #define SETBIT(BIT) fSETBIT(BIT)
 extern long fTSTBIT(long,long);
 #define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
-extern long fRAN(long);
-#define RAN(RANGE) fRAN(RANGE)
 extern long fRNDVOC(long,long);
 #define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE)
 extern void fBUG(long);
@@ -74,3 +73,6 @@ extern long fIABS(long);
 #define IABS(N) fIABS(N)
 extern long fMOD(long,long);
 #define MOD(N,M) fMOD(N,M)
+extern void set_seed_from_time(void);
+extern unsigned long get_next_lcg_value(void);
+extern long randrange(long);