Larn now builds with WARNS=4.

[bsdgames-darwin.git] / larn / header.h

diff --git a/larn/header.h b/larn/header.h
index 08bc6265331bf17797e228b13646e0990ff4f282..d8025583410deb38a730228c66cdca0c97bf2f40 100644 (file)
--- a/larn/header.h
+++ b/larn/header.h
@@ -1,4 +1,4 @@
-/* $NetBSD: header.h,v 1.14 2003/10/21 07:26:39 agc Exp $       */
+/* $NetBSD: header.h,v 1.17 2008/01/28 05:38:53 dholland Exp $  */
 
 /* header.h            Larn is copyrighted 1986 by Noah Morgan. */
 
@@ -18,7 +18,7 @@
 #define MAXMONST 56
 /* maximum # monsters in the dungeon    */
 #define SPNUM 38
-/* maximum number of spells in existance        */
+/* maximum number of spells in existence        */
 #define MAXSCROLL 28
 /* maximum number of scrolls that are possible  */
 #define MAXPOTION 35
@@ -32,7 +32,7 @@
 
 /* this is the structure definition of the monster data         */
 struct monst {
-       char           *name;
+       const char     *name;
        char            level;
        short           armorclass;
        char            damage;
@@ -332,26 +332,29 @@ struct sphere {
 #ifndef NODEFS
 extern char     VERSION, SUBVERSION;
 extern u_char   alpha[], beenhere[], boldon, cheat, ckpflag;
-extern u_char  *class[], course[];
+extern const char *class[];
+extern u_char   course[];
 extern char     diagfile[], helpfile[], ckpfile[], larnlevels[],
                playerids[], optsfile[1024], psname[], savefilename[],
                scorefile[];
 extern u_char  *inbuffer, is_alpha[], is_digit[];
 extern u_char   item[MAXX][MAXY], iven[], know[MAXX][MAXY];
-extern char    *levelname[], logfile[], loginname[], logname[],
-                lastmonst[];
+extern const char *levelname[];
+extern char     logfile[], loginname[], logname[], lastmonst[];
 extern u_char  *lpbuf, *lpend;
 extern u_char  *lpnt, moved[MAXX][MAXY], mitem[MAXX][MAXY], monstlevel[];
 extern char     monstnamelist[], objnamelist[];
 extern u_char   nch[], ndgg[], nlpts[], nomove, nosignal, nowelcome;
 extern u_char   nplt[], nsw[];
-extern char    *objectname[], *potionhide[], *potionname[],
-               *spelcode[], *spelname[], *spelmes[], aborted[],
-               spelweird[MAXMONST + 8][SPNUM];
+extern const char *objectname[];
+extern const char *potionhide[], *potionname[];
+extern const char *spelcode[], *spelname[], *spelmes[];
+extern char     aborted[], spelweird[MAXMONST + 8][SPNUM];
 extern u_char   potprob[];
 extern u_char   predostuff, restorflag, scprob[];
 extern u_char   screen[MAXX][MAXY], sex;
-extern char    *speldescript[], *scrollhide[], *scrollname[];
+extern const char *speldescript[];
+extern const char *scrollhide[], *scrollname[];
 extern u_char   spelknow[];
 extern u_char   splev[], stealth[MAXX][MAXY], to_lower[], to_upper[], wizard;
 extern short    diroffx[], diroffy[], hitflag, hit2flag, hit3flag, hitp[MAXX][MAXY];
@@ -359,7 +362,7 @@ extern short    iarg[MAXX][MAXY], ivenarg[], lasthx, lasthy, lastnum, lastpx,
                 lastpy;
 extern short    nobeep, oldx, oldy, playerx, playery, level;
 extern int      dayplay, enable_scroll, srcount, yrepcount, userid, wisid,
-                lfd, fd;
+               io_outfd, io_infd;
 extern uid_t    uid, euid;
 extern long     outstanding_taxes, skill[], gltime, c[], cbak[];
 extern time_t  initialtime;
@@ -429,7 +432,7 @@ extern int      rmst, maxitm, lasttime;
 #define lprc(ch) ((lpnt>=lpend)?(*lpnt++ =(ch), lflush()):(*lpnt++ =(ch)))
 
 /* macro to seed the random number generator */
-#define srand(x) (randx=x)
+#define seedrand(x) (randx=x)
 #ifdef MACRORND
 /* macros to generate random numbers   1<=rnd(N)<=N   0<=rund(N)<=N-1 */
 #define rnd(x)  ((((randx=randx*1103515245+12345)>>7)%(x))+1)