diff options
77 files changed, 12351 insertions, 9505 deletions
diff --git a/hack/Makefile b/hack/Makefile index 3bbbb752..86095851 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 1997/10/12 14:21:46 lukem Exp $ +# $NetBSD: Makefile,v 1.24 1997/10/19 16:56:41 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 -WARNS= 0 PROG= hack CFLAGS+=-I. SRCS+= hack.onames.h @@ -18,7 +17,7 @@ SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \ hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c MAN= hack.6 DPADD+= ${LIBTERM} ${LIBCOMPAT} -LDADD+= -ltermcap -lcompat +LDADD+= -ltermcap HIDEGAME=hidegame CLEANFILES+=hack.onames.h makedefs FILES=help hh data @@ -29,9 +28,6 @@ ${PROG}: hack.onames.h hack.onames.h: makedefs def.objects.h ${.OBJDIR}/makedefs ${.CURDIR}/def.objects.h > hack.onames.h -makedefs: makedefs.c - ${HOST_CC} ${HOST_CFLAGS} ${HOST_LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c - .if !exists(${DESTDIR}${FILESDIR}/perm) afterinstall: clobber .endif diff --git a/hack/alloc.c b/hack/alloc.c index f64cc195..68713b21 100644 --- a/hack/alloc.c +++ b/hack/alloc.c @@ -1,6 +1,12 @@ +/* $NetBSD: alloc.c,v 1.4 1997/10/19 16:56:47 christos Exp $ */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: alloc.c,v 1.3 1995/03/23 08:29:14 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: alloc.c,v 1.4 1997/10/19 16:56:47 christos Exp $"); +#endif /* not lint */ + +#include <stdlib.h> +#include "hack.h" +#include "extern.h" #ifdef LINT @@ -11,40 +17,39 @@ static char rcsid[] = "$NetBSD: alloc.c,v 1.3 1995/03/23 08:29:14 cgd Exp $"; "ftell defined (in <stdio.h>) but never used" from lint */ -#include <stdio.h> long * -alloc(n) unsigned n; { -long dummy = ftell(stderr); - if(n) dummy = 0; /* make sure arg is used */ - return(&dummy); +alloc(n) + unsigned n; +{ + long dummy = ftell(stderr); + if (n) + dummy = 0; /* make sure arg is used */ + return (&dummy); } #else -extern char *malloc(); -extern char *realloc(); - long * alloc(lth) -register unsigned lth; + unsigned lth; { - register char *ptr; + char *ptr; - if(!(ptr = malloc(lth))) + if (!(ptr = malloc(lth))) panic("Cannot get %d bytes", lth); - return((long *) ptr); + return ((long *) ptr); } long * -enlarge(ptr,lth) -register char *ptr; -register unsigned lth; +enlarge(ptr, lth) + char *ptr; + unsigned lth; { - register char *nptr; + char *nptr; - if(!(nptr = realloc(ptr,lth))) + if (!(nptr = realloc(ptr, lth))) panic("Cannot reallocate %d bytes", lth); - return((long *) nptr); + return ((long *) nptr); } -#endif LINT +#endif /* LINT */ diff --git a/hack/config.h b/hack/config.h index e18bcbaf..f3377d97 100644 --- a/hack/config.h +++ b/hack/config.h @@ -1,7 +1,7 @@ +/* $NetBSD: config.h,v 1.5 1997/10/19 16:56:49 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: config.h,v 1.4 1997/03/29 20:42:16 thorpej Exp $ */ #include "pathnames.h" @@ -106,8 +106,10 @@ * typedef char schar; * will do when you have signed characters; otherwise use * typedef short int schar; + * + * Use short chars anyway to avoid warnings. */ -#ifdef __CHAR_UNSIGNED__ +#if 1 typedef short int schar; #else typedef char schar; @@ -143,4 +145,4 @@ typedef xchar boolean; /* 0 or 1 */ #define SIZE(x) (int)(sizeof(x) / sizeof(x[0])) -#endif CONFIG +#endif /* CONFIG */ diff --git a/hack/def.edog.h b/hack/def.edog.h index 00fa911f..1dfb24bb 100644 --- a/hack/def.edog.h +++ b/hack/def.edog.h @@ -1,9 +1,11 @@ +/* $NetBSD: def.edog.h,v 1.4 1997/10/19 16:56:51 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.edog.h,v 1.3 1995/03/23 08:29:18 cgd Exp $ */ +#ifndef _DEF_EDOG_H_ +#define _DEF_EDOG_H_ struct edog { long hungrytime; /* at this time dog gets hungry */ long eattime; /* dog is eating */ @@ -13,3 +15,5 @@ struct edog { long whistletime; /* last time he whistled */ }; #define EDOG(mp) ((struct edog *)(&(mp->mextra[0]))) + +#endif /* _DEF_EDOG_H_ */ diff --git a/hack/def.eshk.h b/hack/def.eshk.h index 781c3461..43ee690b 100644 --- a/hack/def.eshk.h +++ b/hack/def.eshk.h @@ -1,8 +1,10 @@ +/* $NetBSD: def.eshk.h,v 1.4 1997/10/19 16:56:53 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.eshk.h,v 1.3 1995/03/23 08:29:21 cgd Exp $ */ +#ifndef _DEF_ESHK_H_ +#define _DEF_ESHK_H_ #define BILLSZ 200 struct bill_x { @@ -25,3 +27,4 @@ struct eshk { char customer[PL_NSIZ]; /* most recent customer */ char shknam[PL_NSIZ]; }; +#endif /* _DEF_ESHK_H_ */ diff --git a/hack/def.flag.h b/hack/def.flag.h index 2fff1d3f..52fdc27c 100644 --- a/hack/def.flag.h +++ b/hack/def.flag.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.flag.h,v 1.4 1997/10/19 16:56:56 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.flag.h,v 1.3 1995/03/23 08:29:22 cgd Exp $ */ - +#ifndef _DEF_FLAG_H_ +#define _DEF_FLAG_H_ struct flag { unsigned ident; /* social security number for each monster */ unsigned debug:1; /* in debugging mode */ @@ -43,3 +44,4 @@ struct flag { extern struct flag flags; +#endif /* _DEF_FLAG_H_ */ diff --git a/hack/def.func_tab.h b/hack/def.func_tab.h index 363c8f3b..8295a350 100644 --- a/hack/def.func_tab.h +++ b/hack/def.func_tab.h @@ -1,19 +1,21 @@ +/* $NetBSD: def.func_tab.h,v 1.4 1997/10/19 16:56:58 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.func_tab.h,v 1.3 1995/03/23 08:29:23 cgd Exp $ */ - +#ifndef _DEF_FUNC_TAB_H_ +#define _DEF_FUNC_TAB_H_ struct func_tab { char f_char; - int (*f_funct)(); + int (*f_funct) __P((void)); }; extern struct func_tab cmdlist[]; struct ext_func_tab { char *ef_txt; - int (*ef_funct)(); + int (*ef_funct) __P((void)); }; extern struct ext_func_tab extcmdlist[]; +#endif /* _DEF_FUNC_TAB_H_ */ diff --git a/hack/def.gen.h b/hack/def.gen.h index 56e4832b..bc6b7169 100644 --- a/hack/def.gen.h +++ b/hack/def.gen.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.gen.h,v 1.4 1997/10/19 16:57:01 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.gen.h,v 1.3 1995/03/23 08:29:25 cgd Exp $ */ - +#ifndef _DEF_GEN_H_ +#define _DEF_GEN_H_ struct gen { struct gen *ngen; xchar gx,gy; @@ -14,5 +15,5 @@ struct gen { #define ONCE 0100 }; extern struct gen *fgold, *ftrap; -struct gen *g_at(); #define newgen() (struct gen *) alloc(sizeof(struct gen)) +#endif /* _DEF_GEN_H_ */ diff --git a/hack/def.gold.h b/hack/def.gold.h index 7333bdd5..426783f2 100644 --- a/hack/def.gold.h +++ b/hack/def.gold.h @@ -1,15 +1,16 @@ +/* $NetBSD: def.gold.h,v 1.4 1997/10/19 16:57:03 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.gold.h,v 1.3 1995/03/23 08:29:27 cgd Exp $ */ - +#ifndef _DEF_GOLD_H_ +#define _DEF_GOLD_H_ struct gold { struct gold *ngold; xchar gx,gy; long amount; }; -extern struct gold *fgold; -struct gold *g_at(); #define newgold() (struct gold *) alloc(sizeof(struct gold)) +extern struct gold *fgold; +#endif /* _DEF_GOLD_H_ */ diff --git a/hack/def.mkroom.h b/hack/def.mkroom.h index 45c21561..f3b9547c 100644 --- a/hack/def.mkroom.h +++ b/hack/def.mkroom.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.mkroom.h,v 1.4 1997/10/19 16:57:05 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.mkroom.h,v 1.3 1995/03/23 08:29:29 cgd Exp $ */ - +#ifndef _DEF_MKROOM_H_ +#define _DEF_MKROOM_H_ struct mkroom { schar lx,hx,ly,hy; /* usually xchar, but hx may be -1 */ schar rtype,rlit,doorct,fdoor; @@ -27,3 +28,4 @@ extern coord doors[DOORMAX]; #define SHOPBASE 8 #define WANDSHOP 9 #define GENERAL 15 +#endif /* _DEF_MKROOM_H_ */ diff --git a/hack/def.monst.h b/hack/def.monst.h index 6d883eaf..cc49287c 100644 --- a/hack/def.monst.h +++ b/hack/def.monst.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.monst.h,v 1.4 1997/10/19 16:57:07 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.monst.h,v 1.3 1995/03/23 08:29:30 cgd Exp $ */ - +#ifndef _DEF_MONST_H_ +#define _DEF_MONST_H_ struct monst { struct monst *nmon; struct permonst *data; @@ -52,7 +53,6 @@ struct monst { extern struct monst *fmon; extern struct monst *fallen_down; -struct monst *m_at(); /* these are in mspeed */ #define MSLOW 1 /* slow monster */ @@ -61,3 +61,4 @@ struct monst *m_at(); #define NAME(mtmp) (((char *) mtmp->mextra) + mtmp->mxlth) #define MREGEN "TVi1" #define UNDEAD "ZVW " +#endif /* _DEF_MONST_H_ */ diff --git a/hack/def.obj.h b/hack/def.obj.h index 897046f2..fc40c3c8 100644 --- a/hack/def.obj.h +++ b/hack/def.obj.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.obj.h,v 1.4 1997/10/19 16:57:09 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.obj.h,v 1.3 1995/03/23 08:29:32 cgd Exp $ */ - +#ifndef _DEF_OBJ_H_ +#define _DEF_OBJ_H_ struct obj { struct obj *nobj; unsigned o_id; @@ -49,3 +50,4 @@ extern struct obj *fobj; #define newobj(xl) (struct obj *) alloc((unsigned)(xl) + sizeof(struct obj)) #define ONAME(otmp) ((char *) otmp->oextra) #define OGOLD(otmp) (otmp->oextra[0]) +#endif /* _DEF_OBJ_H_ */ diff --git a/hack/def.objclass.h b/hack/def.objclass.h index 15f7f98d..4281f49f 100644 --- a/hack/def.objclass.h +++ b/hack/def.objclass.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.objclass.h,v 1.4 1997/10/19 16:57:12 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.objclass.h,v 1.3 1995/03/23 08:29:34 cgd Exp $ */ - +#ifndef _DEF_OBJCLASS_H_ +#define _DEF_OBJCLASS_H_ /* definition of a class of objects */ struct objclass { @@ -61,3 +62,4 @@ extern struct objclass objects[]; * hack.invent.c: if(index("!%?[)=*(0/\"", sym)){ * hack.invent.c: || index("%?!*",otmp->olet))){ */ +#endif /* _DEF_OBJCLASS_H_ */ diff --git a/hack/def.objects.h b/hack/def.objects.h index 3876c2aa..6a239957 100644 --- a/hack/def.objects.h +++ b/hack/def.objects.h @@ -1,13 +1,13 @@ +/* $NetBSD: def.objects.h,v 1.4 1997/10/19 16:57:16 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.objects.h,v 1.3 1995/03/23 08:29:36 cgd Exp $ */ - +#ifndef _DEF_OBJECTS_H_ +#define _DEF_OBJECTS_H_ /* objects have letter " % ) ( 0 _ ` [ ! ? / = * */ #include "config.h" #include "def.objclass.h" -#define NULL (char *)0 struct objclass objects[] = { @@ -290,3 +290,4 @@ char obj_symbols[] = { BALL_SYM, CHAIN_SYM, ROCK_SYM, ARMOR_SYM, POTION_SYM, SCROLL_SYM, WAND_SYM, RING_SYM, GEM_SYM, 0 }; int bases[sizeof(obj_symbols)]; +#endif /* _DEF_OBJECTS_H_ */ diff --git a/hack/def.permonst.h b/hack/def.permonst.h index d3c75f47..55ec4fb3 100644 --- a/hack/def.permonst.h +++ b/hack/def.permonst.h @@ -1,9 +1,11 @@ +/* $NetBSD: def.permonst.h,v 1.4 1997/10/19 16:57:19 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. * - * $NetBSD: def.permonst.h,v 1.3 1995/03/23 08:29:37 cgd Exp $ */ - +#ifndef _DEF_PERMONST_H_ +#define _DEF_PERMONST_H_ struct permonst { char *mname,mlet; schar mlevel,mmove,ac,damn,damd; @@ -26,3 +28,5 @@ extern struct permonst mons[]; #define PM_EEL &pm_eel #define PM_WIZARD &pm_wizard #define CMNUM 55 /* number of common monsters */ + +#endif /* _DEF_PERMONST_H_ */ diff --git a/hack/def.rm.h b/hack/def.rm.h index b4ffc81c..632a5956 100644 --- a/hack/def.rm.h +++ b/hack/def.rm.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.rm.h,v 1.4 1997/10/19 16:57:21 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.rm.h,v 1.3 1995/03/23 08:29:39 cgd Exp $ */ - +#ifndef _DEF_RM_H_ +#define _DEF_RM_H_ /* Level location types */ #define HWALL 1 #define VWALL 2 @@ -53,3 +54,4 @@ struct rm { unsigned lit:1; }; extern struct rm levl[COLNO][ROWNO]; +#endif /* _DEF_RM_H_ */ diff --git a/hack/def.trap.h b/hack/def.trap.h index 55477e48..57401f06 100644 --- a/hack/def.trap.h +++ b/hack/def.trap.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.trap.h,v 1.4 1997/10/19 16:57:23 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.trap.h,v 1.3 1995/03/23 08:29:41 cgd Exp $ */ - +#ifndef _DEF_TRAP_H_ +#define _DEF_TRAP_H_ struct trap { struct trap *ntrap; xchar tx,ty; @@ -13,7 +14,6 @@ struct trap { }; extern struct trap *ftrap; -struct trap *t_at(); #define newtrap() (struct trap *) alloc(sizeof(struct trap)) /* various kinds of traps */ @@ -28,3 +28,4 @@ struct trap *t_at(); #define MIMIC 8 /* used only in mklev.c */ #define TRAPNUM 9 /* if not less than 32, change sizeof(ttyp) */ /* see also mtrapseen (bit map) */ +#endif /* _DEF_TRAP_H_ */ diff --git a/hack/def.wseg.h b/hack/def.wseg.h index 35812db3..c7c372d9 100644 --- a/hack/def.wseg.h +++ b/hack/def.wseg.h @@ -1,9 +1,10 @@ +/* $NetBSD: def.wseg.h,v 1.4 1997/10/19 16:57:25 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: def.wseg.h,v 1.3 1995/03/23 08:29:42 cgd Exp $ */ - +#ifndef _DEF_WSEG_H_ +#define _DEF_WSEG_H_ #ifndef NOWORM /* worm structure */ struct wseg { @@ -13,4 +14,5 @@ struct wseg { }; #define newseg() (struct wseg *) alloc(sizeof(struct wseg)) -#endif NOWORM +#endif /* NOWORM */ +#endif /* _DEF_WSEG_H_ */ diff --git a/hack/extern.h b/hack/extern.h new file mode 100644 index 00000000..0a207e34 --- /dev/null +++ b/hack/extern.h @@ -0,0 +1,676 @@ +/* $NetBSD: extern.h,v 1.1 1997/10/19 16:57:28 christos Exp $ */ + +/* + * Copyright (c) 1997 Christos Zoulas. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Christos Zoulas. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _EXTERN_H_ +#define _EXTERN_H_ +#include <stdio.h> +#ifndef __STDC__ +#include <varargs.h> +#else +#include <stdarg.h> +#endif + +/* alloc.c */ +long *alloc __P((unsigned)); +long *alloc __P((unsigned)); +long *enlarge __P((char *, unsigned)); + +/* hack.apply.c */ +int doapply __P((void)); +int holetime __P((void)); +void dighole __P((void)); + +/* hack.bones.c */ +void savebones __P((void)); +int getbones __P((void)); + +/* hack.c */ +void unsee __P((void)); +void seeoff __P((int)); +void domove __P((void)); +void movobj __P((struct obj *, int, int)); +int dopickup __P((void)); +void pickup __P((int)); +void lookaround __P((void)); +int monster_nearby __P((void)); +int cansee __P((xchar, xchar)); +int rroom __P((int, int)); +int cansee __P((xchar, xchar)); +int sgn __P((int)); +void setsee __P((void)); +void setsee __P((void)); +void nomul __P((int)); +int abon __P((void)); +int dbon __P((void)); +void losestr __P((int)); +void losehp __P((int, char *)); +void losehp_m __P((int, struct monst *)); +void losexp __P((void)); +int inv_weight __P((void)); +int inv_cnt __P((void)); +long newuexp __P((void)); + +/* hack.cmd.c */ +void rhack __P((char *)); +int doextcmd __P((void)); +char lowc __P((int)); +char unctrl __P((int)); +int movecmd __P((int)); +int getdir __P((boolean)); +void confdir __P((void)); +int finddir __P((void)); +int isroom __P((int, int)); +int isok __P((int, int)); + +/* hack.do.c */ +int dodrop __P((void)); +void dropx __P((struct obj *)); +void dropy __P((struct obj *)); +int doddrop __P((void)); +int dodown __P((void)); +int doup __P((void)); +void goto_level __P((int, boolean)); +int donull __P((void)); +int dopray __P((void)); +int dothrow __P((void)); +struct obj *splitobj __P((struct obj *, int)); +void more_experienced __P((int, int)); +void set_wounded_legs __P((long, int)); +void heal_legs __P((void)); + +/* hack.do_name.c */ +coord getpos __P((int, char *)); +int do_mname __P((void)); +void do_oname __P((struct obj *)); +int ddocall __P((void)); +void docall __P((struct obj *)); +char *xmonnam __P((struct monst *, int)); +char *lmonnam __P((struct monst *)); +char *monnam __P((struct monst *)); +char *Monnam __P((struct monst *)); +char *amonnam __P((struct monst *, char *)); +char *Amonnam __P((struct monst *, char *)); +char *Xmonnam __P((struct monst *)); +char *visctrl __P((int)); + +/* hack.do_wear.c */ +void off_msg __P((struct obj *)); +int doremarm __P((void)); +int doremring __P((void)); +int dorr __P((struct obj *)); +int cursed __P((struct obj *)); +int armoroff __P((struct obj *)); +int doweararm __P((void)); +int dowearring __P((void)); +void ringoff __P((struct obj *)); +void find_ac __P((void)); +void glibr __P((void)); +struct obj *some_armor __P((void)); +void corrode_armor __P((void)); + +/* hack.dog.c */ +void makedog __P((void)); +void initedog __P((struct monst *)); +void losedogs __P((void)); +void keepdogs __P((void)); +void fall_down __P((struct monst *)); +int dogfood __P((struct obj *)); +int dog_move __P((struct monst *, int)); +int inroom __P((xchar, xchar)); +int tamedog __P((struct monst *, struct obj *)); + +/* hack.eat.c */ +void init_uhunger __P((void)); +int opentin __P((void)); +int Meatdone __P((void)); +int doeat __P((void)); +void gethungry __P((void)); +void morehungry __P((int)); +void lesshungry __P((int)); +int unfaint __P((void)); +void newuhs __P((boolean)); +int poisonous __P((struct obj *)); +int eatcorpse __P((struct obj *)); + +/* hack.end.c */ +int dodone __P((void)); +void done1 __P((int)); +void done_intr __P((int)); +void done_hangup __P((int)); +void done_in_by __P((struct monst *)); +void done __P((char *)); +void topten __P((void)); +void outheader __P((void)); +struct toptenentry; +int outentry __P((int, struct toptenentry *, int)); +char *itoa __P((int)); +char *ordin __P((int)); +void clearlocks __P((void)); +void hangup __P((int)); +char *eos __P((char *)); +void charcat __P((char *, int)); +void prscore __P((int, char **)); + +/* hack.engrave.c */ +struct engr *engr_at __P((xchar, xchar)); +int sengr_at __P((char *, xchar, xchar)); +void u_wipe_engr __P((int)); +void wipe_engr_at __P((xchar, xchar, xchar)); +void read_engr_at __P((int, int)); +void make_engr_at __P((int, int, char *)); +int doengrave __P((void)); +void save_engravings __P((int)); +void rest_engravings __P((int)); +void del_engr __P((struct engr *)); + +/* hack.fight.c */ +int hitmm __P((struct monst *, struct monst *)); +void mondied __P((struct monst *)); +void monstone __P((struct monst *)); +int fightm __P((struct monst *)); +int thitu __P((int, int, char *)); +boolean hmon __P((struct monst *, struct obj *, int)); +int attack __P((struct monst *)); + +/* hack.invent.c */ +struct obj *addinv __P((struct obj *)); +void useup __P((struct obj *)); +void freeinv __P((struct obj *)); +void delobj __P((struct obj *)); +void freeobj __P((struct obj *)); +void freegold __P((struct gold *)); +void deltrap __P((struct trap *)); +struct monst *m_at __P((int, int)); +struct obj *o_at __P((int, int)); +struct obj *sobj_at __P((int, int, int)); +int carried __P((struct obj *)); +int carrying __P((int)); +struct obj *o_on __P((unsigned int, struct obj *)); +struct trap *t_at __P((int, int)); +struct gold *g_at __P((int, int)); +struct obj *mkgoldobj __P((long)); +struct obj *getobj __P((char *, char *)); +int ckunpaid __P((struct obj *)); +int ggetobj __P((char *, int (*fn)(struct obj *), int)); +int askchain __P((struct obj *, char *, int, int (*)(struct obj *), + int (*)(struct obj *), int)); +char obj_to_let __P((struct obj *)); +void prinv __P((struct obj *)); +int ddoinv __P((void)); +void doinv __P((char *)); +int dotypeinv __P((void)); +int dolook __P((void)); +void stackobj __P((struct obj *)); +int merged __P((struct obj *, struct obj *, int)); +int countgold __P((void)); +int doprgold __P((void)); +int doprwep __P((void)); +int doprarm __P((void)); +int doprring __P((void)); +int digit __P((int)); + +/* hack.ioctl.c */ +void getioctls __P((void)); +void setioctls __P((void)); +int dosuspend __P((void)); + +/* hack.lev.c */ +void savelev __P((int, xchar)); +void bwrite __P((int, char *, unsigned)); +void saveobjchn __P((int, struct obj *)); +void savemonchn __P((int, struct monst *)); +void savegoldchn __P((int, struct gold *)); +void savetrapchn __P((int, struct trap *)); +void getlev __P((int, int, xchar)); +void mread __P((int, char *, unsigned)); +void mklev __P((void)); + +/* hack.main.c */ +void glo __P((int)); +void askname __P((void)); +void impossible __P((const char *, ...)) + __attribute__((__format__(__printf__, 1, 2))); +void stop_occupation __P((void)); + +/* hack.makemon.c */ +struct monst *makemon __P((struct permonst *, int, int)); +coord enexto __P((xchar, xchar)); +int goodpos __P((int, int)); +void rloc __P((struct monst *)); +struct monst *mkmon_at __P((int, int, int)); + +/* hack.mhitu.c */ +int mhitu __P((struct monst *)); +int hitu __P((struct monst *, int)); + +/* hack.mklev.c */ +void makelevel __P((void)); +int makerooms __P((void)); +void addrs __P((int, int, int, int)); +void addrsx __P((int, int, int, int, boolean)); +struct mkroom; +int comp __P((const void *, const void *)); +coord finddpos __P((int, int, int, int)); +int okdoor __P((int, int)); +void dodoor __P((int, int, struct mkroom *)); +void dosdoor __P((int, int, struct mkroom *, int)); +int maker __P((schar, schar, schar, schar)); +void makecorridors __P((void)); +void join __P((int, int)); +void make_niches __P((void)); +void makevtele __P((void)); +void makeniche __P((boolean)); +void mktrap __P((int, int, struct mkroom *)); + +/* hack.mkmaze.c */ +void makemaz __P((void)); +void walkfrom __P((int, int)); +void move __P((int *, int *, int)); +int okay __P((int, int, int)); +coord mazexy __P((void)); + +/* hack.mkobj.c */ +struct obj *mkobj_at __P((int, int, int)); +void mksobj_at __P((int, int, int)); +struct obj *mkobj __P((int)); +struct obj *mksobj __P((int)); +int letter __P((int)); +int weight __P((struct obj *)); +void mkgold __P((long, int, int)); + +/* hack.mkshop.c */ +void mkshop __P((void)); +void mkzoo __P((int)); +struct permonst *morguemon __P((void)); +void mkswamp __P((void)); +int nexttodoor __P((int, int)); +int has_dnstairs __P((struct mkroom *)); +int has_upstairs __P((struct mkroom *)); +int isbig __P((struct mkroom *)); +int dist2 __P((int, int, int, int)); +int sq __P((int)); + +/* hack.mon.c */ +void movemon __P((void)); +void justswld __P((struct monst *, char *)); +void youswld __P((struct monst *, int, int, char *)); +int dochugw __P((struct monst *)); +int dochug __P((struct monst *)); +int m_move __P((struct monst *, int)); +void mpickgold __P((struct monst *)); +void mpickgems __P((struct monst *)); +int mfndpos __P((struct monst *, coord[9 ], int[9 ], int)); +int dist __P((int, int)); +void poisoned __P((char *, char *)); +void mondead __P((struct monst *)); +void replmon __P((struct monst *, struct monst *)); +void relmon __P((struct monst *)); +void monfree __P((struct monst *)); +void dmonsfree __P((void)); +void unstuck __P((struct monst *)); +void killed __P((struct monst *)); +void kludge __P((char *, char *)); +void rescham __P((void)); +int newcham __P((struct monst *, struct permonst *)); +void mnexto __P((struct monst *)); +int ishuman __P((struct monst *)); +void setmangry __P((struct monst *)); +int canseemon __P((struct monst *)); + +/* hack.monst.c */ + +/* hack.o_init.c */ +int letindex __P((int)); +void init_objects __P((void)); +int probtype __P((int)); +void setgemprobs __P((void)); +void oinit __P((void)); +void savenames __P((int)); +void restnames __P((int)); +int dodiscovered __P((void)); +int interesting_to_discover __P((int)); + +/* hack.objnam.c */ +char *strprepend __P((char *, char *)); +char *sitoa __P((int)); +char *typename __P((int)); +char *xname __P((struct obj *)); +char *doname __P((struct obj *)); +void setan __P((char *, char *)); +char *aobjnam __P((struct obj *, char *)); +char *Doname __P((struct obj *)); +struct obj *readobjnam __P((char *)); + +/* hack.options.c */ +void initoptions __P((void)); +void parseoptions __P((char *, boolean)); +int doset __P((void)); + +/* hack.pager.c */ +int dowhatis __P((void)); +void intruph __P((int)); +void page_more __P((FILE *, int)); +void set_whole_screen __P((void)); +int readnews __P((void)); +void set_pager __P((int)); +int page_line __P((char *)); +void cornline __P((int, char *)); +int dohelp __P((void)); +int page_file __P((char *, boolean)); +int dosh __P((void)); +int child __P((int)); + +/* hack.potion.c */ +int dodrink __P((void)); +void pluslvl __P((void)); +void strange_feeling __P((struct obj *, char *)); +void potionhit __P((struct monst *, struct obj *)); +void potionbreathe __P((struct obj *)); +int dodip __P((void)); +void ghost_from_bottle __P((void)); + +/* hack.pri.c */ +void swallowed __P((void)); +void panic __P((const char *, ...)) + __attribute__((__format__(__printf__, 1, 2))); +void atl __P((int, int, int)); +void on_scr __P((int, int)); +void tmp_at __P((schar, schar)); +void Tmp_at __P((schar, schar)); +void setclipped __P((void)); +void at __P((xchar, xchar, int)); +void prme __P((void)); +int doredraw __P((void)); +void docrt __P((void)); +void docorner __P((int, int)); +void curs_on_u __P((void)); +void pru __P((void)); +void prl __P((int, int)); +char news0 __P((xchar, xchar)); +void newsym __P((int, int)); +void mnewsym __P((int, int)); +void nosee __P((int, int)); +void prl1 __P((int, int)); +void nose1 __P((int, int)); +int vism_at __P((int, int)); +void pobj __P((struct obj *)); +void unpobj __P((struct obj *)); +void seeobjs __P((void)); +void seemons __P((void)); +void pmon __P((struct monst *)); +void unpmon __P((struct monst *)); +void nscr __P((void)); +void cornbot __P((int)); +void bot __P((void)); +void mstatusline __P((struct monst *)); +void cls __P((void)); + +/* hack.read.c */ +int doread __P((void)); +int identify __P((struct obj *)); +void litroom __P((boolean)); +int monstersym __P((int)); + +/* hack.rip.c */ +void outrip __P((void)); +void center __P((int, char *)); + +/* hack.rumors.c */ +void init_rumors __P((FILE *)); +int skipline __P((FILE *)); +void outline __P((FILE *)); +void outrumor __P((void)); +int used __P((int)); + +/* hack.save.c */ +int dosave __P((void)); +void hangup __P((int)); +int dosave0 __P((int)); +int dorecover __P((int)); +struct obj *restobjchn __P((int)); +struct monst *restmonchn __P((int)); + +/* hack.search.c */ +int findit __P((void)); +int dosearch __P((void)); +int doidtrap __P((void)); +void wakeup __P((struct monst *)); +void seemimic __P((struct monst *)); + +/* hack.shk.c */ +void obfree __P((struct obj *, struct obj *)); +int inshop __P((void)); +int dopay __P((void)); +void paybill __P((void)); +void replshk __P((struct monst *, struct monst *)); +char *shkname __P((struct monst *)); +void shkdead __P((struct monst *)); +void replshk __P((struct monst *, struct monst *)); +int inshop __P((void)); +void obfree __P((struct obj *, struct obj *)); +int dopay __P((void)); +struct bill_x; +struct obj *bp_to_obj __P((struct bill_x *)); +void addtobill __P((struct obj *)); +void splitbill __P((struct obj *, struct obj *)); +void subfrombill __P((struct obj *)); +int doinvbill __P((int)); +int shkcatch __P((struct obj *)); +int shk_move __P((struct monst *)); +void shopdig __P((int)); +int online __P((int, int)); +int follower __P((struct monst *)); + +/* hack.shknam.c */ +void findname __P((char *, int)); + +/* hack.steal.c */ +long somegold __P((void)); +void stealgold __P((struct monst *)); +int stealarm __P((void)); +int steal __P((struct monst *)); +void mpickobj __P((struct monst *, struct obj *)); +int stealamulet __P((struct monst *)); +void relobj __P((struct monst *, int)); + +/* hack.termcap.c */ +void startup __P((void)); +void start_screen __P((void)); +void end_screen __P((void)); +void curs __P((int, int)); +void nocmov __P((int, int)); +void cmov __P((int, int)); +void xputc __P((int)); +void xputs __P((char *)); +void cl_end __P((void)); +void clear_screen __P((void)); +void home __P((void)); +void standoutbeg __P((void)); +void standoutend __P((void)); +void backsp __P((void)); +void bell __P((void)); +void delay_output __P((void)); +void cl_eos __P((void)); + +/* hack.timeout.c */ +void timeout __P((void)); +void stoned_dialogue __P((void)); + +/* hack.topl.c */ +int doredotopl __P((void)); +void redotoplin __P((void)); +void remember_topl __P((void)); +void addtopl __P((char *)); +void xmore __P((char *)); +void more __P((void)); +void cmore __P((char *)); +void clrlin __P((void)); +void pline __P((const char *, ...)) + __attribute__((__format__(__printf__, 1, 2))); +void vpline __P((const char *, va_list)); +void putsym __P((int)); +void putstr __P((char *)); + +/* hack.track.c */ +void initrack __P((void)); +void settrack __P((void)); +coord *gettrack __P((int, int)); + +/* hack.trap.c */ +struct trap *maketrap __P((int, int, int)); +void dotrap __P((struct trap *)); +int mintrap __P((struct monst *)); +void selftouch __P((char *)); +void float_up __P((void)); +void float_down __P((void)); +void vtele __P((void)); +void tele __P((void)); +void teleds __P((int, int)); +int teleok __P((int, int)); +int dotele __P((void)); +void placebc __P((int)); +void unplacebc __P((void)); +void level_tele __P((void)); +void drown __P((void)); + +/* hack.tty.c */ +void gettty __P((void)); +void settty __P((char *)); +void setctty __P((void)); +void setftty __P((void)); +void error __P((const char *, ...)) + __attribute__((__format__(__printf__, 1, 2),__noreturn__)); +void getlin __P((char *)); +void getret __P((void)); +void cgetret __P((char *)); +void xwaitforspace __P((char *)); +char *parse __P((void)); +char readchar __P((void)); +void end_of_input __P((void)); + +/* hack.u_init.c */ +void u_init __P((void)); +struct trobj; +void ini_inv __P((struct trobj *)); +void wiz_inv __P((void)); +void plnamesuffix __P((void)); +int role_index __P((int)); + +/* hack.unix.c */ +void setrandom __P((void)); +struct tm *getlt __P((void)); +int getyear __P((void)); +char *getdate __P((void)); +int phase_of_the_moon __P((void)); +int night __P((void)); +int midnight __P((void)); +void gethdate __P((char *)); +int uptodate __P((int)); +int veryold __P((int)); +void getlock __P((void)); +void getmailstatus __P((void)); +void ckmailstatus __P((void)); +void newmail __P((void)); +void mdrush __P((struct monst *, boolean)); +void readmail __P((void)); +void regularize __P((char *)); + +/* hack.vault.c */ +void setgd __P((void)); +int gd_move __P((void)); +void gddead __P((void)); +void replgd __P((struct monst *, struct monst *)); +void invault __P((void)); +void setgd __P((void)); +void invault __P((void)); +int gd_move __P((void)); +void replgd __P((struct monst *, struct monst *)); + +/* hack.version.c */ +int doversion __P((void)); + +/* hack.wield.c */ +void setuwep __P((struct obj *)); +int dowield __P((void)); +void corrode_weapon __P((void)); +int chwepon __P((struct obj *, int)); + +/* hack.wizard.c */ +void amulet __P((void)); +int wiz_hit __P((struct monst *)); +void inrange __P((struct monst *)); +void aggravate __P((void)); +void clonewiz __P((struct monst *)); + +/* hack.worm.c */ +#ifndef NOWORM +int getwn __P((struct monst *)); +void initworm __P((struct monst *)); +void worm_move __P((struct monst *)); +void worm_nomove __P((struct monst *)); +void wormdead __P((struct monst *)); +void wormhit __P((struct monst *)); +void wormsee __P((unsigned)); +struct wseg; +void pwseg __P((struct wseg *)); +void cutworm __P((struct monst *, xchar, xchar, uchar)); +void remseg __P((struct wseg *)); +#endif + +/* hack.worn.c */ +void setworn __P((struct obj *, long)); +void setnotworn __P((struct obj *)); + +/* hack.zap.c */ +void bhitm __P((struct monst *, struct obj *)); +int bhito __P((struct obj *, struct obj *)); +int dozap __P((void)); +char *exclam __P((int)); +void hit __P((char *, struct monst *, char *)); +void miss __P((char *, struct monst *)); +struct monst *bhit __P((int, int, int, int, + void (*)(struct monst *, struct obj *), + int (*)(struct obj *, struct obj *), + struct obj *)); +struct monst *boomhit __P((int, int)); +char dirlet __P((int, int)); +void buzz __P((int, xchar, xchar, int, int)); +int zhit __P((struct monst *, int)); +int revive __P((struct obj *)); +void rloco __P((struct obj *)); +void fracture_rock __P((struct obj *)); +void burn_scrolls __P((void)); + +/* rnd.c */ +int rn1 __P((int, int)); +int rn2 __P((int)); +int rnd __P((int)); +int d __P((int, int)); +#endif /* _EXTERN_H_ */ diff --git a/hack/hack.Decl.c b/hack/hack.Decl.c index c7688dc6..09051a8c 100644 --- a/hack/hack.Decl.c +++ b/hack/hack.Decl.c @@ -1,48 +1,52 @@ +/* $NetBSD: hack.Decl.c,v 1.4 1997/10/19 16:57:30 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.Decl.c,v 1.3 1995/03/23 08:29:45 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.Decl.c,v 1.4 1997/10/19 16:57:30 christos Exp $"); +#endif /* not lint */ #include "hack.h" -char nul[40]; /* contains zeros */ -char plname[PL_NSIZ]; /* player name */ -char lock[PL_NSIZ+4] = "1lock"; /* long enough for login name .99 */ +char nul[40]; /* contains zeros */ +char plname[PL_NSIZ];/* player name */ +char lock[PL_NSIZ + 4] = "1lock"; /* long enough for login name + * .99 */ -boolean in_mklev, restoring; +boolean in_mklev, restoring; -struct rm levl[COLNO][ROWNO]; /* level map */ +struct rm levl[COLNO][ROWNO]; /* level map */ #ifndef QUEST #include "def.mkroom.h" -struct mkroom rooms[MAXNROFROOMS+1]; -coord doors[DOORMAX]; -#endif QUEST -struct monst *fmon = 0; -struct trap *ftrap = 0; -struct gold *fgold = 0; -struct obj *fobj = 0, *fcobj = 0, *invent = 0, *uwep = 0, *uarm = 0, - *uarm2 = 0, *uarmh = 0, *uarms = 0, *uarmg = 0, *uright = 0, - *uleft = 0, *uchain = 0, *uball = 0; -struct flag flags; -struct you u; -struct monst youmonst; /* dummy; used as return value for boomhit */ - -xchar dlevel = 1; -xchar xupstair, yupstair, xdnstair, ydnstair; -char *save_cm = 0, *killer, *nomovemsg; - -long moves = 1; -long wailmsg = 0; - -int multi = 0; -char genocided[60]; -char fut_geno[60]; - -xchar curx,cury; -xchar seelx, seehx, seely, seehy; /* corners of lit room */ - -coord bhitpos; - -char quitchars[] = " \r\n\033"; +struct mkroom rooms[MAXNROFROOMS + 1]; +coord doors[DOORMAX]; +#endif /* QUEST */ +struct monst *fmon = 0; +struct trap *ftrap = 0; +struct gold *fgold = 0; +struct obj *fobj = 0, *fcobj = 0, *invent = 0, *uwep = 0, *uarm = 0, *uarm2 = 0, + *uarmh = 0, *uarms = 0, *uarmg = 0, *uright = 0, *uleft = 0, + *uchain = 0, *uball = 0; +struct flag flags; +struct you u; +struct monst youmonst; /* dummy; used as return value for boomhit */ + +xchar dlevel = 1; +xchar xupstair, yupstair, xdnstair, ydnstair; +char *save_cm = 0, *killer, *nomovemsg; + +long moves = 1; +long wailmsg = 0; + +int multi = 0; +char genocided[60]; +char fut_geno[60]; + +xchar curx, cury; +xchar seelx, seehx, seely, seehy; /* corners of lit room */ + +coord bhitpos; + +char quitchars[] = " \r\n\033"; diff --git a/hack/hack.apply.c b/hack/hack.apply.c index 46bdc64f..af727d0d 100644 --- a/hack/hack.apply.c +++ b/hack/hack.apply.c @@ -1,43 +1,53 @@ +/* $NetBSD: hack.apply.c,v 1.5 1997/10/19 16:57:32 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.apply.c,v 1.4 1995/03/23 08:29:47 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.apply.c,v 1.5 1997/10/19 16:57:32 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" #include "def.edog.h" #include "def.mkroom.h" -static struct monst *bchit(); -extern struct obj *addinv(); -extern struct trap *maketrap(); -extern int (*occupation)(); -extern char *occtxt; -extern char quitchars[]; -extern char pl_character[]; -static void use_camera(), use_ice_box(), use_whistle(), use_magic_whistle(); -static int use_pick_axe(); +static void use_camera __P((struct obj *)); +static int in_ice_box __P((struct obj *)); +static int ck_ice_box __P((struct obj *)); +static int out_ice_box __P((struct obj *)); +static void use_ice_box __P((struct obj *)); +static struct monst *bchit __P((int, int , int , int)); +static void use_whistle __P((struct obj *)); +static void use_magic_whistle __P((struct obj *)); +static int dig __P((void)); +static int use_pick_axe __P((struct obj *)); -doapply() { - register struct obj *obj; - register int res = 1; +int +doapply() +{ + struct obj *obj; + int res = 1; obj = getobj("(", "use or apply"); - if(!obj) return(0); + if (!obj) + return (0); - switch(obj->otyp){ + switch (obj->otyp) { case EXPENSIVE_CAMERA: - use_camera(obj); break; + use_camera(obj); + break; case ICE_BOX: - use_ice_box(obj); break; + use_ice_box(obj); + break; case PICK_AXE: res = use_pick_axe(obj); break; case MAGIC_WHISTLE: - if(pl_character[0] == 'W' || u.ulevel > 9) { + if (pl_character[0] == 'W' || u.ulevel > 9) { use_magic_whistle(obj); break; } @@ -47,93 +57,99 @@ doapply() { break; case CAN_OPENER: - if(!carrying(TIN)) { + if (!carrying(TIN)) { pline("You have no can to open."); goto xit; } pline("You cannot open a tin without eating its contents."); pline("In order to eat, use the 'e' command."); - if(obj != uwep) - pline("Opening the tin will be much easier if you wield the can-opener."); + if (obj != uwep) + pline("Opening the tin will be much easier if you wield the can-opener."); goto xit; default: pline("Sorry, I don't know how to use that."); - xit: +xit: nomul(0); - return(0); + return (0); } nomul(0); - return(res); + return (res); } /* ARGSUSED */ static void -use_camera(obj) /* register */ struct obj *obj; { -register struct monst *mtmp; - if(!getdir(1)){ /* ask: in what direction? */ +use_camera(obj) /* */ + struct obj *obj; +{ + struct monst *mtmp; + if (!getdir(1)) { /* ask: in what direction? */ flags.move = multi = 0; return; } - if(u.uswallow) { + if (u.uswallow) { pline("You take a picture of %s's stomach.", monnam(u.ustuck)); return; } - if(u.dz) { + if (u.dz) { pline("You take a picture of the %s.", - (u.dz > 0) ? "floor" : "ceiling"); + (u.dz > 0) ? "floor" : "ceiling"); return; } - if(mtmp = bchit(u.dx, u.dy, COLNO, '!')) { - if(mtmp->msleep){ + if ((mtmp = bchit(u.dx, u.dy, COLNO, '!')) != NULL) { + if (mtmp->msleep) { mtmp->msleep = 0; - pline("The flash awakens %s.", monnam(mtmp)); /* a3 */ - } else - if(mtmp->data->mlet != 'y') - if(mtmp->mcansee || mtmp->mblinded){ - register int tmp = dist(mtmp->mx,mtmp->my); - register int tmp2; - if(cansee(mtmp->mx,mtmp->my)) - pline("%s is blinded by the flash!", Monnam(mtmp)); - setmangry(mtmp); - if(tmp < 9 && !mtmp->isshk && rn2(4)) { - mtmp->mflee = 1; - if(rn2(4)) mtmp->mfleetim = rnd(100); + pline("The flash awakens %s.", monnam(mtmp)); /* a3 */ + } else if (mtmp->data->mlet != 'y') + if (mtmp->mcansee || mtmp->mblinded) { + int tmp = dist(mtmp->mx, mtmp->my); + int tmp2; + if (cansee(mtmp->mx, mtmp->my)) + pline("%s is blinded by the flash!", Monnam(mtmp)); + setmangry(mtmp); + if (tmp < 9 && !mtmp->isshk && rn2(4)) { + mtmp->mflee = 1; + if (rn2(4)) + mtmp->mfleetim = rnd(100); + } + if (tmp < 3) + mtmp->mcansee = mtmp->mblinded = 0; + else { + tmp2 = mtmp->mblinded; + tmp2 += rnd(1 + 50 / tmp); + if (tmp2 > 127) + tmp2 = 127; + mtmp->mblinded = tmp2; + mtmp->mcansee = 0; + } } - if(tmp < 3) mtmp->mcansee = mtmp->mblinded = 0; - else { - tmp2 = mtmp->mblinded; - tmp2 += rnd(1 + 50/tmp); - if(tmp2 > 127) tmp2 = 127; - mtmp->mblinded = tmp2; - mtmp->mcansee = 0; - } - } } } static -struct obj *current_ice_box; /* a local variable of use_ice_box, to be - used by its local procedures in/ck_ice_box */ -static -in_ice_box(obj) register struct obj *obj; { - if(obj == current_ice_box || - (Punished && (obj == uball || obj == uchain))){ +struct obj *current_ice_box;/* a local variable of use_ice_box, to be + * used by its local procedures in/ck_ice_box */ +static int +in_ice_box(obj) + struct obj *obj; +{ + if (obj == current_ice_box || + (Punished && (obj == uball || obj == uchain))) { pline("You must be kidding."); - return(0); + return (0); } - if(obj->owornmask & (W_ARMOR | W_RING)) { + if (obj->owornmask & (W_ARMOR | W_RING)) { pline("You cannot refrigerate something you are wearing."); - return(0); + return (0); } - if(obj->owt + current_ice_box->owt > 70) { + if (obj->owt + current_ice_box->owt > 70) { pline("It won't fit."); - return(1); /* be careful! */ + return (1); /* be careful! */ } - if(obj == uwep) { - if(uwep->cursed) { + if (obj == uwep) { + if (uwep->cursed) { pline("Your weapon is welded to your hand!"); - return(0); + return (0); } setuwep((struct obj *) 0); } @@ -143,84 +159,102 @@ in_ice_box(obj) register struct obj *obj; { obj->nobj = fcobj; fcobj = obj; obj->age = moves - obj->age; /* actual age */ - return(1); + return (1); } -static -ck_ice_box(obj) register struct obj *obj; { - return(obj->o_cnt_id == current_ice_box->o_id); +static int +ck_ice_box(obj) + struct obj *obj; +{ + return (obj->o_cnt_id == current_ice_box->o_id); } -static -out_ice_box(obj) register struct obj *obj; { -register struct obj *otmp; - if(obj == fcobj) fcobj = fcobj->nobj; +static int +out_ice_box(obj) + struct obj *obj; +{ + struct obj *otmp; + if (obj == fcobj) + fcobj = fcobj->nobj; else { - for(otmp = fcobj; otmp->nobj != obj; otmp = otmp->nobj) - if(!otmp->nobj) panic("out_ice_box"); + for (otmp = fcobj; otmp->nobj != obj; otmp = otmp->nobj) + if (!otmp->nobj) + panic("out_ice_box"); otmp->nobj = obj->nobj; } current_ice_box->owt -= obj->owt; obj->age = moves - obj->age; /* simulated point of time */ (void) addinv(obj); + return 0; } static void -use_ice_box(obj) register struct obj *obj; { -register int cnt = 0; -register struct obj *otmp; +use_ice_box(obj) + struct obj *obj; +{ + int cnt = 0; + struct obj *otmp; current_ice_box = obj; /* for use by in/out_ice_box */ - for(otmp = fcobj; otmp; otmp = otmp->nobj) - if(otmp->o_cnt_id == obj->o_id) + for (otmp = fcobj; otmp; otmp = otmp->nobj) + if (otmp->o_cnt_id == obj->o_id) cnt++; - if(!cnt) pline("Your ice-box is empty."); + if (!cnt) + pline("Your ice-box is empty."); else { - pline("Do you want to take something out of the ice-box? [yn] "); - if(readchar() == 'y') - if(askchain(fcobj, (char *) 0, 0, out_ice_box, ck_ice_box, 0)) - return; + pline("Do you want to take something out of the ice-box? [yn] "); + if (readchar() == 'y') + if (askchain(fcobj, (char *) 0, 0, out_ice_box, ck_ice_box, 0)) + return; pline("That was all. Do you wish to put something in? [yn] "); - if(readchar() != 'y') return; + if (readchar() != 'y') + return; } /* call getobj: 0: allow cnt; #: allow all types; %: expect food */ otmp = getobj("0#%", "put in"); - if(!otmp || !in_ice_box(otmp)) + if (!otmp || !in_ice_box(otmp)) flags.move = multi = 0; } -static -struct monst * -bchit(ddx,ddy,range,sym) register int ddx,ddy,range; char sym; { - register struct monst *mtmp = (struct monst *) 0; - register int bchx = u.ux, bchy = u.uy; +static struct monst * +bchit(ddx, ddy, range, sym) + int ddx, ddy, range; + char sym; +{ + struct monst *mtmp = (struct monst *) 0; + int bchx = u.ux, bchy = u.uy; - if(sym) Tmp_at(-1, sym); /* open call */ - while(range--) { + if (sym) + Tmp_at(-1, sym);/* open call */ + while (range--) { bchx += ddx; bchy += ddy; - if(mtmp = m_at(bchx,bchy)) + if ((mtmp = m_at(bchx, bchy)) != NULL) break; - if(!ZAP_POS(levl[bchx][bchy].typ)) { + if (!ZAP_POS(levl[bchx][bchy].typ)) { bchx -= ddx; bchy -= ddy; break; } - if(sym) Tmp_at(bchx, bchy); + if (sym) + Tmp_at(bchx, bchy); } - if(sym) Tmp_at(-1, -1); - return(mtmp); + if (sym) + Tmp_at(-1, -1); + return (mtmp); } /* ARGSUSED */ static void -use_whistle(obj) struct obj *obj; { -register struct monst *mtmp = fmon; +use_whistle(obj) + struct obj *obj; +{ + struct monst *mtmp = fmon; pline("You produce a high whistling sound."); - while(mtmp) { - if(dist(mtmp->mx,mtmp->my) < u.ulevel*20) { - if(mtmp->msleep) + while (mtmp) { + if (dist(mtmp->mx, mtmp->my) < u.ulevel * 20) { + if (mtmp->msleep) mtmp->msleep = 0; - if(mtmp->mtame) + if (mtmp->mtame) EDOG(mtmp)->whistletime = moves; } mtmp = mtmp->nmon; @@ -229,185 +263,189 @@ register struct monst *mtmp = fmon; /* ARGSUSED */ static void -use_magic_whistle(obj) struct obj *obj; { -register struct monst *mtmp = fmon; +use_magic_whistle(obj) + struct obj *obj; +{ + struct monst *mtmp = fmon; pline("You produce a strange whistling sound."); - while(mtmp) { - if(mtmp->mtame) mnexto(mtmp); + while (mtmp) { + if (mtmp->mtame) + mnexto(mtmp); mtmp = mtmp->nmon; } } -static int dig_effort; /* effort expended on current pos */ -static uchar dig_level; -static coord dig_pos; -static boolean dig_down; +static int dig_effort; /* effort expended on current pos */ +static uchar dig_level; +static coord dig_pos; +static boolean dig_down; -static -dig() { - register struct rm *lev; - register dpx = dig_pos.x, dpy = dig_pos.y; +static int +dig() +{ + struct rm *lev; + int dpx = dig_pos.x, dpy = dig_pos.y; /* perhaps a nymph stole his pick-axe while he was busy digging */ /* or perhaps he teleported away */ - if(u.uswallow || !uwep || uwep->otyp != PICK_AXE || + if (u.uswallow || !uwep || uwep->otyp != PICK_AXE || dig_level != dlevel || ((dig_down && (dpx != u.ux || dpy != u.uy)) || - (!dig_down && dist(dpx,dpy) > 2))) - return(0); + (!dig_down && dist(dpx, dpy) > 2))) + return (0); dig_effort += 10 + abon() + uwep->spe + rn2(5); - if(dig_down) { - if(!xdnstair) { + if (dig_down) { + if (!xdnstair) { pline("The floor here seems too hard to dig in."); - return(0); + return (0); } - if(dig_effort > 250) { + if (dig_effort > 250) { dighole(); - return(0); /* done with digging */ + return (0); /* done with digging */ } - if(dig_effort > 50) { - register struct trap *ttmp = t_at(dpx,dpy); + if (dig_effort > 50) { + struct trap *ttmp = t_at(dpx, dpy); - if(!ttmp) { - ttmp = maketrap(dpx,dpy,PIT); + if (!ttmp) { + ttmp = maketrap(dpx, dpy, PIT); ttmp->tseen = 1; pline("You have dug a pit."); - u.utrap = rn1(4,2); + u.utrap = rn1(4, 2); u.utraptype = TT_PIT; - return(0); + return (0); } } - } else - if(dig_effort > 100) { - register char *digtxt; - register struct obj *obj; + } else if (dig_effort > 100) { + char *digtxt; + struct obj *obj; lev = &levl[dpx][dpy]; - if(obj = sobj_at(ENORMOUS_ROCK, dpx, dpy)) { + if ((obj = sobj_at(ENORMOUS_ROCK, dpx, dpy)) != NULL) { fracture_rock(obj); digtxt = "The rock falls apart."; - } else if(!lev->typ || lev->typ == SCORR) { + } else if (!lev->typ || lev->typ == SCORR) { lev->typ = CORR; digtxt = "You succeeded in cutting away some rock."; - } else if(lev->typ == HWALL || lev->typ == VWALL - || lev->typ == SDOOR) { + } else if (lev->typ == HWALL || lev->typ == VWALL + || lev->typ == SDOOR) { lev->typ = xdnstair ? DOOR : ROOM; digtxt = "You just made an opening in the wall."; } else - digtxt = "Now what exactly was it that you were digging in?"; + digtxt = "Now what exactly was it that you were digging in?"; mnewsym(dpx, dpy); prl(dpx, dpy); - pline(digtxt); /* after mnewsym & prl */ - return(0); + pline(digtxt); /* after mnewsym & prl */ + return (0); } else { - if(IS_WALL(levl[dpx][dpy].typ)) { - register int rno = inroom(dpx,dpy); + if (IS_WALL(levl[dpx][dpy].typ)) { + int rno = inroom(dpx, dpy); - if(rno >= 0 && rooms[rno].rtype >= 8) { - pline("This wall seems too hard to dig into."); - return(0); + if (rno >= 0 && rooms[rno].rtype >= 8) { + pline("This wall seems too hard to dig into."); + return (0); } } pline("You hit the rock with all your might."); } - return(1); + return (1); } /* When will hole be finished? Very rough indication used by shopkeeper. */ -holetime() { - return( (occupation == dig) ? (250 - dig_effort)/20 : -1); +int +holetime() +{ + return ((occupation == dig) ? (250 - dig_effort) / 20 : -1); } +void dighole() { - register struct trap *ttmp = t_at(u.ux, u.uy); + struct trap *ttmp = t_at(u.ux, u.uy); - if(!xdnstair) { + if (!xdnstair) { pline("The floor here seems too hard to dig in."); } else { - if(ttmp) + if (ttmp) ttmp->ttyp = TRAPDOOR; else ttmp = maketrap(u.ux, u.uy, TRAPDOOR); ttmp->tseen = 1; pline("You've made a hole in the floor."); - if(!u.ustuck) { - if(inshop()) + if (!u.ustuck) { + if (inshop()) shopdig(1); pline("You fall through ..."); - if(u.utraptype == TT_PIT) { + if (u.utraptype == TT_PIT) { u.utrap = 0; u.utraptype = 0; } - goto_level(dlevel+1, FALSE); + goto_level(dlevel + 1, FALSE); } } } -static +static int use_pick_axe(obj) -struct obj *obj; + struct obj *obj; { - char dirsyms[12]; - extern char sdir[]; - register char *dsp = dirsyms, *sdp = sdir; - register struct monst *mtmp; - register struct rm *lev; - register int rx, ry, res = 0; + char dirsyms[12]; + char *dsp = dirsyms, *sdp = sdir; + struct monst *mtmp; + struct rm *lev; + int rx, ry, res = 0; - if(obj != uwep) { - if(uwep && uwep->cursed) { + if (obj != uwep) { + if (uwep && uwep->cursed) { /* Andreas Bormann - ihnp4!decvax!mcvax!unido!ab */ pline("Since your weapon is welded to your hand,"); pline("you cannot use that pick-axe."); - return(0); + return (0); } pline("You now wield %s.", doname(obj)); setuwep(obj); res = 1; } - while(*sdp) { + while (*sdp) { (void) movecmd(*sdp); /* sets u.dx and u.dy and u.dz */ rx = u.ux + u.dx; ry = u.uy + u.dy; - if(u.dz > 0 || (u.dz == 0 && isok(rx, ry) && - (IS_ROCK(levl[rx][ry].typ) - || sobj_at(ENORMOUS_ROCK, rx, ry)))) + if (u.dz > 0 || (u.dz == 0 && isok(rx, ry) && + (IS_ROCK(levl[rx][ry].typ) + || sobj_at(ENORMOUS_ROCK, rx, ry)))) *dsp++ = *sdp; sdp++; } *dsp = 0; pline("In what direction do you want to dig? [%s] ", dirsyms); - if(!getdir(0)) /* no txt */ - return(res); - if(u.uswallow && attack(u.ustuck)) /* return(1) */; - else - if(u.dz < 0) + if (!getdir(0)) /* no txt */ + return (res); + if (u.uswallow && attack(u.ustuck)) /* return(1) */ + ; + else if (u.dz < 0) pline("You cannot reach the ceiling."); - else - if(u.dz == 0) { - if(Confusion) + else if (u.dz == 0) { + if (Confusion) confdir(); rx = u.ux + u.dx; ry = u.uy + u.dy; - if((mtmp = m_at(rx, ry)) && attack(mtmp)) - return(1); - if(!isok(rx, ry)) { + if ((mtmp = m_at(rx, ry)) && attack(mtmp)) + return (1); + if (!isok(rx, ry)) { pline("Clash!"); - return(1); + return (1); } lev = &levl[rx][ry]; - if(lev->typ == DOOR) + if (lev->typ == DOOR) pline("Your %s against the door.", - aobjnam(obj, "clang")); - else if(!IS_ROCK(lev->typ) - && !sobj_at(ENORMOUS_ROCK, rx, ry)) { + aobjnam(obj, "clang")); + else if (!IS_ROCK(lev->typ) + && !sobj_at(ENORMOUS_ROCK, rx, ry)) { /* ACCESSIBLE or POOL */ pline("You swing your %s through thin air.", - aobjnam(obj, (char *) 0)); + aobjnam(obj, (char *) 0)); } else { - if(dig_pos.x != rx || dig_pos.y != ry + if (dig_pos.x != rx || dig_pos.y != ry || dig_level != dlevel || dig_down) { dig_down = FALSE; dig_pos.x = rx; @@ -420,10 +458,10 @@ struct obj *obj; occupation = dig; occtxt = "digging"; } - } else if(Levitation) { + } else if (Levitation) { pline("You cannot reach the floor."); } else { - if(dig_pos.x != u.ux || dig_pos.y != u.uy + if (dig_pos.x != u.ux || dig_pos.y != u.uy || dig_level != dlevel || !dig_down) { dig_down = TRUE; dig_pos.x = u.ux; @@ -431,12 +469,12 @@ struct obj *obj; dig_level = dlevel; dig_effort = 0; pline("You start digging in the floor."); - if(inshop()) + if (inshop()) shopdig(0); } else pline("You continue digging in the floor."); occupation = dig; occtxt = "digging"; } - return(1); + return (1); } diff --git a/hack/hack.bones.c b/hack/hack.bones.c index b495294c..177034a8 100644 --- a/hack/hack.bones.c +++ b/hack/hack.bones.c @@ -1,42 +1,50 @@ +/* $NetBSD: hack.bones.c,v 1.4 1997/10/19 16:57:34 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.bones.c,v 1.3 1995/03/23 08:29:48 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.bones.c,v 1.4 1997/10/19 16:57:34 christos Exp $"); +#endif /* not lint */ #include "hack.h" -extern char plname[PL_NSIZ]; -extern long somegold(); -extern struct monst *makemon(); -extern struct permonst pm_ghost; +#include "extern.h" +#include <fcntl.h> +#include <unistd.h> -char bones[] = "bones_xx"; +char bones[] = "bones_xx"; /* save bones and possessions of a deceased adventurer */ -savebones(){ -register fd; -register struct obj *otmp; -register struct trap *ttmp; -register struct monst *mtmp; - if(dlevel <= 0 || dlevel > MAXLEVEL) return; - if(!rn2(1 + dlevel/2)) return; /* not so many ghosts on low levels */ - bones[6] = '0' + (dlevel/10); - bones[7] = '0' + (dlevel%10); - if((fd = open(bones,0)) >= 0){ +void +savebones() +{ + int fd; + struct obj *otmp; + struct trap *ttmp; + struct monst *mtmp; + + if (dlevel <= 0 || dlevel > MAXLEVEL) + return; + if (!rn2(1 + dlevel / 2)) + return; /* not so many ghosts on low levels */ + bones[6] = '0' + (dlevel / 10); + bones[7] = '0' + (dlevel % 10); + if ((fd = open(bones, 0)) >= 0) { (void) close(fd); return; } /* drop everything; the corpse's possessions are usually cursed */ otmp = invent; - while(otmp){ + while (otmp) { otmp->ox = u.ux; otmp->oy = u.uy; - otmp->age = 0; /* very long ago */ + otmp->age = 0; /* very long ago */ otmp->owornmask = 0; - if(rn2(5)) otmp->cursed = 1; - if(!otmp->nobj){ + if (rn2(5)) + otmp->cursed = 1; + if (!otmp->nobj) { otmp->nobj = fobj; fobj = invent; invent = 0; /* superfluous */ @@ -44,57 +52,68 @@ register struct monst *mtmp; } otmp = otmp->nobj; } - if(!(mtmp = makemon(PM_GHOST, u.ux, u.uy))) return; + if (!(mtmp = makemon(PM_GHOST, u.ux, u.uy))) + return; mtmp->mx = u.ux; mtmp->my = u.uy; mtmp->msleep = 1; (void) strcpy((char *) mtmp->mextra, plname); - mkgold(somegold() + d(dlevel,30), u.ux, u.uy); - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon){ + mkgold(somegold() + d(dlevel, 30), u.ux, u.uy); + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { mtmp->m_id = 0; - if(mtmp->mtame) { + if (mtmp->mtame) { mtmp->mtame = 0; mtmp->mpeaceful = 0; } mtmp->mlstmv = 0; - if(mtmp->mdispl) unpmon(mtmp); + if (mtmp->mdispl) + unpmon(mtmp); } - for(ttmp = ftrap; ttmp; ttmp = ttmp->ntrap) + for (ttmp = ftrap; ttmp; ttmp = ttmp->ntrap) ttmp->tseen = 0; - for(otmp = fobj; otmp; otmp = otmp->nobj) { + for (otmp = fobj; otmp; otmp = otmp->nobj) { otmp->o_id = 0; - /* otmp->o_cnt_id = 0; - superfluous */ + /* otmp->o_cnt_id = 0; - superfluous */ otmp->onamelth = 0; otmp->known = 0; otmp->invlet = 0; - if(otmp->olet == AMULET_SYM && !otmp->spe) { - otmp->spe = -1; /* no longer the actual amulet */ - otmp->cursed = 1; /* flag as gotten from a ghost */ + if (otmp->olet == AMULET_SYM && !otmp->spe) { + otmp->spe = -1; /* no longer the actual amulet */ + otmp->cursed = 1; /* flag as gotten from a + * ghost */ } } - if((fd = creat(bones, FMASK)) < 0) return; - savelev(fd,dlevel); + if ((fd = creat(bones, FMASK)) < 0) + return; + savelev(fd, dlevel); (void) close(fd); } -getbones(){ -register fd,x,y,ok; - if(rn2(3)) return(0); /* only once in three times do we find bones */ - bones[6] = '0' + dlevel/10; - bones[7] = '0' + dlevel%10; - if((fd = open(bones, 0)) < 0) return(0); - if((ok = uptodate(fd)) != 0){ +int +getbones() +{ + int fd, x, y, ok; + + if (rn2(3)) + return (0); /* only once in three times do we find bones */ + bones[6] = '0' + dlevel / 10; + bones[7] = '0' + dlevel % 10; + if ((fd = open(bones, 0)) < 0) + return (0); + if ((ok = uptodate(fd)) != 0) { getlev(fd, 0, dlevel); - for(x = 0; x < COLNO; x++) for(y = 0; y < ROWNO; y++) - levl[x][y].seen = levl[x][y].new = 0; + for (x = 0; x < COLNO; x++) + for (y = 0; y < ROWNO; y++) + levl[x][y].seen = levl[x][y].new = 0; } (void) close(fd); #ifdef WIZARD - if(!wizard) /* duvel!frans: don't remove bones while debugging */ -#endif WiZARD - if(unlink(bones) < 0){ - pline("Cannot unlink %s .", bones); - return(0); - } - return(ok); + if (!wizard) /* duvel!frans: don't remove bones while + * debugging */ +#endif /* WiZARD */ + if (unlink(bones) < 0) { + pline("Cannot unlink %s .", bones); + return (0); + } + return (ok); } diff --git a/hack/hack.c b/hack/hack.c index 5261e183..ca523816 100644 --- a/hack/hack.c +++ b/hack/hack.c @@ -1,112 +1,115 @@ +/* $NetBSD: hack.c,v 1.4 1997/10/19 16:57:37 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.c,v 1.3 1995/03/23 08:29:50 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.c,v 1.4 1997/10/19 16:57:37 christos Exp $"); +#endif /* not lint */ #include "hack.h" -#include <stdio.h> - -extern char news0(); -extern char *nomovemsg; -extern char *exclam(); -extern struct obj *addinv(); -extern boolean hmon(); - -/* called on movement: - 1. when throwing ball+chain far away - 2. when teleporting - 3. when walking out of a lit room - */ -unsee() { - register x,y; - register struct rm *lev; +#include "extern.h" /* - if(u.udispl){ - u.udispl = 0; - newsym(u.udisx, u.udisy); - } -*/ + * called on movement: 1. when throwing ball+chain far away 2. when + * teleporting 3. when walking out of a lit room + */ +void +unsee() +{ + int x, y; + struct rm *lev; + + /* + if(u.udispl){ + u.udispl = 0; + newsym(u.udisx, u.udisy); + } + */ #ifndef QUEST - if(seehx){ + if (seehx) { seehx = 0; } else -#endif QUEST - for(x = u.ux-1; x < u.ux+2; x++) - for(y = u.uy-1; y < u.uy+2; y++) { - if(!isok(x, y)) continue; - lev = &levl[x][y]; - if(!lev->lit && lev->scrsym == '.') { - lev->scrsym =' '; - lev->new = 1; - on_scr(x,y); - } - } +#endif /* QUEST */ + for (x = u.ux - 1; x < u.ux + 2; x++) + for (y = u.uy - 1; y < u.uy + 2; y++) { + if (!isok(x, y)) + continue; + lev = &levl[x][y]; + if (!lev->lit && lev->scrsym == '.') { + lev->scrsym = ' '; + lev->new = 1; + on_scr(x, y); + } + } } -/* called: - in hack.eat.c: seeoff(0) - blind after eating rotten food - in hack.mon.c: seeoff(0) - blinded by a yellow light - in hack.mon.c: seeoff(1) - swallowed - in hack.do.c: seeoff(0) - blind after drinking potion - in hack.do.c: seeoff(1) - go up or down the stairs - in hack.trap.c:seeoff(1) - fall through trapdoor +/* + * called: in hack.eat.c: seeoff(0) - blind after eating rotten food in + * hack.mon.c: seeoff(0) - blinded by a yellow light in hack.mon.c: seeoff(1) + * - swallowed in hack.do.c: seeoff(0) - blind after drinking potion in + * hack.do.c: seeoff(1) - go up or down the stairs in hack.trap.c:seeoff(1) + * - fall through trapdoor */ -seeoff(mode) /* 1 to redo @, 0 to leave them */ -{ /* 1 means misc movement, 0 means blindness */ - register x,y; - register struct rm *lev; +void +seeoff(mode) + int mode; /* 1 to redo @, 0 to leave them *//* 1 means + * misc movement, 0 means blindness */ +{ + int x, y; + struct rm *lev; - if(u.udispl && mode){ + if (u.udispl && mode) { u.udispl = 0; - levl[u.udisx][u.udisy].scrsym = news0(u.udisx,u.udisy); + levl[u.udisx][u.udisy].scrsym = news0(u.udisx, u.udisy); } #ifndef QUEST - if(seehx) { + if (seehx) { seehx = 0; } else -#endif QUEST - if(!mode) { - for(x = u.ux-1; x < u.ux+2; x++) - for(y = u.uy-1; y < u.uy+2; y++) { - if(!isok(x, y)) continue; +#endif /* QUEST */ + if (!mode) { + for (x = u.ux - 1; x < u.ux + 2; x++) + for (y = u.uy - 1; y < u.uy + 2; y++) { + if (!isok(x, y)) + continue; lev = &levl[x][y]; - if(!lev->lit && lev->scrsym == '.') + if (!lev->lit && lev->scrsym == '.') lev->seen = 0; } } } +void domove() { - xchar oldx,oldy; - register struct monst *mtmp; - register struct rm *tmpr,*ust; - struct trap *trap; - register struct obj *otmp; + xchar oldx, oldy; + struct monst *mtmp = NULL; + struct rm *tmpr, *ust; + struct trap *trap = NULL; + struct obj *otmp = NULL; u_wipe_engr(rnd(5)); - if(inv_weight() > 0){ + if (inv_weight() > 0) { pline("You collapse under your load."); nomul(0); return; } - if(u.uswallow) { + if (u.uswallow) { u.dx = u.dy = 0; u.ux = u.ustuck->mx; u.uy = u.ustuck->my; } else { - if(Confusion) { + if (Confusion) { do { confdir(); - } while(!isok(u.ux+u.dx, u.uy+u.dy) || - IS_ROCK(levl[u.ux+u.dx][u.uy+u.dy].typ)); + } while (!isok(u.ux + u.dx, u.uy + u.dy) || + IS_ROCK(levl[u.ux + u.dx][u.uy + u.dy].typ)); } - if(!isok(u.ux+u.dx, u.uy+u.dy)){ + if (!isok(u.ux + u.dx, u.uy + u.dy)) { nomul(0); return; } @@ -115,79 +118,83 @@ domove() ust = &levl[u.ux][u.uy]; oldx = u.ux; oldy = u.uy; - if(!u.uswallow && (trap = t_at(u.ux+u.dx, u.uy+u.dy)) && trap->tseen) + if (!u.uswallow && (trap = t_at(u.ux + u.dx, u.uy + u.dy)) && trap->tseen) nomul(0); - if(u.ustuck && !u.uswallow && (u.ux+u.dx != u.ustuck->mx || - u.uy+u.dy != u.ustuck->my)) { - if(dist(u.ustuck->mx, u.ustuck->my) > 2){ + if (u.ustuck && !u.uswallow && (u.ux + u.dx != u.ustuck->mx || + u.uy + u.dy != u.ustuck->my)) { + if (dist(u.ustuck->mx, u.ustuck->my) > 2) { /* perhaps it fled (or was teleported or ... ) */ u.ustuck = 0; } else { - if(Blind) pline("You cannot escape from it!"); - else pline("You cannot escape from %s!", - monnam(u.ustuck)); + if (Blind) + pline("You cannot escape from it!"); + else + pline("You cannot escape from %s!", + monnam(u.ustuck)); nomul(0); return; } } - if(u.uswallow || (mtmp = m_at(u.ux+u.dx,u.uy+u.dy))) { - /* attack monster */ + if (u.uswallow || (mtmp = m_at(u.ux + u.dx, u.uy + u.dy))) { + /* attack monster */ nomul(0); gethungry(); - if(multi < 0) return; /* we just fainted */ + if (multi < 0) + return; /* we just fainted */ /* try to attack; note that it might evade */ - if(attack(u.uswallow ? u.ustuck : mtmp)) + if (attack(u.uswallow ? u.ustuck : mtmp)) return; } /* not attacking an animal, so we try to move */ - if(u.utrap) { - if(u.utraptype == TT_PIT) { + if (u.utrap) { + if (u.utraptype == TT_PIT) { pline("You are still in a pit."); u.utrap--; } else { pline("You are caught in a beartrap."); - if((u.dx && u.dy) || !rn2(5)) u.utrap--; + if ((u.dx && u.dy) || !rn2(5)) + u.utrap--; } return; } - tmpr = &levl[u.ux+u.dx][u.uy+u.dy]; - if(IS_ROCK(tmpr->typ) || - (u.dx && u.dy && (tmpr->typ == DOOR || ust->typ == DOOR))){ + tmpr = &levl[u.ux + u.dx][u.uy + u.dy]; + if (IS_ROCK(tmpr->typ) || + (u.dx && u.dy && (tmpr->typ == DOOR || ust->typ == DOOR))) { flags.move = 0; nomul(0); return; } - while(otmp = sobj_at(ENORMOUS_ROCK, u.ux+u.dx, u.uy+u.dy)) { - register xchar rx = u.ux+2*u.dx, ry = u.uy+2*u.dy; - register struct trap *ttmp; + while ((otmp = sobj_at(ENORMOUS_ROCK, u.ux + u.dx, u.uy + u.dy)) != NULL){ + xchar rx = u.ux + 2 * u.dx, ry = u.uy + 2 * u.dy; + struct trap *ttmp; nomul(0); - if(isok(rx,ry) && !IS_ROCK(levl[rx][ry].typ) && + if (isok(rx, ry) && !IS_ROCK(levl[rx][ry].typ) && (levl[rx][ry].typ != DOOR || !(u.dx && u.dy)) && !sobj_at(ENORMOUS_ROCK, rx, ry)) { - if(m_at(rx,ry)) { - pline("You hear a monster behind the rock."); - pline("Perhaps that's why you cannot move it."); - goto cannot_push; + if (m_at(rx, ry)) { + pline("You hear a monster behind the rock."); + pline("Perhaps that's why you cannot move it."); + goto cannot_push; } - if(ttmp = t_at(rx,ry)) - switch(ttmp->ttyp) { - case PIT: - pline("You push the rock into a pit!"); - deltrap(ttmp); - delobj(otmp); - pline("It completely fills the pit!"); - continue; - case TELEP_TRAP: - pline("You push the rock and suddenly it disappears!"); - delobj(otmp); - continue; - } - if(levl[rx][ry].typ == POOL) { + if ((ttmp = t_at(rx, ry)) != NULL) + switch (ttmp->ttyp) { + case PIT: + pline("You push the rock into a pit!"); + deltrap(ttmp); + delobj(otmp); + pline("It completely fills the pit!"); + continue; + case TELEP_TRAP: + pline("You push the rock and suddenly it disappears!"); + delobj(otmp); + continue; + } + if (levl[rx][ry].typ == POOL) { levl[rx][ry].typ = ROOM; - mnewsym(rx,ry); - prl(rx,ry); + mnewsym(rx, ry); + prl(rx, ry); pline("You push the rock into the water."); pline("Now you can cross the water!"); delobj(otmp); @@ -196,124 +203,130 @@ domove() otmp->ox = rx; otmp->oy = ry; /* pobj(otmp); */ - if(cansee(rx,ry)) atl(rx,ry,otmp->olet); - if(Invisible) newsym(u.ux+u.dx, u.uy+u.dy); - - { static long lastmovetime; - /* note: this var contains garbage initially and - after a restore */ - if(moves > lastmovetime+2 || moves < lastmovetime) - pline("With great effort you move the enormous rock."); - lastmovetime = moves; + if (cansee(rx, ry)) + atl(rx, ry, otmp->olet); + if (Invisible) + newsym(u.ux + u.dx, u.uy + u.dy); + + { + static long lastmovetime; + /* + * note: this var contains garbage initially + * and after a restore + */ + if (moves > lastmovetime + 2 || moves < lastmovetime) + pline("With great effort you move the enormous rock."); + lastmovetime = moves; } } else { - pline("You try to move the enormous rock, but in vain."); - cannot_push: - if((!invent || inv_weight()+90 <= 0) && - (!u.dx || !u.dy || (IS_ROCK(levl[u.ux][u.uy+u.dy].typ) - && IS_ROCK(levl[u.ux+u.dx][u.uy].typ)))){ - pline("However, you can squeeze yourself into a small opening."); - break; - } else - return; + pline("You try to move the enormous rock, but in vain."); + cannot_push: + if ((!invent || inv_weight() + 90 <= 0) && + (!u.dx || !u.dy || (IS_ROCK(levl[u.ux][u.uy + u.dy].typ) + && IS_ROCK(levl[u.ux + u.dx][u.uy].typ)))) { + pline("However, you can squeeze yourself into a small opening."); + break; + } else + return; } - } - if(u.dx && u.dy && IS_ROCK(levl[u.ux][u.uy+u.dy].typ) && - IS_ROCK(levl[u.ux+u.dx][u.uy].typ) && - invent && inv_weight()+40 > 0) { + } + if (u.dx && u.dy && IS_ROCK(levl[u.ux][u.uy + u.dy].typ) && + IS_ROCK(levl[u.ux + u.dx][u.uy].typ) && + invent && inv_weight() + 40 > 0) { pline("You are carrying too much to get through."); nomul(0); return; } - if(Punished && - DIST(u.ux+u.dx, u.uy+u.dy, uchain->ox, uchain->oy) > 2){ - if(carried(uball)) { + if (Punished && + DIST(u.ux + u.dx, u.uy + u.dy, uchain->ox, uchain->oy) > 2) { + if (carried(uball)) { movobj(uchain, u.ux, u.uy); goto nodrag; } - - if(DIST(u.ux+u.dx, u.uy+u.dy, uball->ox, uball->oy) < 3){ + if (DIST(u.ux + u.dx, u.uy + u.dy, uball->ox, uball->oy) < 3) { /* leave ball, move chain under/over ball */ movobj(uchain, uball->ox, uball->oy); goto nodrag; } - - if(inv_weight() + (int) uball->owt/2 > 0) { + if (inv_weight() + (int) uball->owt / 2 > 0) { pline("You cannot %sdrag the heavy iron ball.", - invent ? "carry all that and also " : ""); + invent ? "carry all that and also " : ""); nomul(0); return; } - movobj(uball, uchain->ox, uchain->oy); - unpobj(uball); /* BAH %% */ + unpobj(uball); /* BAH %% */ uchain->ox = u.ux; uchain->oy = u.uy; nomul(-2); nomovemsg = ""; - nodrag: ; +nodrag: ; } u.ux += u.dx; u.uy += u.dy; - if(flags.run) { - if(tmpr->typ == DOOR || - (xupstair == u.ux && yupstair == u.uy) || - (xdnstair == u.ux && ydnstair == u.uy)) + if (flags.run) { + if (tmpr->typ == DOOR || + (xupstair == u.ux && yupstair == u.uy) || + (xdnstair == u.ux && ydnstair == u.uy)) nomul(0); } - - if(tmpr->typ == POOL && !Levitation) + if (tmpr->typ == POOL && !Levitation) drown(); /* not necessarily fatal */ -/* - if(u.udispl) { - u.udispl = 0; - newsym(oldx,oldy); - } -*/ - if(!Blind) { + /* + if(u.udispl) { + u.udispl = 0; + newsym(oldx,oldy); + } + */ + if (!Blind) { #ifdef QUEST setsee(); #else - if(ust->lit) { - if(tmpr->lit) { - if(tmpr->typ == DOOR) - prl1(u.ux+u.dx,u.uy+u.dy); - else if(ust->typ == DOOR) - nose1(oldx-u.dx,oldy-u.dy); + if (ust->lit) { + if (tmpr->lit) { + if (tmpr->typ == DOOR) + prl1(u.ux + u.dx, u.uy + u.dy); + else if (ust->typ == DOOR) + nose1(oldx - u.dx, oldy - u.dy); } else { unsee(); - prl1(u.ux+u.dx,u.uy+u.dy); + prl1(u.ux + u.dx, u.uy + u.dy); } } else { - if(tmpr->lit) setsee(); + if (tmpr->lit) + setsee(); else { - prl1(u.ux+u.dx,u.uy+u.dy); - if(tmpr->typ == DOOR) { - if(u.dy) { - prl(u.ux-1,u.uy); - prl(u.ux+1,u.uy); + prl1(u.ux + u.dx, u.uy + u.dy); + if (tmpr->typ == DOOR) { + if (u.dy) { + prl(u.ux - 1, u.uy); + prl(u.ux + 1, u.uy); } else { - prl(u.ux,u.uy-1); - prl(u.ux,u.uy+1); + prl(u.ux, u.uy - 1); + prl(u.ux, u.uy + 1); } } } - nose1(oldx-u.dx,oldy-u.dy); + nose1(oldx - u.dx, oldy - u.dy); } -#endif QUEST +#endif /* QUEST */ } else { pru(); } - if(!flags.nopick) pickup(1); - if(trap) dotrap(trap); /* fall into pit, arrow trap, etc. */ + if (!flags.nopick) + pickup(1); + if (trap) + dotrap(trap); /* fall into pit, arrow trap, etc. */ (void) inshop(); - if(!Blind) read_engr_at(u.ux,u.uy); + if (!Blind) + read_engr_at(u.ux, u.uy); } +void movobj(obj, ox, oy) -register struct obj *obj; -register int ox, oy; + struct obj *obj; + int ox, oy; { /* Some dirty programming to get display right */ freeobj(obj); @@ -324,402 +337,495 @@ register int ox, oy; obj->oy = oy; } -dopickup(){ - if(!g_at(u.ux,u.uy) && !o_at(u.ux,u.uy)) { +int +dopickup() +{ + if (!g_at(u.ux, u.uy) && !o_at(u.ux, u.uy)) { pline("There is nothing here to pick up."); - return(0); + return (0); } - if(Levitation) { + if (Levitation) { pline("You cannot reach the floor."); - return(1); + return (1); } pickup(0); - return(1); + return (1); } +void pickup(all) { - register struct gold *gold; - register struct obj *obj, *obj2; - register int wt; + struct gold *gold; + struct obj *obj, *obj2; + int wt; - if(Levitation) return; - while(gold = g_at(u.ux,u.uy)) { + if (Levitation) + return; + while ((gold = g_at(u.ux, u.uy)) != NULL) { pline("%ld gold piece%s.", gold->amount, plur(gold->amount)); u.ugold += gold->amount; flags.botl = 1; freegold(gold); - if(flags.run) nomul(0); - if(Invisible) newsym(u.ux,u.uy); + if (flags.run) + nomul(0); + if (Invisible) + newsym(u.ux, u.uy); } /* check for more than one object */ - if(!all) { - register int ct = 0; + if (!all) { + int ct = 0; - for(obj = fobj; obj; obj = obj->nobj) - if(obj->ox == u.ux && obj->oy == u.uy) - if(!Punished || obj != uchain) + for (obj = fobj; obj; obj = obj->nobj) + if (obj->ox == u.ux && obj->oy == u.uy) + if (!Punished || obj != uchain) ct++; - if(ct < 2) + if (ct < 2) all++; else pline("There are several objects here."); } + for (obj = fobj; obj; obj = obj2) { + obj2 = obj->nobj; /* perhaps obj will be picked up */ + if (obj->ox == u.ux && obj->oy == u.uy) { + if (flags.run) + nomul(0); - for(obj = fobj; obj; obj = obj2) { - obj2 = obj->nobj; /* perhaps obj will be picked up */ - if(obj->ox == u.ux && obj->oy == u.uy) { - if(flags.run) nomul(0); - - /* do not pick up uchain */ - if(Punished && obj == uchain) - continue; - - if(!all) { - char c; - - pline("Pick up %s ? [ynaq]", doname(obj)); - while(!index("ynaq ", (c = readchar()))) - bell(); - if(c == 'q') return; - if(c == 'n') continue; - if(c == 'a') all = 1; - } - - if(obj->otyp == DEAD_COCKATRICE && !uarmg){ - pline("Touching the dead cockatrice is a fatal mistake."); - pline("You turn to stone."); - killer = "cockatrice cadaver"; - done("died"); - } - - if(obj->otyp == SCR_SCARE_MONSTER){ - if(!obj->spe) obj->spe = 1; - else { - /* Note: perhaps the 1st pickup failed: you cannot - carry anymore, and so we never dropped it - - let's assume that treading on it twice also - destroys the scroll */ - pline("The scroll turns to dust as you pick it up."); - delobj(obj); - continue; - } - } + /* do not pick up uchain */ + if (Punished && obj == uchain) + continue; - wt = inv_weight() + obj->owt; - if(wt > 0) { - if(obj->quan > 1) { - /* see how many we can lift */ - extern struct obj *splitobj(); - int savequan = obj->quan; - int iw = inv_weight(); - int qq; - for(qq = 1; qq < savequan; qq++){ - obj->quan = qq; - if(iw + weight(obj) > 0) - break; + if (!all) { + char c; + + pline("Pick up %s ? [ynaq]", doname(obj)); + while (!strchr("ynaq ", (c = readchar()))) + bell(); + if (c == 'q') + return; + if (c == 'n') + continue; + if (c == 'a') + all = 1; + } + if (obj->otyp == DEAD_COCKATRICE && !uarmg) { + pline("Touching the dead cockatrice is a fatal mistake."); + pline("You turn to stone."); + killer = "cockatrice cadaver"; + done("died"); + } + if (obj->otyp == SCR_SCARE_MONSTER) { + if (!obj->spe) + obj->spe = 1; + else { + /* + * Note: perhaps the 1st pickup + * failed: you cannot carry anymore, + * and so we never dropped it - let's + * assume that treading on it twice + * also destroys the scroll + */ + pline("The scroll turns to dust as you pick it up."); + delobj(obj); + continue; } - obj->quan = savequan; - qq--; - /* we can carry qq of them */ - if(!qq) goto too_heavy; - pline("You can only carry %s of the %s lying here.", - (qq == 1) ? "one" : "some", - doname(obj)); - (void) splitobj(obj, qq); - /* note: obj2 is set already, so we'll never - * encounter the other half; if it should be - * otherwise then write - * obj2 = splitobj(obj,qq); - */ - goto lift_some; } + wt = inv_weight() + obj->owt; + if (wt > 0) { + if (obj->quan > 1) { + /* see how many we can lift */ + int savequan = obj->quan; + int iw = inv_weight(); + int qq; + for (qq = 1; qq < savequan; qq++) { + obj->quan = qq; + if (iw + weight(obj) > 0) + break; + } + obj->quan = savequan; + qq--; + /* we can carry qq of them */ + if (!qq) + goto too_heavy; + pline("You can only carry %s of the %s lying here.", + (qq == 1) ? "one" : "some", + doname(obj)); + (void) splitobj(obj, qq); + /* + * note: obj2 is set already, so + * we'll never encounter the other + * half; if it should be otherwise + * then write obj2 = + * splitobj(obj,qq); + */ + goto lift_some; + } too_heavy: - pline("There %s %s here, but %s.", - (obj->quan == 1) ? "is" : "are", - doname(obj), - !invent ? "it is too heavy for you to lift" - : "you cannot carry anymore"); - break; - } + pline("There %s %s here, but %s.", + (obj->quan == 1) ? "is" : "are", + doname(obj), + !invent ? "it is too heavy for you to lift" + : "you cannot carry anymore"); + break; + } lift_some: - if(inv_cnt() >= 52) { - pline("Your knapsack cannot accomodate anymore items."); - break; - } - if(wt > -5) pline("You have a little trouble lifting"); - freeobj(obj); - if(Invisible) newsym(u.ux,u.uy); - addtobill(obj); /* sets obj->unpaid if necessary */ - { int pickquan = obj->quan; - int mergquan; - if(!Blind) obj->dknown = 1; /* this is done by prinv(), - but addinv() needs it already for merging */ - obj = addinv(obj); /* might merge it with other objects */ - mergquan = obj->quan; - obj->quan = pickquan; /* to fool prinv() */ - prinv(obj); - obj->quan = mergquan; + if (inv_cnt() >= 52) { + pline("Your knapsack cannot accomodate anymore items."); + break; + } + if (wt > -5) + pline("You have a little trouble lifting"); + freeobj(obj); + if (Invisible) + newsym(u.ux, u.uy); + addtobill(obj); /* sets obj->unpaid if necessary */ + { + int pickquan = obj->quan; + int mergquan; + if (!Blind) + obj->dknown = 1; /* this is done by + * prinv(), but addinv() + * needs it already for + * merging */ + obj = addinv(obj); /* might merge it with + * other objects */ + mergquan = obj->quan; + obj->quan = pickquan; /* to fool prinv() */ + prinv(obj); + obj->quan = mergquan; + } } - } } } /* stop running if we see something interesting */ /* turn around a corner if that is the only way we can proceed */ /* do not turn left or right twice */ -lookaround(){ -register x,y,i,x0,y0,m0,i0 = 9; -register int corrct = 0, noturn = 0; -register struct monst *mtmp; -#ifdef lint - /* suppress "used before set" message */ - x0 = y0 = 0; -#endif lint - if(Blind || flags.run == 0) return; - if(flags.run == 1 && levl[u.ux][u.uy].typ == ROOM) return; +void +lookaround() +{ + int x, y, i, x0 = 0, y0 = 0, m0 = 0, i0 = 9; + int corrct = 0, noturn = 0; + struct monst *mtmp; + if (Blind || flags.run == 0) + return; + if (flags.run == 1 && levl[u.ux][u.uy].typ == ROOM) + return; #ifdef QUEST - if(u.ux0 == u.ux+u.dx && u.uy0 == u.uy+u.dy) goto stop; -#endif QUEST - for(x = u.ux-1; x <= u.ux+1; x++) for(y = u.uy-1; y <= u.uy+1; y++){ - if(x == u.ux && y == u.uy) continue; - if(!levl[x][y].typ) continue; - if((mtmp = m_at(x,y)) && !mtmp->mimic && - (!mtmp->minvis || See_invisible)){ - if(!mtmp->mtame || (x == u.ux+u.dx && y == u.uy+u.dy)) - goto stop; - } else mtmp = 0; /* invisible M cannot influence us */ - if(x == u.ux-u.dx && y == u.uy-u.dy) continue; - switch(levl[x][y].scrsym){ - case '|': - case '-': - case '.': - case ' ': - break; - case '+': - if(x != u.ux && y != u.uy) break; - if(flags.run != 1) goto stop; - /* fall into next case */ - case CORR_SYM: + if (u.ux0 == u.ux + u.dx && u.uy0 == u.uy + u.dy) + goto stop; +#endif /* QUEST */ + for (x = u.ux - 1; x <= u.ux + 1; x++) + for (y = u.uy - 1; y <= u.uy + 1; y++) { + if (x == u.ux && y == u.uy) + continue; + if (!levl[x][y].typ) + continue; + if ((mtmp = m_at(x, y)) && !mtmp->mimic && + (!mtmp->minvis || See_invisible)) { + if (!mtmp->mtame || (x == u.ux + u.dx && y == u.uy + u.dy)) + goto stop; + } else + mtmp = 0; /* invisible M cannot + * influence us */ + if (x == u.ux - u.dx && y == u.uy - u.dy) + continue; + switch (levl[x][y].scrsym) { + case '|': + case '-': + case '.': + case ' ': + break; + case '+': + if (x != u.ux && y != u.uy) + break; + if (flags.run != 1) + goto stop; + /* fall into next case */ + case CORR_SYM: corr: - if(flags.run == 1 || flags.run == 3) { - i = DIST(x,y,u.ux+u.dx,u.uy+u.dy); - if(i > 2) break; - if(corrct == 1 && DIST(x,y,x0,y0) != 1) - noturn = 1; - if(i < i0) { - i0 = i; - x0 = x; - y0 = y; - m0 = mtmp ? 1 : 0; + if (flags.run == 1 || flags.run == 3) { + i = DIST(x, y, u.ux + u.dx, u.uy + u.dy); + if (i > 2) + break; + if (corrct == 1 && DIST(x, y, x0, y0) != 1) + noturn = 1; + if (i < i0) { + i0 = i; + x0 = x; + y0 = y; + m0 = mtmp ? 1 : 0; + } } - } - corrct++; - break; - case '^': - if(flags.run == 1) goto corr; /* if you must */ - if(x == u.ux+u.dx && y == u.uy+u.dy) goto stop; - break; - default: /* e.g. objects or trap or stairs */ - if(flags.run == 1) goto corr; - if(mtmp) break; /* d */ + corrct++; + break; + case '^': + if (flags.run == 1) + goto corr; /* if you must */ + if (x == u.ux + u.dx && y == u.uy + u.dy) + goto stop; + break; + default: /* e.g. objects or trap or stairs */ + if (flags.run == 1) + goto corr; + if (mtmp) + break; /* d */ stop: - nomul(0); - return; + nomul(0); + return; + } } - } #ifdef QUEST - if(corrct > 0 && (flags.run == 4 || flags.run == 5)) goto stop; -#endif QUEST - if(corrct > 1 && flags.run == 2) goto stop; - if((flags.run == 1 || flags.run == 3) && !noturn && !m0 && i0 && - (corrct == 1 || (corrct == 2 && i0 == 1))) { + if (corrct > 0 && (flags.run == 4 || flags.run == 5)) + goto stop; +#endif /* QUEST */ + if (corrct > 1 && flags.run == 2) + goto stop; + if ((flags.run == 1 || flags.run == 3) && !noturn && !m0 && i0 && + (corrct == 1 || (corrct == 2 && i0 == 1))) { /* make sure that we do not turn too far */ - if(i0 == 2) { - if(u.dx == y0-u.uy && u.dy == u.ux-x0) - i = 2; /* straight turn right */ - else - i = -2; /* straight turn left */ - } else if(u.dx && u.dy) { - if((u.dx == u.dy && y0 == u.uy) || - (u.dx != u.dy && y0 != u.uy)) - i = -1; /* half turn left */ - else - i = 1; /* half turn right */ + if (i0 == 2) { + if (u.dx == y0 - u.uy && u.dy == u.ux - x0) + i = 2; /* straight turn right */ + else + i = -2; /* straight turn left */ + } else if (u.dx && u.dy) { + if ((u.dx == u.dy && y0 == u.uy) || + (u.dx != u.dy && y0 != u.uy)) + i = -1; /* half turn left */ + else + i = 1; /* half turn right */ } else { - if((x0-u.ux == y0-u.uy && !u.dy) || - (x0-u.ux != y0-u.uy && u.dy)) - i = 1; /* half turn right */ - else - i = -1; /* half turn left */ + if ((x0 - u.ux == y0 - u.uy && !u.dy) || + (x0 - u.ux != y0 - u.uy && u.dy)) + i = 1; /* half turn right */ + else + i = -1; /* half turn left */ } i += u.last_str_turn; - if(i <= 2 && i >= -2) { + if (i <= 2 && i >= -2) { u.last_str_turn = i; - u.dx = x0-u.ux, u.dy = y0-u.uy; + u.dx = x0 - u.ux, u.dy = y0 - u.uy; } } } /* something like lookaround, but we are not running */ /* react only to monsters that might hit us */ -monster_nearby() { -register int x,y; -register struct monst *mtmp; - if(!Blind) - for(x = u.ux-1; x <= u.ux+1; x++) for(y = u.uy-1; y <= u.uy+1; y++){ - if(x == u.ux && y == u.uy) continue; - if((mtmp = m_at(x,y)) && !mtmp->mimic && !mtmp->mtame && - !mtmp->mpeaceful && !index("Ea", mtmp->data->mlet) && - !mtmp->mfroz && !mtmp->msleep && /* aplvax!jcn */ - (!mtmp->minvis || See_invisible)) - return(1); - } - return(0); +int +monster_nearby() +{ + int x, y; + struct monst *mtmp; + if (!Blind) + for (x = u.ux - 1; x <= u.ux + 1; x++) + for (y = u.uy - 1; y <= u.uy + 1; y++) { + if (x == u.ux && y == u.uy) + continue; + if ((mtmp = m_at(x, y)) && !mtmp->mimic && !mtmp->mtame && + !mtmp->mpeaceful && !strchr("Ea", mtmp->data->mlet) && + !mtmp->mfroz && !mtmp->msleep && /* aplvax!jcn */ + (!mtmp->minvis || See_invisible)) + return (1); + } + return (0); } #ifdef QUEST -cansee(x,y) xchar x,y; { -register int dx,dy,adx,ady,sdx,sdy,dmax,d; - if(Blind) return(0); - if(!isok(x,y)) return(0); - d = dist(x,y); - if(d < 3) return(1); - if(d > u.uhorizon*u.uhorizon) return(0); - if(!levl[x][y].lit) - return(0); - dx = x - u.ux; adx = abs(dx); sdx = sgn(dx); - dy = y - u.uy; ady = abs(dy); sdy = sgn(dy); - if(dx == 0 || dy == 0 || adx == ady){ +int +cansee(x, y) + xchar x, y; +{ + int dx, dy, adx, ady, sdx, sdy, dmax, d; + if (Blind) + return (0); + if (!isok(x, y)) + return (0); + d = dist(x, y); + if (d < 3) + return (1); + if (d > u.uhorizon * u.uhorizon) + return (0); + if (!levl[x][y].lit) + return (0); + dx = x - u.ux; + adx = abs(dx); + sdx = sgn(dx); + dy = y - u.uy; + ady = abs(dy); + sdy = sgn(dy); + if (dx == 0 || dy == 0 || adx == ady) { dmax = (dx == 0) ? ady : adx; - for(d = 1; d <= dmax; d++) - if(!rroom(sdx*d,sdy*d)) - return(0); - return(1); - } else if(ady > adx){ - for(d = 1; d <= ady; d++){ - if(!rroom(sdx*( (d*adx)/ady ), sdy*d) || - !rroom(sdx*( (d*adx-1)/ady+1 ), sdy*d)) - return(0); + for (d = 1; d <= dmax; d++) + if (!rroom(sdx * d, sdy * d)) + return (0); + return (1); + } else if (ady > adx) { + for (d = 1; d <= ady; d++) { + if (!rroom(sdx * ((d * adx) / ady), sdy * d) || + !rroom(sdx * ((d * adx - 1) / ady + 1), sdy * d)) + return (0); } - return(1); + return (1); } else { - for(d = 1; d <= adx; d++){ - if(!rroom(sdx*d, sdy*( (d*ady)/adx )) || - !rroom(sdx*d, sdy*( (d*ady-1)/adx+1 ))) - return(0); + for (d = 1; d <= adx; d++) { + if (!rroom(sdx * d, sdy * ((d * ady) / adx)) || + !rroom(sdx * d, sdy * ((d * ady - 1) / adx + 1))) + return (0); } - return(1); + return (1); } } -rroom(x,y) register int x,y; { - return(IS_ROOM(levl[u.ux+x][u.uy+y].typ)); +int +rroom(x, y) + int x, y; +{ + return (IS_ROOM(levl[u.ux + x][u.uy + y].typ)); } #else -cansee(x,y) xchar x,y; { - if(Blind || u.uswallow) return(0); - if(dist(x,y) < 3) return(1); - if(levl[x][y].lit && seelx <= x && x <= seehx && seely <= y && - y <= seehy) return(1); - return(0); +int +cansee(x, y) + xchar x, y; +{ + if (Blind || u.uswallow) + return (0); + if (dist(x, y) < 3) + return (1); + if (levl[x][y].lit && seelx <= x && x <= seehx && seely <= y && + y <= seehy) + return (1); + return (0); } -#endif QUEST +#endif /* QUEST */ -sgn(a) register int a; { - return((a > 0) ? 1 : (a == 0) ? 0 : -1); +int +sgn(a) + int a; +{ + return ((a > 0) ? 1 : (a == 0) ? 0 : -1); } #ifdef QUEST +void setsee() { - register x,y; + int x, y; - if(Blind) { + if (Blind) { pru(); return; } - for(y = u.uy-u.uhorizon; y <= u.uy+u.uhorizon; y++) - for(x = u.ux-u.uhorizon; x <= u.ux+u.uhorizon; x++) { - if(cansee(x,y)) - prl(x,y); - } + for (y = u.uy - u.uhorizon; y <= u.uy + u.uhorizon; y++) + for (x = u.ux - u.uhorizon; x <= u.ux + u.uhorizon; x++) { + if (cansee(x, y)) + prl(x, y); + } } #else +void setsee() { - register x,y; + int x, y; - if(Blind) { + if (Blind) { pru(); return; } - if(!levl[u.ux][u.uy].lit) { - seelx = u.ux-1; - seehx = u.ux+1; - seely = u.uy-1; - seehy = u.uy+1; + if (!levl[u.ux][u.uy].lit) { + seelx = u.ux - 1; + seehx = u.ux + 1; + seely = u.uy - 1; + seehy = u.uy + 1; } else { - for(seelx = u.ux; levl[seelx-1][u.uy].lit; seelx--); - for(seehx = u.ux; levl[seehx+1][u.uy].lit; seehx++); - for(seely = u.uy; levl[u.ux][seely-1].lit; seely--); - for(seehy = u.uy; levl[u.ux][seehy+1].lit; seehy++); - } - for(y = seely; y <= seehy; y++) - for(x = seelx; x <= seehx; x++) { - prl(x,y); - } - if(!levl[u.ux][u.uy].lit) seehx = 0; /* seems necessary elsewhere */ + for (seelx = u.ux; levl[seelx - 1][u.uy].lit; seelx--); + for (seehx = u.ux; levl[seehx + 1][u.uy].lit; seehx++); + for (seely = u.uy; levl[u.ux][seely - 1].lit; seely--); + for (seehy = u.uy; levl[u.ux][seehy + 1].lit; seehy++); + } + for (y = seely; y <= seehy; y++) + for (x = seelx; x <= seehx; x++) { + prl(x, y); + } + if (!levl[u.ux][u.uy].lit) + seehx = 0; /* seems necessary elsewhere */ else { - if(seely == u.uy) for(x = u.ux-1; x <= u.ux+1; x++) prl(x,seely-1); - if(seehy == u.uy) for(x = u.ux-1; x <= u.ux+1; x++) prl(x,seehy+1); - if(seelx == u.ux) for(y = u.uy-1; y <= u.uy+1; y++) prl(seelx-1,y); - if(seehx == u.ux) for(y = u.uy-1; y <= u.uy+1; y++) prl(seehx+1,y); + if (seely == u.uy) + for (x = u.ux - 1; x <= u.ux + 1; x++) + prl(x, seely - 1); + if (seehy == u.uy) + for (x = u.ux - 1; x <= u.ux + 1; x++) + prl(x, seehy + 1); + if (seelx == u.ux) + for (y = u.uy - 1; y <= u.uy + 1; y++) + prl(seelx - 1, y); + if (seehx == u.ux) + for (y = u.uy - 1; y <= u.uy + 1; y++) + prl(seehx + 1, y); } } -#endif QUEST +#endif /* QUEST */ +void nomul(nval) -register nval; + int nval; { - if(multi < 0) return; + if (multi < 0) + return; multi = nval; flags.mv = flags.run = 0; } +int abon() { - if(u.ustr == 3) return(-3); - else if(u.ustr < 6) return(-2); - else if(u.ustr < 8) return(-1); - else if(u.ustr < 17) return(0); - else if(u.ustr < 69) return(1); /* up to 18/50 */ - else if(u.ustr < 118) return(2); - else return(3); + if (u.ustr == 3) + return (-3); + else if (u.ustr < 6) + return (-2); + else if (u.ustr < 8) + return (-1); + else if (u.ustr < 17) + return (0); + else if (u.ustr < 69) + return (1); /* up to 18/50 */ + else if (u.ustr < 118) + return (2); + else + return (3); } +int dbon() { - if(u.ustr < 6) return(-1); - else if(u.ustr < 16) return(0); - else if(u.ustr < 18) return(1); - else if(u.ustr == 18) return(2); /* up to 18 */ - else if(u.ustr < 94) return(3); /* up to 18/75 */ - else if(u.ustr < 109) return(4); /* up to 18/90 */ - else if(u.ustr < 118) return(5); /* up to 18/99 */ - else return(6); + if (u.ustr < 6) + return (-1); + else if (u.ustr < 16) + return (0); + else if (u.ustr < 18) + return (1); + else if (u.ustr == 18) + return (2); /* up to 18 */ + else if (u.ustr < 94) + return (3); /* up to 18/75 */ + else if (u.ustr < 109) + return (4); /* up to 18/90 */ + else if (u.ustr < 118) + return (5); /* up to 18/99 */ + else + return (6); } -losestr(num) /* may kill you; cause may be poison or monster like 'A' */ -register num; +void +losestr(num) /* may kill you; cause may be poison or */ + int num; /* monster like 'A' */ { u.ustr -= num; - while(u.ustr < 3) { + while (u.ustr < 3) { u.ustr++; u.uhp -= 6; u.uhpmax -= 6; @@ -727,36 +833,38 @@ register num; flags.botl = 1; } -losehp(n,knam) -register n; -register char *knam; +void +losehp(n, knam) + int n; + char *knam; { u.uhp -= n; - if(u.uhp > u.uhpmax) + if (u.uhp > u.uhpmax) u.uhpmax = u.uhp; /* perhaps n was negative */ flags.botl = 1; - if(u.uhp < 1) { + if (u.uhp < 1) { killer = knam; /* the thing that killed you */ done("died"); } } -losehp_m(n,mtmp) -register n; -register struct monst *mtmp; +void +losehp_m(n, mtmp) + int n; + struct monst *mtmp; { u.uhp -= n; flags.botl = 1; - if(u.uhp < 1) + if (u.uhp < 1) done_in_by(mtmp); } -losexp() /* hit by V or W */ -{ - register num; - extern long newuexp(); +void +losexp() +{ /* hit by V or W */ + int num; - if(u.ulevel > 1) + if (u.ulevel > 1) pline("Goodbye level %u.", u.ulevel--); else u.uhp = -1; @@ -767,37 +875,44 @@ losexp() /* hit by V or W */ flags.botl = 1; } -inv_weight(){ -register struct obj *otmp = invent; -register int wt = (u.ugold + 500)/1000; -register int carrcap; - if(Levitation) /* pugh@cornell */ +int +inv_weight() +{ + struct obj *otmp = invent; + int wt = (u.ugold + 500) / 1000; + int carrcap; + if (Levitation) /* pugh@cornell */ carrcap = MAX_CARR_CAP; else { - carrcap = 5*(((u.ustr > 18) ? 20 : u.ustr) + u.ulevel); - if(carrcap > MAX_CARR_CAP) carrcap = MAX_CARR_CAP; - if(Wounded_legs & LEFT_SIDE) carrcap -= 10; - if(Wounded_legs & RIGHT_SIDE) carrcap -= 10; - } - while(otmp){ + carrcap = 5 * (((u.ustr > 18) ? 20 : u.ustr) + u.ulevel); + if (carrcap > MAX_CARR_CAP) + carrcap = MAX_CARR_CAP; + if (Wounded_legs & LEFT_SIDE) + carrcap -= 10; + if (Wounded_legs & RIGHT_SIDE) + carrcap -= 10; + } + while (otmp) { wt += otmp->owt; otmp = otmp->nobj; } - return(wt - carrcap); + return (wt - carrcap); } -inv_cnt(){ -register struct obj *otmp = invent; -register int ct = 0; - while(otmp){ +int +inv_cnt() +{ + struct obj *otmp = invent; + int ct = 0; + while (otmp) { ct++; otmp = otmp->nobj; } - return(ct); + return (ct); } long newuexp() { - return(10*(1L << (u.ulevel-1))); + return (10 * (1L << (u.ulevel - 1))); } diff --git a/hack/hack.cmd.c b/hack/hack.cmd.c index 0af29895..9cc90fde 100644 --- a/hack/hack.cmd.c +++ b/hack/hack.cmd.c @@ -1,171 +1,166 @@ +/* $NetBSD: hack.cmd.c,v 1.4 1997/10/19 16:57:39 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.cmd.c,v 1.3 1995/03/23 08:29:52 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.cmd.c,v 1.4 1997/10/19 16:57:39 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" #include "def.func_tab.h" -int doredraw(),doredotopl(),dodrop(),dodrink(),doread(),dosearch(),dopickup(), -doversion(),doweararm(),dowearring(),doremarm(),doremring(),dopay(),doapply(), -dosave(),dowield(),ddoinv(),dozap(),ddocall(),dowhatis(),doengrave(),dotele(), -dohelp(),doeat(),doddrop(),do_mname(),doidtrap(),doprwep(),doprarm(), -doprring(),doprgold(),dodiscovered(),dotypeinv(),dolook(),doset(), -doup(), dodown(), done1(), donull(), dothrow(), doextcmd(), dodip(), dopray(); -#ifdef SHELL -int dosh(); -#endif SHELL +struct func_tab cmdlist[] = { + { '\020', doredotopl }, + { '\022', doredraw }, + { '\024', dotele }, #ifdef SUSPEND -int dosuspend(); -#endif SUSPEND - -struct func_tab cmdlist[]={ - '\020', doredotopl, - '\022', doredraw, - '\024', dotele, -#ifdef SUSPEND - '\032', dosuspend, -#endif SUSPEND - 'a', doapply, -/* 'A' : UNUSED */ -/* 'b', 'B' : go sw */ - 'c', ddocall, - 'C', do_mname, - 'd', dodrop, - 'D', doddrop, - 'e', doeat, - 'E', doengrave, -/* 'f', 'F' : multiple go (might become 'fight') */ -/* 'g', 'G' : UNUSED */ -/* 'h', 'H' : go west */ - 'I', dotypeinv, /* Robert Viduya */ - 'i', ddoinv, -/* 'j', 'J', 'k', 'K', 'l', 'L', 'm', 'M', 'n', 'N' : move commands */ -/* 'o', doopen, */ - 'O', doset, - 'p', dopay, - 'P', dowearring, - 'q', dodrink, - 'Q', done1, - 'r', doread, - 'R', doremring, - 's', dosearch, - 'S', dosave, - 't', dothrow, - 'T', doremarm, -/* 'u', 'U' : go ne */ - 'v', doversion, -/* 'V' : UNUSED */ - 'w', dowield, - 'W', doweararm, -/* 'x', 'X' : UNUSED */ -/* 'y', 'Y' : go nw */ - 'z', dozap, -/* 'Z' : UNUSED */ - '<', doup, - '>', dodown, - '/', dowhatis, - '?', dohelp, + { '\032', dosuspend }, +#endif { /* SUSPEND */ + { 'a', doapply }, + /* 'A' : UNUSED */ + /* 'b', 'B' : go sw */ + { 'c', ddocall }, + { 'C', do_mname }, + { 'd', dodrop }, + { 'D', doddrop }, + { 'e', doeat }, + { 'E', doengrave }, + /* 'f', 'F' : multiple go (might become 'fight') */ + /* 'g', 'G' : UNUSED */ + /* 'h', 'H' : go west */ + { 'I', dotypeinv }, /* Robert Viduya */ + { 'i', ddoinv }, + /* 'j', 'J', 'k', 'K', 'l', 'L', 'm', 'M', 'n', 'N' : move commands */ + /* 'o', doopen, */ + { 'O', doset }, + { 'p', dopay }, + { 'P', dowearring }, + { 'q', dodrink }, + { 'Q', dodone }, + { 'r', doread }, + { 'R', doremring }, + { 's', dosearch }, + { 'S', dosave }, + { 't', dothrow }, + { 'T', doremarm }, + /* 'u', 'U' : go ne */ + { 'v', doversion }, + /* 'V' : UNUSED */ + { 'w', dowield }, + { 'W', doweararm }, + /* 'x', 'X' : UNUSED */ + /* 'y', 'Y' : go nw */ + { 'z', dozap }, + /* 'Z' : UNUSED */ + { '<', doup }, + { '>', dodown }, + { '/', dowhatis }, + { '?', dohelp }, #ifdef SHELL - '!', dosh, -#endif SHELL - '.', donull, - ' ', donull, - ',', dopickup, - ':', dolook, - '^', doidtrap, - '\\', dodiscovered, /* Robert Viduya */ - WEAPON_SYM, doprwep, - ARMOR_SYM, doprarm, - RING_SYM, doprring, - '$', doprgold, - '#', doextcmd, - 0,0,0 + { '!', dosh }, +#endif { /* SHELL */ + { '.', donull }, + { ' ', donull }, + { ',', dopickup }, + { ':', dolook }, + { '^', doidtrap }, + { '\\', dodiscovered }, /* Robert Viduya */ + { WEAPON_SYM, doprwep }, + { ARMOR_SYM, doprarm }, + { RING_SYM, doprring }, + { '$', doprgold }, + { '#', doextcmd }, + { 0, 0 } }; struct ext_func_tab extcmdlist[] = { - "dip", dodip, - "pray", dopray, - (char *) 0, donull + { "dip", dodip }, + { "pray", dopray }, + { (char *) 0, donull } }; -extern char *parse(), lowc(), unctrl(), quitchars[]; - +void rhack(cmd) -register char *cmd; + char *cmd; { - register struct func_tab *tlist = cmdlist; - boolean firsttime = FALSE; - register res; + struct func_tab *tlist = cmdlist; + boolean firsttime = FALSE; + int res; - if(!cmd) { + if (!cmd) { firsttime = TRUE; flags.nopick = 0; cmd = parse(); } - if(!*cmd || (*cmd & 0377) == 0377 || - (flags.no_rest_on_space && *cmd == ' ')){ + if (!*cmd || (*cmd & 0377) == 0377 || + (flags.no_rest_on_space && *cmd == ' ')) { bell(); flags.move = 0; return; /* probably we just had an interrupt */ } - if(movecmd(*cmd)) { - walk: - if(multi) flags.mv = 1; + if (movecmd(*cmd)) { +walk: + if (multi) + flags.mv = 1; domove(); return; } - if(movecmd(lowc(*cmd))) { + if (movecmd(lowc(*cmd))) { flags.run = 1; - rush: - if(firsttime){ - if(!multi) multi = COLNO; +rush: + if (firsttime) { + if (!multi) + multi = COLNO; u.last_str_turn = 0; } flags.mv = 1; #ifdef QUEST - if(flags.run >= 4) finddir(); - if(firsttime){ + if (flags.run >= 4) + finddir(); + if (firsttime) { u.ux0 = u.ux + u.dx; u.uy0 = u.uy + u.dy; } -#endif QUEST +#endif /* QUEST */ domove(); return; } - if((*cmd == 'f' && movecmd(cmd[1])) || movecmd(unctrl(*cmd))) { + if ((*cmd == 'f' && movecmd(cmd[1])) || movecmd(unctrl(*cmd))) { flags.run = 2; goto rush; } - if(*cmd == 'F' && movecmd(lowc(cmd[1]))) { + if (*cmd == 'F' && movecmd(lowc(cmd[1]))) { flags.run = 3; goto rush; } - if(*cmd == 'm' && movecmd(cmd[1])) { + if (*cmd == 'm' && movecmd(cmd[1])) { flags.run = 0; flags.nopick = 1; goto walk; } - if(*cmd == 'M' && movecmd(lowc(cmd[1]))) { + if (*cmd == 'M' && movecmd(lowc(cmd[1]))) { flags.run = 1; flags.nopick = 1; goto rush; } #ifdef QUEST - if(*cmd == cmd[1] && (*cmd == 'f' || *cmd == 'F')) { + if (*cmd == cmd[1] && (*cmd == 'f' || *cmd == 'F')) { flags.run = 4; - if(*cmd == 'F') flags.run += 2; - if(cmd[2] == '-') flags.run += 1; + if (*cmd == 'F') + flags.run += 2; + if (cmd[2] == '-') + flags.run += 1; goto rush; } -#endif QUEST - while(tlist->f_char) { - if(*cmd == tlist->f_char){ - res = (*(tlist->f_funct))(); - if(!res) { +#endif /* QUEST */ + while (tlist->f_char) { + if (*cmd == tlist->f_char) { + res = (*(tlist->f_funct)) (); + if (!res) { flags.move = 0; multi = 0; } @@ -173,135 +168,158 @@ register char *cmd; } tlist++; } - { char expcmd[10]; - register char *cp = expcmd; - while(*cmd && cp-expcmd < sizeof(expcmd)-2) { - if(*cmd >= 040 && *cmd < 0177) - *cp++ = *cmd++; - else { - *cp++ = '^'; - *cp++ = *cmd++ ^ 0100; + { + char expcmd[10]; + char *cp = expcmd; + while (*cmd && cp - expcmd < sizeof(expcmd) - 2) { + if (*cmd >= 040 && *cmd < 0177) + *cp++ = *cmd++; + else { + *cp++ = '^'; + *cp++ = *cmd++ ^ 0100; + } } - } - *cp++ = 0; - pline("Unknown command '%s'.", expcmd); + *cp++ = 0; + pline("Unknown command '%s'.", expcmd); } multi = flags.move = 0; } -doextcmd() /* here after # - now read a full-word command */ -{ - char buf[BUFSZ]; - register struct ext_func_tab *efp = extcmdlist; +int +doextcmd() +{ /* here after # - now read a full-word + * command */ + char buf[BUFSZ]; + struct ext_func_tab *efp = extcmdlist; pline("# "); getlin(buf); clrlin(); - if(buf[0] == '\033') - return(0); - while(efp->ef_txt) { - if(!strcmp(efp->ef_txt, buf)) - return((*(efp->ef_funct))()); + if (buf[0] == '\033') + return (0); + while (efp->ef_txt) { + if (!strcmp(efp->ef_txt, buf)) + return ((*(efp->ef_funct)) ()); efp++; } pline("%s: unknown command.", buf); - return(0); + return (0); } char lowc(sym) -char sym; + char sym; { - return( (sym >= 'A' && sym <= 'Z') ? sym+'a'-'A' : sym ); + return ((sym >= 'A' && sym <= 'Z') ? sym + 'a' - 'A' : sym); } char unctrl(sym) -char sym; + char sym; { - return( (sym >= ('A' & 037) && sym <= ('Z' & 037)) ? sym + 0140 : sym ); + return ((sym >= ('A' & 037) && sym <= ('Z' & 037)) ? sym + 0140 : sym); } /* 'rogue'-like direction commands */ -char sdir[] = "hykulnjb><"; -schar xdir[10] = { -1,-1, 0, 1, 1, 1, 0,-1, 0, 0 }; -schar ydir[10] = { 0,-1,-1,-1, 0, 1, 1, 1, 0, 0 }; -schar zdir[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 1,-1 }; +char sdir[] = "hykulnjb><"; +schar xdir[10] = {-1, -1, 0, 1, 1, 1, 0, -1, 0, 0}; +schar ydir[10] = {0, -1, -1, -1, 0, 1, 1, 1, 0, 0}; +schar zdir[10] = {0, 0, 0, 0, 0, 0, 0, 0, 1, -1}; -movecmd(sym) /* also sets u.dz, but returns false for <> */ -char sym; +int +movecmd(sym) /* also sets u.dz, but returns false for <> */ + char sym; { - register char *dp; + char *dp; u.dz = 0; - if(!(dp = index(sdir, sym))) return(0); - u.dx = xdir[dp-sdir]; - u.dy = ydir[dp-sdir]; - u.dz = zdir[dp-sdir]; - return(!u.dz); + if (!(dp = strchr(sdir, sym))) + return (0); + u.dx = xdir[dp - sdir]; + u.dy = ydir[dp - sdir]; + u.dz = zdir[dp - sdir]; + return (!u.dz); } +int getdir(s) -boolean s; + boolean s; { - char dirsym; + char dirsym; - if(s) pline("In what direction?"); + if (s) + pline("In what direction?"); dirsym = readchar(); - if(!movecmd(dirsym) && !u.dz) { - if(!index(quitchars, dirsym)) + if (!movecmd(dirsym) && !u.dz) { + if (!strchr(quitchars, dirsym)) pline("What a strange direction!"); - return(0); + return (0); } - if(Confusion && !u.dz) + if (Confusion && !u.dz) confdir(); - return(1); + return (1); } +void confdir() { - register x = rn2(8); + int x = rn2(8); u.dx = xdir[x]; u.dy = ydir[x]; } #ifdef QUEST -finddir(){ -register int i, ui = u.di; - for(i = 0; i <= 8; i++){ - if(flags.run & 1) ui++; else ui += 7; +int +finddir() +{ + int i, ui = u.di; + for (i = 0; i <= 8; i++) { + if (flags.run & 1) + ui++; + else + ui += 7; ui %= 8; - if(i == 8){ + if (i == 8) { pline("Not near a wall."); flags.move = multi = 0; - return(0); + return (0); } - if(!isroom(u.ux+xdir[ui], u.uy+ydir[ui])) + if (!isroom(u.ux + xdir[ui], u.uy + ydir[ui])) break; } - for(i = 0; i <= 8; i++){ - if(flags.run & 1) ui += 7; else ui++; + for (i = 0; i <= 8; i++) { + if (flags.run & 1) + ui += 7; + else + ui++; ui %= 8; - if(i == 8){ + if (i == 8) { pline("Not near a room."); flags.move = multi = 0; - return(0); + return (0); } - if(isroom(u.ux+xdir[ui], u.uy+ydir[ui])) + if (isroom(u.ux + xdir[ui], u.uy + ydir[ui])) break; } u.di = ui; u.dx = xdir[ui]; u.dy = ydir[ui]; + return 0; } -isroom(x,y) register x,y; { /* what about POOL? */ - return(isok(x,y) && (levl[x][y].typ == ROOM || - (levl[x][y].typ >= LDOOR && flags.run >= 6))); +int +isroom(x, y) + int x, y; +{ /* what about POOL? */ + return (isok(x, y) && (levl[x][y].typ == ROOM || + (levl[x][y].typ >= LDOOR && flags.run >= 6))); } -#endif QUEST +#endif /* QUEST */ -isok(x,y) register x,y; { +int +isok(x, y) + int x, y; +{ /* x corresponds to curx, so x==1 is the first column. Ach. %% */ - return(x >= 1 && x <= COLNO-1 && y >= 0 && y <= ROWNO-1); + return (x >= 1 && x <= COLNO - 1 && y >= 0 && y <= ROWNO - 1); } diff --git a/hack/hack.do.c b/hack/hack.do.c index aec8b911..2ac7f279 100644 --- a/hack/hack.do.c +++ b/hack/hack.do.c @@ -1,140 +1,156 @@ +/* $NetBSD: hack.do.c,v 1.4 1997/10/19 16:57:41 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.do.c,v 1.3 1995/03/23 08:29:53 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.do.c,v 1.4 1997/10/19 16:57:41 christos Exp $"); +#endif /* not lint */ /* Contains code for 'd', 'D' (drop), '>', '<' (up, down) and 't' (throw) */ #include "hack.h" +#include "extern.h" +#include <fcntl.h> +#include <unistd.h> +#include <stdlib.h> -extern struct obj *splitobj(), *addinv(); -extern boolean hmon(); -extern boolean level_exists[]; -extern struct monst youmonst; -extern char *Doname(); -extern char *nomovemsg; -static int drop(); +static int drop __P((struct obj *)); -dodrop() { - return(drop(getobj("0$#", "drop"))); +int +dodrop() +{ + return (drop(getobj("0$#", "drop"))); } static int -drop(obj) register struct obj *obj; { - if(!obj) return(0); - if(obj->olet == '$') { /* pseudo object */ - register long amount = OGOLD(obj); +drop(obj) + struct obj *obj; +{ + if (!obj) + return (0); + if (obj->olet == '$') { /* pseudo object */ + long amount = OGOLD(obj); - if(amount == 0) + if (amount == 0) pline("You didn't drop any gold pieces."); else { mkgold(amount, u.ux, u.uy); pline("You dropped %ld gold piece%s.", - amount, plur(amount)); - if(Invisible) newsym(u.ux, u.uy); + amount, plur(amount)); + if (Invisible) + newsym(u.ux, u.uy); } free((char *) obj); - return(1); + return (1); } - if(obj->owornmask & (W_ARMOR | W_RING)){ + if (obj->owornmask & (W_ARMOR | W_RING)) { pline("You cannot drop something you are wearing."); - return(0); + return (0); } - if(obj == uwep) { - if(uwep->cursed) { + if (obj == uwep) { + if (uwep->cursed) { pline("Your weapon is welded to your hand!"); - return(0); + return (0); } setuwep((struct obj *) 0); } pline("You dropped %s.", doname(obj)); dropx(obj); - return(1); + return (1); } /* Called in several places - should not produce texts */ +void dropx(obj) -register struct obj *obj; + struct obj *obj; { freeinv(obj); dropy(obj); } +void dropy(obj) -register struct obj *obj; + struct obj *obj; { - if(obj->otyp == CRYSKNIFE) + if (obj->otyp == CRYSKNIFE) obj->otyp = WORM_TOOTH; obj->ox = u.ux; obj->oy = u.uy; obj->nobj = fobj; fobj = obj; - if(Invisible) newsym(u.ux,u.uy); + if (Invisible) + newsym(u.ux, u.uy); subfrombill(obj); stackobj(obj); } /* drop several things */ -doddrop() { - return(ggetobj("drop", drop, 0)); +int +doddrop() +{ + return (ggetobj("drop", drop, 0)); } +int dodown() { - if(u.ux != xdnstair || u.uy != ydnstair) { + if (u.ux != xdnstair || u.uy != ydnstair) { pline("You can't go down here."); - return(0); + return (0); } - if(u.ustuck) { + if (u.ustuck) { pline("You are being held, and cannot go down."); - return(1); + return (1); } - if(Levitation) { + if (Levitation) { pline("You're floating high above the stairs."); - return(0); + return (0); } - - goto_level(dlevel+1, TRUE); - return(1); + goto_level(dlevel + 1, TRUE); + return (1); } +int doup() { - if(u.ux != xupstair || u.uy != yupstair) { + if (u.ux != xupstair || u.uy != yupstair) { pline("You can't go up here."); - return(0); + return (0); } - if(u.ustuck) { + if (u.ustuck) { pline("You are being held, and cannot go up."); - return(1); + return (1); } - if(!Levitation && inv_weight() + 5 > 0) { + if (!Levitation && inv_weight() + 5 > 0) { pline("Your load is too heavy to climb the stairs."); - return(1); + return (1); } - - goto_level(dlevel-1, TRUE); - return(1); + goto_level(dlevel - 1, TRUE); + return (1); } +void goto_level(newlevel, at_stairs) -register int newlevel; -register boolean at_stairs; + int newlevel; + boolean at_stairs; { - register fd; - register boolean up = (newlevel < dlevel); + int fd; + boolean up = (newlevel < dlevel); - if(newlevel <= 0) done("escaped"); /* in fact < 0 is impossible */ - if(newlevel > MAXLEVEL) newlevel = MAXLEVEL; /* strange ... */ - if(newlevel == dlevel) return; /* this can happen */ + if (newlevel <= 0) + done("escaped");/* in fact < 0 is impossible */ + if (newlevel > MAXLEVEL) + newlevel = MAXLEVEL; /* strange ... */ + if (newlevel == dlevel) + return; /* this can happen */ glo(dlevel); fd = creat(lock, FMASK); - if(fd < 0) { + if (fd < 0) { /* * This is not quite impossible: e.g., we may have * exceeded our quota. If that is the case then we @@ -143,35 +159,33 @@ register boolean at_stairs; * writable. */ pline("A mysterious force prevents you from going %s.", - up ? "up" : "down"); + up ? "up" : "down"); return; } - - if(Punished) unplacebc(); - u.utrap = 0; /* needed in level_tele */ - u.ustuck = 0; /* idem */ + if (Punished) + unplacebc(); + u.utrap = 0; /* needed in level_tele */ + u.ustuck = 0; /* idem */ keepdogs(); seeoff(1); - if(u.uswallow) /* idem */ + if (u.uswallow) /* idem */ u.uswldtim = u.uswallow = 0; flags.nscrinh = 1; - u.ux = FAR; /* hack */ - (void) inshop(); /* probably was a trapdoor */ + u.ux = FAR; /* hack */ + (void) inshop(); /* probably was a trapdoor */ - savelev(fd,dlevel); + savelev(fd, dlevel); (void) close(fd); dlevel = newlevel; - if(maxdlevel < dlevel) + if (maxdlevel < dlevel) maxdlevel = dlevel; glo(dlevel); - if(!level_exists[dlevel]) + if (!level_exists[dlevel]) mklev(); else { - extern int hackpid; - - if((fd = open(lock,0)) < 0) { + if ((fd = open(lock, 0)) < 0) { pline("Cannot open %s .", lock); pline("Probably someone removed it."); done("tricked"); @@ -180,229 +194,244 @@ register boolean at_stairs; (void) close(fd); } - if(at_stairs) { - if(up) { - u.ux = xdnstair; - u.uy = ydnstair; - if(!u.ux) { /* entering a maze from below? */ - u.ux = xupstair; /* this will confuse the player! */ - u.uy = yupstair; + if (at_stairs) { + if (up) { + u.ux = xdnstair; + u.uy = ydnstair; + if (!u.ux) { /* entering a maze from below? */ + u.ux = xupstair; /* this will confuse the + * player! */ + u.uy = yupstair; + } + if (Punished && !Levitation) { + pline("With great effort you climb the stairs."); + placebc(1); + } + } else { + u.ux = xupstair; + u.uy = yupstair; + if (inv_weight() + 5 > 0 || Punished) { + pline("You fall down the stairs."); /* %% */ + losehp(rnd(3), "fall"); + if (Punished) { + if (uwep != uball && rn2(3)) { + pline("... and are hit by the iron ball."); + losehp(rnd(20), "iron ball"); + } + placebc(1); + } + selftouch("Falling, you"); + } } - if(Punished && !Levitation){ - pline("With great effort you climb the stairs."); - placebc(1); + { + struct monst *mtmp = m_at(u.ux, u.uy); + if (mtmp) + mnexto(mtmp); } - } else { - u.ux = xupstair; - u.uy = yupstair; - if(inv_weight() + 5 > 0 || Punished){ - pline("You fall down the stairs."); /* %% */ - losehp(rnd(3), "fall"); - if(Punished) { - if(uwep != uball && rn2(3)){ - pline("... and are hit by the iron ball."); - losehp(rnd(20), "iron ball"); - } - placebc(1); + } else { /* trapdoor or level_tele */ + do { + u.ux = rnd(COLNO - 1); + u.uy = rn2(ROWNO); + } while (levl[u.ux][u.uy].typ != ROOM || + m_at(u.ux, u.uy)); + if (Punished) { + if (uwep != uball && !up /* %% */ && rn2(5)) { + pline("The iron ball falls on your head."); + losehp(rnd(25), "iron ball"); } - selftouch("Falling, you"); - } - } - { register struct monst *mtmp = m_at(u.ux, u.uy); - if(mtmp) - mnexto(mtmp); - } - } else { /* trapdoor or level_tele */ - do { - u.ux = rnd(COLNO-1); - u.uy = rn2(ROWNO); - } while(levl[u.ux][u.uy].typ != ROOM || - m_at(u.ux,u.uy)); - if(Punished){ - if(uwep != uball && !up /* %% */ && rn2(5)){ - pline("The iron ball falls on your head."); - losehp(rnd(25), "iron ball"); + placebc(1); } - placebc(1); - } - selftouch("Falling, you"); + selftouch("Falling, you"); } (void) inshop(); initrack(); losedogs(); - { register struct monst *mtmp; - if(mtmp = m_at(u.ux, u.uy)) mnexto(mtmp); /* riv05!a3 */ + { + struct monst *mtmp; + if ((mtmp = m_at(u.ux, u.uy)) != NULL) + mnexto(mtmp); /* riv05!a3 */ } flags.nscrinh = 0; setsee(); - seeobjs(); /* make old cadavers disappear - riv05!a3 */ + seeobjs(); /* make old cadavers disappear - riv05!a3 */ docrt(); pickup(1); - read_engr_at(u.ux,u.uy); + read_engr_at(u.ux, u.uy); } -donull() { - return(1); /* Do nothing, but let other things happen */ +int +donull() +{ + return (1); /* Do nothing, but let other things happen */ } -dopray() { +int +dopray() +{ nomovemsg = "You finished your prayer."; nomul(-3); - return(1); + return (1); } -struct monst *bhit(), *boomhit(); +int dothrow() { - register struct obj *obj; - register struct monst *mon; - register tmp; - - obj = getobj("#)", "throw"); /* it is also possible to throw food */ - /* (or jewels, or iron balls ... ) */ - if(!obj || !getdir(1)) /* ask "in what direction?" */ - return(0); - if(obj->owornmask & (W_ARMOR | W_RING)){ + struct obj *obj; + struct monst *mon; + int tmp; + + obj = getobj("#)", "throw"); /* it is also possible to throw food */ + /* (or jewels, or iron balls ... ) */ + if (!obj || !getdir(1)) /* ask "in what direction?" */ + return (0); + if (obj->owornmask & (W_ARMOR | W_RING)) { pline("You can't throw something you are wearing."); - return(0); + return (0); } - u_wipe_engr(2); - if(obj == uwep){ - if(obj->cursed){ + if (obj == uwep) { + if (obj->cursed) { pline("Your weapon is welded to your hand."); - return(1); + return (1); } - if(obj->quan > 1) + if (obj->quan > 1) setuwep(splitobj(obj, 1)); else setuwep((struct obj *) 0); - } - else if(obj->quan > 1) + } else if (obj->quan > 1) (void) splitobj(obj, 1); freeinv(obj); - if(u.uswallow) { + if (u.uswallow) { mon = u.ustuck; bhitpos.x = mon->mx; bhitpos.y = mon->my; - } else if(u.dz) { - if(u.dz < 0) { - pline("%s hits the ceiling, then falls back on top of your head.", - Doname(obj)); /* note: obj->quan == 1 */ - if(obj->olet == POTION_SYM) - potionhit(&youmonst, obj); - else { - if(uarmh) pline("Fortunately, you are wearing a helmet!"); - losehp(uarmh ? 1 : rnd((int)(obj->owt)), "falling object"); - dropy(obj); - } - } else { - pline("%s hits the floor.", Doname(obj)); - if(obj->otyp == EXPENSIVE_CAMERA) { - pline("It is shattered in a thousand pieces!"); - obfree(obj, Null(obj)); - } else if(obj->otyp == EGG) { - pline("\"Splash!\""); - obfree(obj, Null(obj)); - } else if(obj->olet == POTION_SYM) { - pline("The flask breaks, and you smell a peculiar odor ..."); - potionbreathe(obj); - obfree(obj, Null(obj)); - } else { - dropy(obj); - } - } - return(1); - } else if(obj->otyp == BOOMERANG) { + } else if (u.dz) { + if (u.dz < 0) { + pline("%s hits the ceiling, then falls back on top of your head.", + Doname(obj)); /* note: obj->quan == 1 */ + if (obj->olet == POTION_SYM) + potionhit(&youmonst, obj); + else { + if (uarmh) + pline("Fortunately, you are wearing a helmet!"); + losehp(uarmh ? 1 : rnd((int) (obj->owt)), "falling object"); + dropy(obj); + } + } else { + pline("%s hits the floor.", Doname(obj)); + if (obj->otyp == EXPENSIVE_CAMERA) { + pline("It is shattered in a thousand pieces!"); + obfree(obj, Null(obj)); + } else if (obj->otyp == EGG) { + pline("\"Splash!\""); + obfree(obj, Null(obj)); + } else if (obj->olet == POTION_SYM) { + pline("The flask breaks, and you smell a peculiar odor ..."); + potionbreathe(obj); + obfree(obj, Null(obj)); + } else { + dropy(obj); + } + } + return (1); + } else if (obj->otyp == BOOMERANG) { mon = boomhit(u.dx, u.dy); - if(mon == &youmonst) { /* the thing was caught */ + if (mon == &youmonst) { /* the thing was caught */ (void) addinv(obj); - return(1); + return (1); } } else { - if(obj->otyp == PICK_AXE && shkcatch(obj)) - return(1); + if (obj->otyp == PICK_AXE && shkcatch(obj)) + return (1); mon = bhit(u.dx, u.dy, (obj->otyp == ICE_BOX) ? 1 : (!Punished || obj != uball) ? 8 : !u.ustuck ? 5 : 1, - obj->olet, - (int (*)()) 0, (int (*)()) 0, obj); + obj->olet, + (void (*) __P((struct monst *, struct obj *))) 0, + (int (*) __P((struct obj *, struct obj *))) 0, obj); } - if(mon) { + if (mon) { /* awake monster if sleeping */ wakeup(mon); - if(obj->olet == WEAPON_SYM) { - tmp = -1+u.ulevel+mon->data->ac+abon(); - if(obj->otyp < ROCK) { - if(!uwep || - uwep->otyp != obj->otyp+(BOW-ARROW)) + if (obj->olet == WEAPON_SYM) { + tmp = -1 + u.ulevel + mon->data->ac + abon(); + if (obj->otyp < ROCK) { + if (!uwep || + uwep->otyp != obj->otyp + (BOW - ARROW)) tmp -= 4; else { tmp += uwep->spe; } - } else - if(obj->otyp == BOOMERANG) tmp += 4; + } else if (obj->otyp == BOOMERANG) + tmp += 4; tmp += obj->spe; - if(u.uswallow || tmp >= rnd(20)) { - if(hmon(mon,obj,1) == TRUE){ - /* mon still alive */ + if (u.uswallow || tmp >= rnd(20)) { + if (hmon(mon, obj, 1) == TRUE) { + /* mon still alive */ #ifndef NOWORM - cutworm(mon,bhitpos.x,bhitpos.y,obj->otyp); -#endif NOWORM - } else mon = 0; + cutworm(mon, bhitpos.x, bhitpos.y, obj->otyp); +#endif /* NOWORM */ + } else + mon = 0; /* weapons thrown disappear sometimes */ - if(obj->otyp < BOOMERANG && rn2(3)) { + if (obj->otyp < BOOMERANG && rn2(3)) { /* check bill; free */ obfree(obj, (struct obj *) 0); - return(1); + return (1); } - } else miss(objects[obj->otyp].oc_name, mon); - } else if(obj->otyp == HEAVY_IRON_BALL) { - tmp = -1+u.ulevel+mon->data->ac+abon(); - if(!Punished || obj != uball) tmp += 2; - if(u.utrap) tmp -= 2; - if(u.uswallow || tmp >= rnd(20)) { - if(hmon(mon,obj,1) == FALSE) + } else + miss(objects[obj->otyp].oc_name, mon); + } else if (obj->otyp == HEAVY_IRON_BALL) { + tmp = -1 + u.ulevel + mon->data->ac + abon(); + if (!Punished || obj != uball) + tmp += 2; + if (u.utrap) + tmp -= 2; + if (u.uswallow || tmp >= rnd(20)) { + if (hmon(mon, obj, 1) == FALSE) mon = 0; /* he died */ - } else miss("iron ball", mon); - } else if(obj->olet == POTION_SYM && u.ulevel > rn2(15)) { + } else + miss("iron ball", mon); + } else if (obj->olet == POTION_SYM && u.ulevel > rn2(15)) { potionhit(mon, obj); - return(1); + return (1); } else { - if(cansee(bhitpos.x,bhitpos.y)) - pline("You miss %s.",monnam(mon)); - else pline("You miss it."); - if(obj->olet == FOOD_SYM && mon->data->mlet == 'd') - if(tamedog(mon,obj)) return(1); - if(obj->olet == GEM_SYM && mon->data->mlet == 'u' && - !mon->mtame){ - if(obj->dknown && objects[obj->otyp].oc_name_known){ - if(objects[obj->otyp].g_val > 0){ - u.uluck += 5; - goto valuable; - } else { - pline("%s is not interested in your junk.", - Monnam(mon)); - } - } else { /* value unknown to @ */ - u.uluck++; + if (cansee(bhitpos.x, bhitpos.y)) + pline("You miss %s.", monnam(mon)); + else + pline("You miss it."); + if (obj->olet == FOOD_SYM && mon->data->mlet == 'd') + if (tamedog(mon, obj)) + return (1); + if (obj->olet == GEM_SYM && mon->data->mlet == 'u' && + !mon->mtame) { + if (obj->dknown && objects[obj->otyp].oc_name_known) { + if (objects[obj->otyp].g_val > 0) { + u.uluck += 5; + goto valuable; + } else { + pline("%s is not interested in your junk.", + Monnam(mon)); + } + } else { /* value unknown to @ */ + u.uluck++; valuable: - if(u.uluck > LUCKMAX) /* dan@ut-ngp */ - u.uluck = LUCKMAX; - pline("%s graciously accepts your gift.", - Monnam(mon)); - mpickobj(mon, obj); - rloc(mon); - return(1); - } + if (u.uluck > LUCKMAX) /* dan@ut-ngp */ + u.uluck = LUCKMAX; + pline("%s graciously accepts your gift.", + Monnam(mon)); + mpickobj(mon, obj); + rloc(mon); + return (1); + } } } } - /* the code following might become part of dropy() */ - if(obj->otyp == CRYSKNIFE) + /* the code following might become part of dropy() */ + if (obj->otyp == CRYSKNIFE) obj->otyp = WORM_TOOTH; obj->ox = bhitpos.x; obj->oy = bhitpos.y; @@ -411,21 +440,21 @@ dothrow() /* prevent him from throwing articles to the exit and escaping */ /* subfrombill(obj); */ stackobj(obj); - if(Punished && obj == uball && - (bhitpos.x != u.ux || bhitpos.y != u.uy)){ + if (Punished && obj == uball && + (bhitpos.x != u.ux || bhitpos.y != u.uy)) { freeobj(uchain); unpobj(uchain); - if(u.utrap){ - if(u.utraptype == TT_PIT) + if (u.utrap) { + if (u.utraptype == TT_PIT) pline("The ball pulls you out of the pit!"); else { - register long side = + long side = rn2(3) ? LEFT_SIDE : RIGHT_SIDE; - pline("The ball pulls you out of the bear trap."); - pline("Your %s leg is severely damaged.", - (side == LEFT_SIDE) ? "left" : "right"); - set_wounded_legs(side, 500+rn2(1000)); - losehp(2, "thrown ball"); + pline("The ball pulls you out of the bear trap."); + pline("Your %s leg is severely damaged.", + (side == LEFT_SIDE) ? "left" : "right"); + set_wounded_legs(side, 500 + rn2(1000)); + losehp(2, "thrown ball"); } u.utrap = 0; } @@ -437,15 +466,19 @@ dothrow() setsee(); (void) inshop(); } - if(cansee(bhitpos.x, bhitpos.y)) prl(bhitpos.x,bhitpos.y); - return(1); + if (cansee(bhitpos.x, bhitpos.y)) + prl(bhitpos.x, bhitpos.y); + return (1); } /* split obj so that it gets size num */ /* remainder is put in the object structure delivered by this call */ -struct obj * -splitobj(obj, num) register struct obj *obj; register int num; { -register struct obj *otmp; +struct obj * +splitobj(obj, num) + struct obj *obj; + int num; +{ + struct obj *otmp; otmp = newobj(0); *otmp = *obj; /* copies whole structure */ otmp->o_id = flags.ident++; @@ -455,36 +488,39 @@ register struct obj *otmp; otmp->quan -= num; otmp->owt = weight(otmp); /* -= obj->owt ? */ obj->nobj = otmp; - if(obj->unpaid) splitbill(obj,otmp); - return(otmp); + if (obj->unpaid) + splitbill(obj, otmp); + return (otmp); } -more_experienced(exp,rexp) -register int exp, rexp; +void +more_experienced(exp, rexp) + int exp, rexp; { - extern char pl_character[]; - u.uexp += exp; - u.urexp += 4*exp + rexp; - if(exp) flags.botl = 1; - if(u.urexp >= ((pl_character[0] == 'W') ? 1000 : 2000)) + u.urexp += 4 * exp + rexp; + if (exp) + flags.botl = 1; + if (u.urexp >= ((pl_character[0] == 'W') ? 1000 : 2000)) flags.beginner = 0; } +void set_wounded_legs(side, timex) -register long side; -register int timex; + long side; + int timex; { - if(!Wounded_legs || (Wounded_legs & TIMEOUT)) + if (!Wounded_legs || (Wounded_legs & TIMEOUT)) Wounded_legs |= side + timex; else Wounded_legs |= side; } +void heal_legs() { - if(Wounded_legs) { - if((Wounded_legs & BOTH_SIDES) == BOTH_SIDES) + if (Wounded_legs) { + if ((Wounded_legs & BOTH_SIDES) == BOTH_SIDES) pline("Your legs feel somewhat better."); else pline("Your leg feels somewhat better."); diff --git a/hack/hack.do_name.c b/hack/hack.do_name.c index 313b5533..482c5e98 100644 --- a/hack/hack.do_name.c +++ b/hack/hack.do_name.c @@ -1,99 +1,106 @@ +/* $NetBSD: hack.do_name.c,v 1.4 1997/10/19 16:57:46 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.do_name.c,v 1.3 1995/03/23 08:29:56 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.do_name.c,v 1.4 1997/10/19 16:57:46 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" -#include <stdio.h> -extern char plname[]; +#include "extern.h" coord -getpos(force,goal) int force; char *goal; { -register cx,cy,i,c; -extern char sdir[]; /* defined in hack.c */ -extern schar xdir[], ydir[]; /* idem */ -extern char *visctrl(); /* see below */ -coord cc; +getpos(force, goal) + int force; + char *goal; +{ + int cx, cy, i, c; + coord cc; pline("(For instructions type a ?)"); cx = u.ux; cy = u.uy; - curs(cx,cy+2); - while((c = readchar()) != '.'){ - for(i=0; i<8; i++) if(sdir[i] == c){ - if(1 <= cx + xdir[i] && cx + xdir[i] <= COLNO) - cx += xdir[i]; - if(0 <= cy + ydir[i] && cy + ydir[i] <= ROWNO-1) - cy += ydir[i]; - goto nxtc; - } - if(c == '?'){ + curs(cx, cy + 2); + while ((c = readchar()) != '.') { + for (i = 0; i < 8; i++) + if (sdir[i] == c) { + if (1 <= cx + xdir[i] && cx + xdir[i] <= COLNO) + cx += xdir[i]; + if (0 <= cy + ydir[i] && cy + ydir[i] <= ROWNO - 1) + cy += ydir[i]; + goto nxtc; + } + if (c == '?') { pline("Use [hjkl] to move the cursor to %s.", goal); pline("Type a . when you are at the right place."); } else { pline("Unknown direction: '%s' (%s).", - visctrl(c), - force ? "use hjkl or ." : "aborted"); - if(force) goto nxtc; + visctrl(c), + force ? "use hjkl or ." : "aborted"); + if (force) + goto nxtc; cc.x = -1; cc.y = 0; - return(cc); + return (cc); } - nxtc: ; - curs(cx,cy+2); +nxtc: ; + curs(cx, cy + 2); } cc.x = cx; cc.y = cy; - return(cc); + return (cc); } -do_mname(){ -char buf[BUFSZ]; -coord cc; -register int cx,cy,lth,i; -register struct monst *mtmp, *mtmp2; -extern char *lmonnam(); +int +do_mname() +{ + char buf[BUFSZ]; + coord cc; + int cx, cy, lth, i; + struct monst *mtmp, *mtmp2; cc = getpos(0, "the monster you want to name"); cx = cc.x; cy = cc.y; - if(cx < 0) return(0); - mtmp = m_at(cx,cy); - if(!mtmp){ - if(cx == u.ux && cy == u.uy) - pline("This ugly monster is called %s and cannot be renamed.", - plname); - else - pline("There is no monster there."); - return(1); + if (cx < 0) + return (0); + mtmp = m_at(cx, cy); + if (!mtmp) { + if (cx == u.ux && cy == u.uy) + pline("This ugly monster is called %s and cannot be renamed.", + plname); + else + pline("There is no monster there."); + return (1); } - if(mtmp->mimic){ - pline("I see no monster there."); - return(1); + if (mtmp->mimic) { + pline("I see no monster there."); + return (1); } - if(!cansee(cx,cy)) { - pline("I cannot see a monster there."); - return(1); + if (!cansee(cx, cy)) { + pline("I cannot see a monster there."); + return (1); } pline("What do you want to call %s? ", lmonnam(mtmp)); getlin(buf); clrlin(); - if(!*buf || *buf == '\033') - return(1); - lth = strlen(buf)+1; - if(lth > 63){ + if (!*buf || *buf == '\033') + return (1); + lth = strlen(buf) + 1; + if (lth > 63) { buf[62] = 0; lth = 63; } mtmp2 = newmonst(mtmp->mxlth + lth); *mtmp2 = *mtmp; - for(i=0; i<mtmp->mxlth; i++) + for (i = 0; i < mtmp->mxlth; i++) ((char *) mtmp2->mextra)[i] = ((char *) mtmp->mextra)[i]; mtmp2->mnamelth = lth; (void) strcpy(NAME(mtmp2), buf); - replmon(mtmp,mtmp2); - return(1); + replmon(mtmp, mtmp2); + return (1); } /* @@ -101,17 +108,20 @@ extern char *lmonnam(); * when there might be pointers around in unknown places. For now: only * when obj is in the inventory. */ -do_oname(obj) register struct obj *obj; { -register struct obj *otmp, *otmp2; -register lth; -char buf[BUFSZ]; +void +do_oname(obj) + struct obj *obj; +{ + struct obj *otmp, *otmp2; + int lth; + char buf[BUFSZ]; pline("What do you want to name %s? ", doname(obj)); getlin(buf); clrlin(); - if(!*buf || *buf == '\033') + if (!*buf || *buf == '\033') return; - lth = strlen(buf)+1; - if(lth > 63){ + lth = strlen(buf) + 1; + if (lth > 63) { buf[62] = 0; lth = 63; } @@ -123,166 +133,190 @@ char buf[BUFSZ]; setworn((struct obj *) 0, obj->owornmask); setworn(otmp2, otmp2->owornmask); - /* do freeinv(obj); etc. by hand in order to preserve - the position of this object in the inventory */ - if(obj == invent) invent = otmp2; - else for(otmp = invent; ; otmp = otmp->nobj){ - if(!otmp) - panic("Do_oname: cannot find obj."); - if(otmp->nobj == obj){ - otmp->nobj = otmp2; - break; + /* + * do freeinv(obj); etc. by hand in order to preserve the position of + * this object in the inventory + */ + if (obj == invent) + invent = otmp2; + else + for (otmp = invent;; otmp = otmp->nobj) { + if (!otmp) + panic("Do_oname: cannot find obj."); + if (otmp->nobj == obj) { + otmp->nobj = otmp2; + break; + } } - } - /* obfree(obj, otmp2); /* now unnecessary: no pointers on bill */ +#if 0 + obfree(obj, otmp2); /* now unnecessary: no pointers on bill */ +#endif free((char *) obj); /* let us hope nobody else saved a pointer */ } +int ddocall() { - register struct obj *obj; + struct obj *obj; pline("Do you want to name an individual object? [ny] "); - switch(readchar()) { + switch (readchar()) { case '\033': break; case 'y': obj = getobj("#", "name"); - if(obj) do_oname(obj); + if (obj) + do_oname(obj); break; default: obj = getobj("?!=/", "call"); - if(obj) docall(obj); + if (obj) + docall(obj); } - return(0); + return (0); } +void docall(obj) -register struct obj *obj; + struct obj *obj; { - char buf[BUFSZ]; - struct obj otemp; - register char **str1; - extern char *xname(); - register char *str; + char buf[BUFSZ]; + struct obj otemp; + char **str1; + char *str; otemp = *obj; otemp.quan = 1; otemp.onamelth = 0; str = xname(&otemp); - pline("Call %s %s: ", index(vowels,*str) ? "an" : "a", str); + pline("Call %s %s: ", strchr(vowels, *str) ? "an" : "a", str); getlin(buf); clrlin(); - if(!*buf || *buf == '\033') + if (!*buf || *buf == '\033') return; - str = newstring(strlen(buf)+1); - (void) strcpy(str,buf); + str = newstring(strlen(buf) + 1); + (void) strcpy(str, buf); str1 = &(objects[obj->otyp].oc_uname); - if(*str1) free(*str1); + if (*str1) + free(*str1); *str1 = str; } -char *ghostnames[] = { /* these names should have length < PL_NSIZ */ +char *ghostnames[] = {/* these names should have length < PL_NSIZ */ "adri", "andries", "andreas", "bert", "david", "dirk", "emile", "frans", "fred", "greg", "hether", "jay", "john", "jon", "kay", "kenny", "maud", "michiel", "mike", "peter", "robert", "ron", "tom", "wilmar" }; -char * -xmonnam(mtmp, vb) register struct monst *mtmp; int vb; { -static char buf[BUFSZ]; /* %% */ -extern char *shkname(); - if(mtmp->mnamelth && !vb) { +char * +xmonnam(mtmp, vb) + struct monst *mtmp; + int vb; +{ + static char buf[BUFSZ]; /* %% */ + if (mtmp->mnamelth && !vb) { (void) strcpy(buf, NAME(mtmp)); - return(buf); + return (buf); } - switch(mtmp->data->mlet) { + switch (mtmp->data->mlet) { case ' ': - { register char *gn = (char *) mtmp->mextra; - if(!*gn) { /* might also look in scorefile */ - gn = ghostnames[rn2(SIZE(ghostnames))]; - if(!rn2(2)) (void) - strcpy((char *) mtmp->mextra, !rn2(5) ? plname : gn); - } - (void) sprintf(buf, "%s's ghost", gn); + { + char *gn = (char *) mtmp->mextra; + if (!*gn) { /* might also look in scorefile */ + gn = ghostnames[rn2(SIZE(ghostnames))]; + if (!rn2(2)) + (void) + strcpy((char *) mtmp->mextra, !rn2(5) ? plname : gn); + } + (void) sprintf(buf, "%s's ghost", gn); } break; case '@': - if(mtmp->isshk) { + if (mtmp->isshk) { (void) strcpy(buf, shkname(mtmp)); break; } /* fall into next case */ default: (void) sprintf(buf, "the %s%s", - mtmp->minvis ? "invisible " : "", - mtmp->data->mname); + mtmp->minvis ? "invisible " : "", + mtmp->data->mname); } - if(vb && mtmp->mnamelth) { + if (vb && mtmp->mnamelth) { (void) strcat(buf, " called "); (void) strcat(buf, NAME(mtmp)); } - return(buf); + return (buf); } -char * -lmonnam(mtmp) register struct monst *mtmp; { - return(xmonnam(mtmp, 1)); +char * +lmonnam(mtmp) + struct monst *mtmp; +{ + return (xmonnam(mtmp, 1)); } -char * -monnam(mtmp) register struct monst *mtmp; { - return(xmonnam(mtmp, 0)); +char * +monnam(mtmp) + struct monst *mtmp; +{ + return (xmonnam(mtmp, 0)); } -char * -Monnam(mtmp) register struct monst *mtmp; { -register char *bp = monnam(mtmp); - if('a' <= *bp && *bp <= 'z') *bp += ('A' - 'a'); - return(bp); +char * +Monnam(mtmp) + struct monst *mtmp; +{ + char *bp = monnam(mtmp); + if ('a' <= *bp && *bp <= 'z') + *bp += ('A' - 'a'); + return (bp); } -char * -amonnam(mtmp,adj) -register struct monst *mtmp; -register char *adj; +char * +amonnam(mtmp, adj) + struct monst *mtmp; + char *adj; { - register char *bp = monnam(mtmp); - static char buf[BUFSZ]; /* %% */ + char *bp = monnam(mtmp); + static char buf[BUFSZ]; /* %% */ - if(!strncmp(bp, "the ", 4)) bp += 4; + if (!strncmp(bp, "the ", 4)) + bp += 4; (void) sprintf(buf, "the %s %s", adj, bp); - return(buf); + return (buf); } -char * +char * Amonnam(mtmp, adj) -register struct monst *mtmp; -register char *adj; + struct monst *mtmp; + char *adj; { - register char *bp = amonnam(mtmp,adj); + char *bp = amonnam(mtmp, adj); *bp = 'T'; - return(bp); + return (bp); } -char * -Xmonnam(mtmp) register struct monst *mtmp; { -register char *bp = Monnam(mtmp); - if(!strncmp(bp, "The ", 4)) { +char * +Xmonnam(mtmp) + struct monst *mtmp; +{ + char *bp = Monnam(mtmp); + if (!strncmp(bp, "The ", 4)) { bp += 2; *bp = 'A'; } - return(bp); + return (bp); } -char * +char * visctrl(c) -char c; + char c; { -static char ccc[3]; - if(c < 040) { + static char ccc[3]; + if (c < 040) { ccc[0] = '^'; ccc[1] = c + 0100; ccc[2] = 0; @@ -290,5 +324,5 @@ static char ccc[3]; ccc[0] = c; ccc[1] = 0; } - return(ccc); + return (ccc); } diff --git a/hack/hack.do_wear.c b/hack/hack.do_wear.c index 2084b630..c6274402 100644 --- a/hack/hack.do_wear.c +++ b/hack/hack.do_wear.c @@ -1,100 +1,118 @@ +/* $NetBSD: hack.do_wear.c,v 1.4 1997/10/19 16:57:48 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.do_wear.c,v 1.3 1995/03/23 08:29:57 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.do_wear.c,v 1.4 1997/10/19 16:57:48 christos Exp $"); +#endif /* not lint */ #include "hack.h" -#include <stdio.h> -extern char *nomovemsg; -extern char quitchars[]; -extern char *Doname(); +#include "extern.h" -off_msg(otmp) register struct obj *otmp; { +void +off_msg(otmp) + struct obj *otmp; +{ pline("You were wearing %s.", doname(otmp)); } -doremarm() { - register struct obj *otmp; - if(!uarm && !uarmh && !uarms && !uarmg) { +int +doremarm() +{ + struct obj *otmp; + if (!uarm && !uarmh && !uarms && !uarmg) { pline("Not wearing any armor."); - return(0); + return (0); } otmp = (!uarmh && !uarms && !uarmg) ? uarm : (!uarms && !uarm && !uarmg) ? uarmh : (!uarmh && !uarm && !uarmg) ? uarms : (!uarmh && !uarm && !uarms) ? uarmg : getobj("[", "take off"); - if(!otmp) return(0); - if(!(otmp->owornmask & (W_ARMOR - W_ARM2))) { + if (!otmp) + return (0); + if (!(otmp->owornmask & (W_ARMOR - W_ARM2))) { pline("You can't take that off."); - return(0); + return (0); } - if( otmp == uarmg && uwep && uwep->cursed ) { /* myers@uwmacc */ - pline("You seem not able to take off the gloves while holding your weapon."); - return(0); + if (otmp == uarmg && uwep && uwep->cursed) { /* myers@uwmacc */ + pline("You seem not able to take off the gloves while holding your weapon."); + return (0); } (void) armoroff(otmp); - return(1); + return (1); } -doremring() { - if(!uleft && !uright){ +int +doremring() +{ + if (!uleft && !uright) { pline("Not wearing any ring."); - return(0); + return (0); } - if(!uleft) - return(dorr(uright)); - if(!uright) - return(dorr(uleft)); - if(uleft && uright) while(1) { - char answer; + if (!uleft) + return (dorr(uright)); + if (!uright) + return (dorr(uleft)); + if (uleft && uright) + while (1) { + char answer; - pline("What ring, Right or Left? [ rl?]"); - if(index(quitchars, (answer = readchar()))) - return(0); - switch(answer) { - case 'l': - case 'L': - return(dorr(uleft)); - case 'r': - case 'R': - return(dorr(uright)); - case '?': - (void) doprring(); - /* might look at morc here %% */ + pline("What ring, Right or Left? [ rl?]"); + if (strchr(quitchars, (answer = readchar()))) + return (0); + switch (answer) { + case 'l': + case 'L': + return (dorr(uleft)); + case 'r': + case 'R': + return (dorr(uright)); + case '?': + (void) doprring(); + /* might look at morc here %% */ + } } - } /* NOTREACHED */ -#ifdef lint - return(0); -#endif lint + return (0); } -dorr(otmp) register struct obj *otmp; { - if(cursed(otmp)) return(0); +int +dorr(otmp) + struct obj *otmp; +{ + if (cursed(otmp)) + return (0); ringoff(otmp); off_msg(otmp); - return(1); + return (1); } -cursed(otmp) register struct obj *otmp; { - if(otmp->cursed){ +int +cursed(otmp) + struct obj *otmp; +{ + if (otmp->cursed) { pline("You can't. It appears to be cursed."); - return(1); + return (1); } - return(0); + return (0); } -armoroff(otmp) register struct obj *otmp; { -register int delay = -objects[otmp->otyp].oc_delay; - if(cursed(otmp)) return(0); +int +armoroff(otmp) + struct obj *otmp; +{ + int delay = -objects[otmp->otyp].oc_delay; + if (cursed(otmp)) + return (0); setworn((struct obj *) 0, otmp->owornmask & W_ARMOR); - if(delay) { + if (delay) { nomul(delay); - switch(otmp->otyp) { + switch (otmp->otyp) { case HELMET: nomovemsg = "You finished taking off your helmet."; break; @@ -107,118 +125,131 @@ register int delay = -objects[otmp->otyp].oc_delay; } else { off_msg(otmp); } - return(1); + return (1); } -doweararm() { - register struct obj *otmp; - register int delay; - register int err = 0; - long mask = 0; +int +doweararm() +{ + struct obj *otmp; + int delay; + int err = 0; + long mask = 0; otmp = getobj("[", "wear"); - if(!otmp) return(0); - if(otmp->owornmask & W_ARMOR) { + if (!otmp) + return (0); + if (otmp->owornmask & W_ARMOR) { pline("You are already wearing that!"); - return(0); + return (0); } - if(otmp->otyp == HELMET){ - if(uarmh) { + if (otmp->otyp == HELMET) { + if (uarmh) { pline("You are already wearing a helmet."); err++; } else mask = W_ARMH; - } else if(otmp->otyp == SHIELD){ - if(uarms) pline("You are already wearing a shield."), err++; - if(uwep && uwep->otyp == TWO_HANDED_SWORD) - pline("You cannot wear a shield and wield a two-handed sword."), err++; - if(!err) mask = W_ARMS; - } else if(otmp->otyp == PAIR_OF_GLOVES) { - if(uarmg) { + } else if (otmp->otyp == SHIELD) { + if (uarms) + pline("You are already wearing a shield."), err++; + if (uwep && uwep->otyp == TWO_HANDED_SWORD) + pline("You cannot wear a shield and wield a two-handed sword."), err++; + if (!err) + mask = W_ARMS; + } else if (otmp->otyp == PAIR_OF_GLOVES) { + if (uarmg) { pline("You are already wearing gloves."); err++; - } else - if(uwep && uwep->cursed) { + } else if (uwep && uwep->cursed) { pline("You cannot wear gloves over your weapon."); err++; } else mask = W_ARMG; } else { - if(uarm) { - if(otmp->otyp != ELVEN_CLOAK || uarm2) { + if (uarm) { + if (otmp->otyp != ELVEN_CLOAK || uarm2) { pline("You are already wearing some armor."); err++; } } - if(!err) mask = W_ARM; + if (!err) + mask = W_ARM; } - if(otmp == uwep && uwep->cursed) { - if(!err++) + if (otmp == uwep && uwep->cursed) { + if (!err++) pline("%s is welded to your hand.", Doname(uwep)); } - if(err) return(0); + if (err) + return (0); setworn(otmp, mask); - if(otmp == uwep) + if (otmp == uwep) setuwep((struct obj *) 0); delay = -objects[otmp->otyp].oc_delay; - if(delay){ + if (delay) { nomul(delay); nomovemsg = "You finished your dressing manoeuvre."; } otmp->known = 1; - return(1); + return (1); } -dowearring() { - register struct obj *otmp; - long mask = 0; - long oldprop; +int +dowearring() +{ + struct obj *otmp; + long mask = 0; + long oldprop; - if(uleft && uright){ + if (uleft && uright) { pline("There are no more ring-fingers to fill."); - return(0); + return (0); } otmp = getobj("=", "wear"); - if(!otmp) return(0); - if(otmp->owornmask & W_RING) { + if (!otmp) + return (0); + if (otmp->owornmask & W_RING) { pline("You are already wearing that!"); - return(0); + return (0); } - if(otmp == uleft || otmp == uright) { + if (otmp == uleft || otmp == uright) { pline("You are already wearing that."); - return(0); + return (0); } - if(otmp == uwep && uwep->cursed) { + if (otmp == uwep && uwep->cursed) { pline("%s is welded to your hand.", Doname(uwep)); - return(0); + return (0); } - if(uleft) mask = RIGHT_RING; - else if(uright) mask = LEFT_RING; - else do { - char answer; + if (uleft) + mask = RIGHT_RING; + else if (uright) + mask = LEFT_RING; + else + do { + char answer; - pline("What ring-finger, Right or Left? "); - if(index(quitchars, (answer = readchar()))) - return(0); - switch(answer){ - case 'l': - case 'L': - mask = LEFT_RING; - break; - case 'r': - case 'R': - mask = RIGHT_RING; - break; - } - } while(!mask); + pline("What ring-finger, Right or Left? "); + if (strchr(quitchars, (answer = readchar()))) + return (0); + switch (answer) { + case 'l': + case 'L': + mask = LEFT_RING; + break; + case 'r': + case 'R': + mask = RIGHT_RING; + break; + } + } while (!mask); setworn(otmp, mask); - if(otmp == uwep) + if (otmp == uwep) setuwep((struct obj *) 0); oldprop = u.uprops[PROP(otmp->otyp)].p_flgs; u.uprops[PROP(otmp->otyp)].p_flgs |= mask; - switch(otmp->otyp){ + switch (otmp->otyp) { case RIN_LEVITATION: - if(!oldprop) float_up(); + if (!oldprop) + float_up(); break; case RIN_PROTECTION_FROM_SHAPE_CHANGERS: rescham(); @@ -226,8 +257,10 @@ dowearring() { case RIN_GAIN_STRENGTH: u.ustr += otmp->spe; u.ustrmax += otmp->spe; - if(u.ustr > 118) u.ustr = 118; - if(u.ustrmax > 118) u.ustrmax = 118; + if (u.ustr > 118) + u.ustr = 118; + if (u.ustrmax > 118) + u.ustrmax = 118; flags.botl = 1; break; case RIN_INCREASE_DAMAGE: @@ -235,19 +268,20 @@ dowearring() { break; } prinv(otmp); - return(1); + return (1); } +void ringoff(obj) -register struct obj *obj; + struct obj *obj; { -register long mask; + long mask; mask = obj->owornmask & W_RING; setworn((struct obj *) 0, obj->owornmask); - if(!(u.uprops[PROP(obj->otyp)].p_flgs & mask)) + if (!(u.uprops[PROP(obj->otyp)].p_flgs & mask)) impossible("Strange... I didnt know you had that ring."); u.uprops[PROP(obj->otyp)].p_flgs &= ~mask; - switch(obj->otyp) { + switch (obj->otyp) { case RIN_FIRE_RESISTANCE: /* Bad luck if the player is in hell... --jgm */ if (!Fire_resistance && dlevel >= 30) { @@ -257,15 +291,17 @@ register long mask; } break; case RIN_LEVITATION: - if(!Levitation) { /* no longer floating */ + if (!Levitation) { /* no longer floating */ float_down(); } break; case RIN_GAIN_STRENGTH: u.ustr -= obj->spe; u.ustrmax -= obj->spe; - if(u.ustr > 118) u.ustr = 118; - if(u.ustrmax > 118) u.ustrmax = 118; + if (u.ustr > 118) + u.ustr = 118; + if (u.ustrmax > 118) + u.ustrmax = 118; flags.botl = 1; break; case RIN_INCREASE_DAMAGE: @@ -274,65 +310,83 @@ register long mask; } } -find_ac(){ -register int uac = 10; - if(uarm) uac -= ARM_BONUS(uarm); - if(uarm2) uac -= ARM_BONUS(uarm2); - if(uarmh) uac -= ARM_BONUS(uarmh); - if(uarms) uac -= ARM_BONUS(uarms); - if(uarmg) uac -= ARM_BONUS(uarmg); - if(uleft && uleft->otyp == RIN_PROTECTION) uac -= uleft->spe; - if(uright && uright->otyp == RIN_PROTECTION) uac -= uright->spe; - if(uac != u.uac){ +void +find_ac() +{ + int uac = 10; + if (uarm) + uac -= ARM_BONUS(uarm); + if (uarm2) + uac -= ARM_BONUS(uarm2); + if (uarmh) + uac -= ARM_BONUS(uarmh); + if (uarms) + uac -= ARM_BONUS(uarms); + if (uarmg) + uac -= ARM_BONUS(uarmg); + if (uleft && uleft->otyp == RIN_PROTECTION) + uac -= uleft->spe; + if (uright && uright->otyp == RIN_PROTECTION) + uac -= uright->spe; + if (uac != u.uac) { u.uac = uac; flags.botl = 1; } } -glibr(){ -register struct obj *otmp; -int xfl = 0; - if(!uarmg) if(uleft || uright) { - /* Note: at present also cursed rings fall off */ - pline("Your %s off your fingers.", - (uleft && uright) ? "rings slip" : "ring slips"); - xfl++; - if((otmp = uleft) != Null(obj)){ - ringoff(uleft); - dropx(otmp); - } - if((otmp = uright) != Null(obj)){ - ringoff(uright); - dropx(otmp); +void +glibr() +{ + struct obj *otmp; + int xfl = 0; + if (!uarmg) + if (uleft || uright) { + /* Note: at present also cursed rings fall off */ + pline("Your %s off your fingers.", + (uleft && uright) ? "rings slip" : "ring slips"); + xfl++; + if ((otmp = uleft) != Null(obj)) { + ringoff(uleft); + dropx(otmp); + } + if ((otmp = uright) != Null(obj)) { + ringoff(uright); + dropx(otmp); + } } - } - if((otmp = uwep) != Null(obj)){ + if ((otmp = uwep) != Null(obj)) { /* Note: at present also cursed weapons fall */ setuwep((struct obj *) 0); dropx(otmp); pline("Your weapon %sslips from your hands.", - xfl ? "also " : ""); + xfl ? "also " : ""); } } -struct obj * -some_armor(){ -register struct obj *otmph = uarm; - if(uarmh && (!otmph || !rn2(4))) otmph = uarmh; - if(uarmg && (!otmph || !rn2(4))) otmph = uarmg; - if(uarms && (!otmph || !rn2(4))) otmph = uarms; - return(otmph); +struct obj * +some_armor() +{ + struct obj *otmph = uarm; + if (uarmh && (!otmph || !rn2(4))) + otmph = uarmh; + if (uarmg && (!otmph || !rn2(4))) + otmph = uarmg; + if (uarms && (!otmph || !rn2(4))) + otmph = uarms; + return (otmph); } -corrode_armor(){ -register struct obj *otmph = some_armor(); - if(otmph){ - if(otmph->rustfree || - otmph->otyp == ELVEN_CLOAK || - otmph->otyp == LEATHER_ARMOR || - otmph->otyp == STUDDED_LEATHER_ARMOR) { +void +corrode_armor() +{ + struct obj *otmph = some_armor(); + if (otmph) { + if (otmph->rustfree || + otmph->otyp == ELVEN_CLOAK || + otmph->otyp == LEATHER_ARMOR || + otmph->otyp == STUDDED_LEATHER_ARMOR) { pline("Your %s not affected!", - aobjnam(otmph, "are")); + aobjnam(otmph, "are")); return; } pline("Your %s!", aobjnam(otmph, "corrode")); diff --git a/hack/hack.dog.c b/hack/hack.dog.c index d9192a4c..4194e76f 100644 --- a/hack/hack.dog.c +++ b/hack/hack.dog.c @@ -1,32 +1,41 @@ +/* $NetBSD: hack.dog.c,v 1.4 1997/10/19 16:57:50 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.dog.c,v 1.3 1995/03/23 08:29:59 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.dog.c,v 1.4 1997/10/19 16:57:50 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -#include "hack.mfndpos.h" -extern struct monst *makemon(); +#include "hack.h" +#include "extern.h" +#include "hack.mfndpos.h" #include "def.edog.h" #include "def.mkroom.h" struct permonst li_dog = - { "little dog", 'd',2,18,6,1,6,sizeof(struct edog) }; +{"little dog", 'd', 2, 18, 6, 1, 6, sizeof(struct edog)}; struct permonst dog = - { "dog", 'd',4,16,5,1,6,sizeof(struct edog) }; +{"dog", 'd', 4, 16, 5, 1, 6, sizeof(struct edog)}; struct permonst la_dog = - { "large dog", 'd',6,15,4,2,4,sizeof(struct edog) }; +{"large dog", 'd', 6, 15, 4, 2, 4, sizeof(struct edog)}; -makedog(){ -register struct monst *mtmp = makemon(&li_dog,u.ux,u.uy); - if(!mtmp) return; /* dogs were genocided */ +void +makedog() +{ + struct monst *mtmp = makemon(&li_dog, u.ux, u.uy); + if (!mtmp) + return; /* dogs were genocided */ initedog(mtmp); } -initedog(mtmp) register struct monst *mtmp; { +void +initedog(mtmp) + struct monst *mtmp; +{ mtmp->mtame = mtmp->mpeaceful = 1; EDOG(mtmp)->hungrytime = 1000 + moves; EDOG(mtmp)->eattime = 0; @@ -37,19 +46,21 @@ initedog(mtmp) register struct monst *mtmp; { } /* attach the monsters that went down (or up) together with @ */ -struct monst *mydogs = 0; -struct monst *fallen_down = 0; /* monsters that fell through a trapdoor */ - /* they will appear on the next level @ goes to, even if he goes up! */ +struct monst *mydogs = 0; +struct monst *fallen_down = 0;/* monsters that fell through a trapdoor */ +/* they will appear on the next level @ goes to, even if he goes up! */ -losedogs(){ -register struct monst *mtmp; - while(mtmp = mydogs){ +void +losedogs() +{ + struct monst *mtmp; + while ((mtmp = mydogs) != NULL) { mydogs = mtmp->nmon; mtmp->nmon = fmon; fmon = mtmp; mnexto(mtmp); } - while(mtmp = fallen_down){ + while ((mtmp = fallen_down) != NULL) { fallen_down = mtmp->nmon; mtmp->nmon = fmon; fmon = mtmp; @@ -57,21 +68,27 @@ register struct monst *mtmp; } } -keepdogs(){ -register struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(dist(mtmp->mx,mtmp->my) < 3 && follower(mtmp) - && !mtmp->msleep && !mtmp->mfroz) { - relmon(mtmp); - mtmp->nmon = mydogs; - mydogs = mtmp; - unpmon(mtmp); - keepdogs(); /* we destroyed the link, so use recursion */ - return; /* (admittedly somewhat primitive) */ - } +void +keepdogs() +{ + struct monst *mtmp; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (dist(mtmp->mx, mtmp->my) < 3 && follower(mtmp) + && !mtmp->msleep && !mtmp->mfroz) { + relmon(mtmp); + mtmp->nmon = mydogs; + mydogs = mtmp; + unpmon(mtmp); + keepdogs(); /* we destroyed the link, so use + * recursion */ + return; /* (admittedly somewhat primitive) */ + } } -fall_down(mtmp) register struct monst *mtmp; { +void +fall_down(mtmp) + struct monst *mtmp; +{ relmon(mtmp); mtmp->nmon = fallen_down; fallen_down = mtmp; @@ -87,332 +104,366 @@ fall_down(mtmp) register struct monst *mtmp; { #define APPORT 4 #define POISON 5 #define UNDEF 6 -dogfood(obj) register struct obj *obj; { - switch(obj->olet) { +int +dogfood(obj) + struct obj *obj; +{ + switch (obj->olet) { case FOOD_SYM: - return( - (obj->otyp == TRIPE_RATION) ? DOGFOOD : - (obj->otyp < CARROT) ? ACCFOOD : - (obj->otyp < CORPSE) ? MANFOOD : - (poisonous(obj) || obj->age + 50 <= moves || - obj->otyp == DEAD_COCKATRICE) + return ( + (obj->otyp == TRIPE_RATION) ? DOGFOOD : + (obj->otyp < CARROT) ? ACCFOOD : + (obj->otyp < CORPSE) ? MANFOOD : + (poisonous(obj) || obj->age + 50 <= moves || + obj->otyp == DEAD_COCKATRICE) ? POISON : CADAVER - ); + ); default: - if(!obj->cursed) return(APPORT); - /* fall into next case */ + if (!obj->cursed) + return (APPORT); + /* fall into next case */ case BALL_SYM: case CHAIN_SYM: case ROCK_SYM: - return(UNDEF); + return (UNDEF); } } /* return 0 (no move), 1 (move) or 2 (dead) */ -dog_move(mtmp, after) register struct monst *mtmp; { -register int nx,ny,omx,omy,appr,nearer,j; -int udist,chi,i,whappr; -register struct monst *mtmp2; -register struct permonst *mdat = mtmp->data; -register struct edog *edog = EDOG(mtmp); -struct obj *obj; -struct trap *trap; -xchar cnt,chcnt,nix,niy; -schar dogroom,uroom; -xchar gx,gy,gtyp,otyp; /* current goal */ -coord poss[9]; -int info[9]; +int +dog_move(mtmp, after) + struct monst *mtmp; +{ + int nx, ny, omx, omy, appr, nearer, j; + int udist, chi = 0, i, whappr; + struct monst *mtmp2; + struct permonst *mdat = mtmp->data; + struct edog *edog = EDOG(mtmp); + struct obj *obj; + struct trap *trap; + xchar cnt, chcnt, nix, niy; + schar dogroom, uroom; + xchar gx = 0, gy = 0, gtyp, otyp; /* current goal */ + coord poss[9]; + int info[9]; #define GDIST(x,y) ((x-gx)*(x-gx) + (y-gy)*(y-gy)) #define DDIST(x,y) ((x-omx)*(x-omx) + (y-omy)*(y-omy)) - if(moves <= edog->eattime) return(0); /* dog is still eating */ + if (moves <= edog->eattime) + return (0); /* dog is still eating */ omx = mtmp->mx; omy = mtmp->my; whappr = (moves - EDOG(mtmp)->whistletime < 5); - if(moves > edog->hungrytime + 500 && !mtmp->mconf){ + if (moves > edog->hungrytime + 500 && !mtmp->mconf) { mtmp->mconf = 1; mtmp->mhpmax /= 3; - if(mtmp->mhp > mtmp->mhpmax) + if (mtmp->mhp > mtmp->mhpmax) mtmp->mhp = mtmp->mhpmax; - if(cansee(omx,omy)) + if (cansee(omx, omy)) pline("%s is confused from hunger.", Monnam(mtmp)); - else pline("You feel worried about %s.", monnam(mtmp)); - } else - if(moves > edog->hungrytime + 750 || mtmp->mhp < 1){ - if(cansee(omx,omy)) + else + pline("You feel worried about %s.", monnam(mtmp)); + } else if (moves > edog->hungrytime + 750 || mtmp->mhp < 1) { + if (cansee(omx, omy)) pline("%s dies from hunger.", Monnam(mtmp)); else - pline("You have a sad feeling for a moment, then it passes."); + pline("You have a sad feeling for a moment, then it passes."); mondied(mtmp); - return(2); + return (2); } - dogroom = inroom(omx,omy); - uroom = inroom(u.ux,u.uy); - udist = dist(omx,omy); + dogroom = inroom(omx, omy); + uroom = inroom(u.ux, u.uy); + udist = dist(omx, omy); /* maybe we tamed him while being swallowed --jgm */ - if(!udist) return(0); + if (!udist) + return (0); /* if we are carrying sth then we drop it (perhaps near @) */ /* Note: if apport == 1 then our behaviour is independent of udist */ - if(mtmp->minvent){ - if(!rn2(udist) || !rn2((int) edog->apport)) - if(rn2(10) < edog->apport){ - relobj(mtmp, (int) mtmp->minvis); - if(edog->apport > 1) edog->apport--; - edog->dropdist = udist; /* hpscdi!jon */ - edog->droptime = moves; - } + if (mtmp->minvent) { + if (!rn2(udist) || !rn2((int) edog->apport)) + if (rn2(10) < edog->apport) { + relobj(mtmp, (int) mtmp->minvis); + if (edog->apport > 1) + edog->apport--; + edog->dropdist = udist; /* hpscdi!jon */ + edog->droptime = moves; + } } else { - if(obj = o_at(omx,omy)) if(!index("0_", obj->olet)){ - if((otyp = dogfood(obj)) <= CADAVER){ - nix = omx; - niy = omy; - goto eatobj; - } - if(obj->owt < 10*mtmp->data->mlevel) - if(rn2(20) < edog->apport+3) - if(rn2(udist) || !rn2((int) edog->apport)){ - freeobj(obj); - unpobj(obj); - /* if(levl[omx][omy].scrsym == obj->olet) - newsym(omx,omy); */ - mpickobj(mtmp,obj); - } - } + if ((obj = o_at(omx, omy)) != NULL) + if (!strchr("0_", obj->olet)) { + if ((otyp = dogfood(obj)) <= CADAVER) { + nix = omx; + niy = omy; + goto eatobj; + } + if (obj->owt < 10 * mtmp->data->mlevel) + if (rn2(20) < edog->apport + 3) + if (rn2(udist) || !rn2((int) edog->apport)) { + freeobj(obj); + unpobj(obj); + /* + * if(levl[omx][omy].s + * crsym == + * obj->olet) + * newsym(omx,omy); + */ + mpickobj(mtmp, obj); + } + } } /* first we look for food */ - gtyp = UNDEF; /* no goal as yet */ + gtyp = UNDEF; /* no goal as yet */ #ifdef LINT - gx = gy = 0; /* suppress 'used before set' message */ -#endif LINT - for(obj = fobj; obj; obj = obj->nobj) { + gx = gy = 0; /* suppress 'used before set' message */ +#endif /* LINT */ + for (obj = fobj; obj; obj = obj->nobj) { otyp = dogfood(obj); - if(otyp > gtyp || otyp == UNDEF) continue; - if(inroom(obj->ox,obj->oy) != dogroom) continue; - if(otyp < MANFOOD && - (dogroom >= 0 || DDIST(obj->ox,obj->oy) < 10)) { - if(otyp < gtyp || (otyp == gtyp && - DDIST(obj->ox,obj->oy) < DDIST(gx,gy))){ + if (otyp > gtyp || otyp == UNDEF) + continue; + if (inroom(obj->ox, obj->oy) != dogroom) + continue; + if (otyp < MANFOOD && + (dogroom >= 0 || DDIST(obj->ox, obj->oy) < 10)) { + if (otyp < gtyp || (otyp == gtyp && + DDIST(obj->ox, obj->oy) < DDIST(gx, gy))) { gx = obj->ox; gy = obj->oy; gtyp = otyp; } - } else - if(gtyp == UNDEF && dogroom >= 0 && - uroom == dogroom && - !mtmp->minvent && edog->apport > rn2(8)){ + } else if (gtyp == UNDEF && dogroom >= 0 && + uroom == dogroom && + !mtmp->minvent && edog->apport > rn2(8)) { gx = obj->ox; gy = obj->oy; gtyp = APPORT; } } - if(gtyp == UNDEF || - (gtyp != DOGFOOD && gtyp != APPORT && moves < edog->hungrytime)){ - if(dogroom < 0 || dogroom == uroom){ + if (gtyp == UNDEF || + (gtyp != DOGFOOD && gtyp != APPORT && moves < edog->hungrytime)) { + if (dogroom < 0 || dogroom == uroom) { gx = u.ux; gy = u.uy; #ifndef QUEST } else { - int tmp = rooms[dogroom].fdoor; - cnt = rooms[dogroom].doorct; + int tmp = rooms[dogroom].fdoor; + cnt = rooms[dogroom].doorct; gx = gy = FAR; /* random, far away */ - while(cnt--){ - if(dist(gx,gy) > - dist(doors[tmp].x, doors[tmp].y)){ + while (cnt--) { + if (dist(gx, gy) > + dist(doors[tmp].x, doors[tmp].y)) { gx = doors[tmp].x; gy = doors[tmp].y; } tmp++; } /* here gx == FAR e.g. when dog is in a vault */ - if(gx == FAR || (gx == omx && gy == omy)){ + if (gx == FAR || (gx == omx && gy == omy)) { gx = u.ux; gy = u.uy; } -#endif QUEST +#endif /* QUEST */ } appr = (udist >= 9) ? 1 : (mtmp->mflee) ? -1 : 0; - if(after && udist <= 4 && gx == u.ux && gy == u.uy) - return(0); - if(udist > 1){ - if(!IS_ROOM(levl[u.ux][u.uy].typ) || !rn2(4) || - whappr || - (mtmp->minvent && rn2((int) edog->apport))) + if (after && udist <= 4 && gx == u.ux && gy == u.uy) + return (0); + if (udist > 1) { + if (!IS_ROOM(levl[u.ux][u.uy].typ) || !rn2(4) || + whappr || + (mtmp->minvent && rn2((int) edog->apport))) appr = 1; } /* if you have dog food he'll follow you more closely */ - if(appr == 0){ + if (appr == 0) { obj = invent; - while(obj){ - if(obj->otyp == TRIPE_RATION){ + while (obj) { + if (obj->otyp == TRIPE_RATION) { appr = 1; break; } obj = obj->nobj; } } - } else appr = 1; /* gtyp != UNDEF */ - if(mtmp->mconf) appr = 0; + } else + appr = 1; /* gtyp != UNDEF */ + if (mtmp->mconf) + appr = 0; - if(gx == u.ux && gy == u.uy && (dogroom != uroom || dogroom < 0)){ - extern coord *gettrack(); - register coord *cp; - cp = gettrack(omx,omy); - if(cp){ + if (gx == u.ux && gy == u.uy && (dogroom != uroom || dogroom < 0)) { + coord *cp; + cp = gettrack(omx, omy); + if (cp) { gx = cp->x; gy = cp->y; } } - nix = omx; niy = omy; - cnt = mfndpos(mtmp,poss,info,ALLOW_M | ALLOW_TRAPS); + cnt = mfndpos(mtmp, poss, info, ALLOW_M | ALLOW_TRAPS); chcnt = 0; chi = -1; - for(i=0; i<cnt; i++){ + for (i = 0; i < cnt; i++) { nx = poss[i].x; ny = poss[i].y; - if(info[i] & ALLOW_M){ - mtmp2 = m_at(nx,ny); - if(mtmp2->data->mlevel >= mdat->mlevel+2 || - mtmp2->data->mlet == 'c') + if (info[i] & ALLOW_M) { + mtmp2 = m_at(nx, ny); + if (mtmp2->data->mlevel >= mdat->mlevel + 2 || + mtmp2->data->mlet == 'c') continue; - if(after) return(0); /* hit only once each move */ + if (after) + return (0); /* hit only once each move */ - if(hitmm(mtmp, mtmp2) == 1 && rn2(4) && - mtmp2->mlstmv != moves && - hitmm(mtmp2,mtmp) == 2) return(2); - return(0); + if (hitmm(mtmp, mtmp2) == 1 && rn2(4) && + mtmp2->mlstmv != moves && + hitmm(mtmp2, mtmp) == 2) + return (2); + return (0); } - /* dog avoids traps */ /* but perhaps we have to pass a trap in order to follow @ */ - if((info[i] & ALLOW_TRAPS) && (trap = t_at(nx,ny))){ - if(!trap->tseen && rn2(40)) continue; - if(rn2(10)) continue; + if ((info[i] & ALLOW_TRAPS) && (trap = t_at(nx, ny))) { + if (!trap->tseen && rn2(40)) + continue; + if (rn2(10)) + continue; } - /* dog eschewes cursed objects */ /* but likes dog food */ obj = fobj; - while(obj){ - if(obj->ox != nx || obj->oy != ny) - goto nextobj; - if(obj->cursed) goto nxti; - if(obj->olet == FOOD_SYM && - (otyp = dogfood(obj)) < MANFOOD && - (otyp < ACCFOOD || edog->hungrytime <= moves)){ - /* Note: our dog likes the food so much that he - might eat it even when it conceals a cursed object */ - nix = nx; - niy = ny; - chi = i; - eatobj: - edog->eattime = - moves + obj->quan * objects[obj->otyp].oc_delay; - if(edog->hungrytime < moves) - edog->hungrytime = moves; - edog->hungrytime += - 5*obj->quan * objects[obj->otyp].nutrition; - mtmp->mconf = 0; - if(cansee(nix,niy)) - pline("%s ate %s.", Monnam(mtmp), doname(obj)); - /* perhaps this was a reward */ - if(otyp != CADAVER) - edog->apport += 200/(edog->dropdist+moves-edog->droptime); - delobj(obj); - goto newdogpos; - } - nextobj: - obj = obj->nobj; + while (obj) { + if (obj->ox != nx || obj->oy != ny) + goto nextobj; + if (obj->cursed) + goto nxti; + if (obj->olet == FOOD_SYM && + (otyp = dogfood(obj)) < MANFOOD && + (otyp < ACCFOOD || edog->hungrytime <= moves)) { + /* + * Note: our dog likes the food so much that + * he might eat it even when it conceals a + * cursed object + */ + nix = nx; + niy = ny; + chi = i; + eatobj: + edog->eattime = + moves + obj->quan * objects[obj->otyp].oc_delay; + if (edog->hungrytime < moves) + edog->hungrytime = moves; + edog->hungrytime += + 5 * obj->quan * objects[obj->otyp].nutrition; + mtmp->mconf = 0; + if (cansee(nix, niy)) + pline("%s ate %s.", Monnam(mtmp), doname(obj)); + /* perhaps this was a reward */ + if (otyp != CADAVER) + edog->apport += 200 / (edog->dropdist + moves - edog->droptime); + delobj(obj); + goto newdogpos; + } + nextobj: + obj = obj->nobj; } - for(j=0; j<MTSZ && j<cnt-1; j++) - if(nx == mtmp->mtrack[j].x && ny == mtmp->mtrack[j].y) - if(rn2(4*(cnt-j))) goto nxti; + for (j = 0; j < MTSZ && j < cnt - 1; j++) + if (nx == mtmp->mtrack[j].x && ny == mtmp->mtrack[j].y) + if (rn2(4 * (cnt - j))) + goto nxti; -/* Some stupid C compilers cannot compute the whole expression at once. */ - nearer = GDIST(nx,ny); - nearer -= GDIST(nix,niy); + /* + * Some stupid C compilers cannot compute the whole + * expression at once. + */ + nearer = GDIST(nx, ny); + nearer -= GDIST(nix, niy); nearer *= appr; - if((nearer == 0 && !rn2(++chcnt)) || nearer<0 || - (nearer > 0 && !whappr && - ((omx == nix && omy == niy && !rn2(3)) - || !rn2(12)) - )){ + if ((nearer == 0 && !rn2(++chcnt)) || nearer < 0 || + (nearer > 0 && !whappr && + ((omx == nix && omy == niy && !rn2(3)) + || !rn2(12)) + )) { nix = nx; niy = ny; - if(nearer < 0) chcnt = 0; + if (nearer < 0) + chcnt = 0; chi = i; } - nxti: ; +nxti: ; } newdogpos: - if(nix != omx || niy != omy){ - if(info[chi] & ALLOW_U){ - (void) hitu(mtmp, d(mdat->damn, mdat->damd)+1); - return(0); + if (nix != omx || niy != omy) { + if (info[chi] & ALLOW_U) { + (void) hitu(mtmp, d(mdat->damn, mdat->damd) + 1); + return (0); } mtmp->mx = nix; mtmp->my = niy; - for(j=MTSZ-1; j>0; j--) mtmp->mtrack[j] = mtmp->mtrack[j-1]; + for (j = MTSZ - 1; j > 0; j--) + mtmp->mtrack[j] = mtmp->mtrack[j - 1]; mtmp->mtrack[0].x = omx; mtmp->mtrack[0].y = omy; } - if(mintrap(mtmp) == 2) /* he died */ - return(2); + if (mintrap(mtmp) == 2) /* he died */ + return (2); pmon(mtmp); - return(1); + return (1); } /* return roomnumber or -1 */ -inroom(x,y) xchar x,y; { +int +inroom(x, y) + xchar x, y; +{ #ifndef QUEST - register struct mkroom *croom = &rooms[0]; - while(croom->hx >= 0){ - if(croom->hx >= x-1 && croom->lx <= x+1 && - croom->hy >= y-1 && croom->ly <= y+1) - return(croom - rooms); + struct mkroom *croom = &rooms[0]; + while (croom->hx >= 0) { + if (croom->hx >= x - 1 && croom->lx <= x + 1 && + croom->hy >= y - 1 && croom->ly <= y + 1) + return (croom - rooms); croom++; } -#endif QUEST - return(-1); /* not in room or on door */ +#endif /* QUEST */ + return (-1); /* not in room or on door */ } +int tamedog(mtmp, obj) -register struct monst *mtmp; -register struct obj *obj; + struct monst *mtmp; + struct obj *obj; { - register struct monst *mtmp2; + struct monst *mtmp2; - if(flags.moonphase == FULL_MOON && night() && rn2(6)) - return(0); + if (flags.moonphase == FULL_MOON && night() && rn2(6)) + return (0); /* If we cannot tame him, at least he's no longer afraid. */ mtmp->mflee = 0; mtmp->mfleetim = 0; - if(mtmp->mtame || mtmp->mfroz || + if (mtmp->mtame || mtmp->mfroz || #ifndef NOWORM - mtmp->wormno || -#endif NOWORM - mtmp->isshk || mtmp->isgd || index(" &@12", mtmp->data->mlet)) - return(0); /* no tame long worms? */ - if(obj) { - if(dogfood(obj) >= MANFOOD) return(0); - if(cansee(mtmp->mx,mtmp->my)){ + mtmp->wormno || +#endif /* NOWORM */ + mtmp->isshk || mtmp->isgd || strchr(" &@12", mtmp->data->mlet)) + return (0); /* no tame long worms? */ + if (obj) { + if (dogfood(obj) >= MANFOOD) + return (0); + if (cansee(mtmp->mx, mtmp->my)) { pline("%s devours the %s.", Monnam(mtmp), - objects[obj->otyp].oc_name); + objects[obj->otyp].oc_name); } obfree(obj, (struct obj *) 0); } mtmp2 = newmonst(sizeof(struct edog) + mtmp->mnamelth); *mtmp2 = *mtmp; mtmp2->mxlth = sizeof(struct edog); - if(mtmp->mnamelth) (void) strcpy(NAME(mtmp2), NAME(mtmp)); + if (mtmp->mnamelth) + (void) strcpy(NAME(mtmp2), NAME(mtmp)); initedog(mtmp2); - replmon(mtmp,mtmp2); - return(1); + replmon(mtmp, mtmp2); + return (1); } diff --git a/hack/hack.eat.c b/hack/hack.eat.c index 7745f63f..3685ba5d 100644 --- a/hack/hack.eat.c +++ b/hack/hack.eat.c @@ -1,18 +1,17 @@ +/* $NetBSD: hack.eat.c,v 1.4 1997/10/19 16:57:53 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.eat.c,v 1.3 1995/03/23 08:30:01 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.eat.c,v 1.4 1997/10/19 16:57:53 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -char POISONOUS[] = "ADKSVabhks"; -extern char *nomovemsg; -extern int (*afternmv)(); -extern int (*occupation)(); -extern char *occtxt; -extern struct obj *splitobj(), *addinv(); +#include "hack.h" +#include "extern.h" +char POISONOUS[] = "ADKSVabhks"; /* hunger texts used on bottom line (each 8 chars long) */ #define SATIATED 0 @@ -23,7 +22,7 @@ extern struct obj *splitobj(), *addinv(); #define FAINTED 5 #define STARVED 6 -char *hu_stat[] = { +char *hu_stat[] = { "Satiated", " ", "Hungry ", @@ -33,94 +32,108 @@ char *hu_stat[] = { "Starved " }; -init_uhunger(){ +void +init_uhunger() +{ u.uhunger = 900; u.uhs = NOT_HUNGRY; } #define TTSZ SIZE(tintxts) -struct { char *txt; int nut; } tintxts[] = { - "It contains first quality peaches - what a surprise!", 40, - "It contains salmon - not bad!", 60, - "It contains apple juice - perhaps not what you hoped for.", 20, - "It contains some nondescript substance, tasting awfully.", 500, - "It contains rotten meat. You vomit.", -50, - "It turns out to be empty.", 0 +struct { + char *txt; + int nut; +} tintxts[] = { + { "It contains first quality peaches - what a surprise!", 40 }, + { "It contains salmon - not bad!", 60 }, + { "It contains apple juice - perhaps not what you hoped for.", 20 }, + { "It contains some nondescript substance, tasting awfully.", 500 }, + { "It contains rotten meat. You vomit.", -50 }, + { "It turns out to be empty.", 0 } }; static struct { - struct obj *tin; - int usedtime, reqtime; -} tin; + struct obj *tin; + int usedtime, reqtime; +} tin; -opentin(){ - register int r; +int +opentin() +{ + int r; - if(!carried(tin.tin)) /* perhaps it was stolen? */ - return(0); /* %% probably we should use tinoid */ - if(tin.usedtime++ >= 50) { + if (!carried(tin.tin)) /* perhaps it was stolen? */ + return (0); /* %% probably we should use tinoid */ + if (tin.usedtime++ >= 50) { pline("You give up your attempt to open the tin."); - return(0); + return (0); } - if(tin.usedtime < tin.reqtime) - return(1); /* still busy */ + if (tin.usedtime < tin.reqtime) + return (1); /* still busy */ pline("You succeed in opening the tin."); useup(tin.tin); - r = rn2(2*TTSZ); - if(r < TTSZ){ - pline(tintxts[r].txt); - lesshungry(tintxts[r].nut); - if(r == 1) /* SALMON */ { - Glib = rnd(15); - pline("Eating salmon made your fingers very slippery."); - } + r = rn2(2 * TTSZ); + if (r < TTSZ) { + pline(tintxts[r].txt); + lesshungry(tintxts[r].nut); + if (r == 1) { /* SALMON */ + Glib = rnd(15); + pline("Eating salmon made your fingers very slippery."); + } } else { - pline("It contains spinach - this makes you feel like Popeye!"); - lesshungry(600); - if(u.ustr < 118) - u.ustr += rnd( ((u.ustr < 17) ? 19 : 118) - u.ustr); - if(u.ustr > u.ustrmax) u.ustrmax = u.ustr; - flags.botl = 1; + pline("It contains spinach - this makes you feel like Popeye!"); + lesshungry(600); + if (u.ustr < 118) + u.ustr += rnd(((u.ustr < 17) ? 19 : 118) - u.ustr); + if (u.ustr > u.ustrmax) + u.ustrmax = u.ustr; + flags.botl = 1; } - return(0); + return (0); } -Meatdone(){ +int +Meatdone() +{ u.usym = '@'; prme(); + return 0; } -doeat(){ - register struct obj *otmp; - register struct objclass *ftmp; - register tmp; +int +doeat() +{ + struct obj *otmp; + struct objclass *ftmp; + int tmp; /* Is there some food (probably a heavy corpse) here on the ground? */ - if(!Levitation) - for(otmp = fobj; otmp; otmp = otmp->nobj) { - if(otmp->ox == u.ux && otmp->oy == u.uy && - otmp->olet == FOOD_SYM) { - pline("There %s %s here; eat %s? [ny] ", - (otmp->quan == 1) ? "is" : "are", - doname(otmp), - (otmp->quan == 1) ? "it" : "one"); - if(readchar() == 'y') { - if(otmp->quan != 1) - (void) splitobj(otmp, 1); - freeobj(otmp); - otmp = addinv(otmp); - addtobill(otmp); - goto gotit; + if (!Levitation) + for (otmp = fobj; otmp; otmp = otmp->nobj) { + if (otmp->ox == u.ux && otmp->oy == u.uy && + otmp->olet == FOOD_SYM) { + pline("There %s %s here; eat %s? [ny] ", + (otmp->quan == 1) ? "is" : "are", + doname(otmp), + (otmp->quan == 1) ? "it" : "one"); + if (readchar() == 'y') { + if (otmp->quan != 1) + (void) splitobj(otmp, 1); + freeobj(otmp); + otmp = addinv(otmp); + addtobill(otmp); + goto gotit; + } } } - } otmp = getobj("%", "eat"); - if(!otmp) return(0); + if (!otmp) + return (0); gotit: - if(otmp->otyp == TIN){ - if(uwep) { - switch(uwep->otyp) { + if (otmp->otyp == TIN) { + if (uwep) { + switch (uwep->otyp) { case CAN_OPENER: tmp = 1; break; @@ -136,115 +149,120 @@ gotit: goto no_opener; } pline("Using your %s you try to open the tin.", - aobjnam(uwep, (char *) 0)); + aobjnam(uwep, (char *) 0)); } else { - no_opener: + no_opener: pline("It is not so easy to open this tin."); - if(Glib) { + if (Glib) { pline("The tin slips out of your hands."); - if(otmp->quan > 1) { - register struct obj *obj; - extern struct obj *splitobj(); + if (otmp->quan > 1) { + struct obj *obj; obj = splitobj(otmp, 1); - if(otmp == uwep) setuwep(obj); + if (otmp == uwep) + setuwep(obj); } dropx(otmp); - return(1); + return (1); } - tmp = 10 + rn2(1 + 500/((int)(u.ulevel + u.ustr))); + tmp = 10 + rn2(1 + 500 / ((int) (u.ulevel + u.ustr))); } tin.reqtime = tmp; tin.usedtime = 0; tin.tin = otmp; occupation = opentin; occtxt = "opening the tin"; - return(1); + return (1); } ftmp = &objects[otmp->otyp]; multi = -ftmp->oc_delay; - if(otmp->otyp >= CORPSE && eatcorpse(otmp)) goto eatx; - if(!rn2(7) && otmp->otyp != FORTUNE_COOKIE) { + if (otmp->otyp >= CORPSE && eatcorpse(otmp)) + goto eatx; + if (!rn2(7) && otmp->otyp != FORTUNE_COOKIE) { pline("Blecch! Rotten food!"); - if(!rn2(4)) { + if (!rn2(4)) { pline("You feel rather light headed."); - Confusion += d(2,4); - } else if(!rn2(4)&& !Blind) { + Confusion += d(2, 4); + } else if (!rn2(4) && !Blind) { pline("Everything suddenly goes dark."); - Blind = d(2,10); + Blind = d(2, 10); seeoff(0); - } else if(!rn2(3)) { - if(Blind) - pline("The world spins and you slap against the floor."); + } else if (!rn2(3)) { + if (Blind) + pline("The world spins and you slap against the floor."); else - pline("The world spins and goes dark."); + pline("The world spins and goes dark."); nomul(-rnd(10)); nomovemsg = "You are conscious again."; } lesshungry(ftmp->nutrition / 4); } else { - if(u.uhunger >= 1500) { + if (u.uhunger >= 1500) { pline("You choke over your food."); pline("You die..."); killer = ftmp->oc_name; done("choked"); } - switch(otmp->otyp){ + switch (otmp->otyp) { case FOOD_RATION: - if(u.uhunger <= 200) + if (u.uhunger <= 200) pline("That food really hit the spot!"); - else if(u.uhunger <= 700) + else if (u.uhunger <= 700) pline("That satiated your stomach!"); else { - pline("You're having a hard time getting all that food down."); + pline("You're having a hard time getting all that food down."); multi -= 2; } lesshungry(ftmp->nutrition); - if(multi < 0) nomovemsg = "You finished your meal."; + if (multi < 0) + nomovemsg = "You finished your meal."; break; case TRIPE_RATION: pline("Yak - dog food!"); - more_experienced(1,0); + more_experienced(1, 0); flags.botl = 1; - if(rn2(2)){ + if (rn2(2)) { pline("You vomit."); morehungry(20); - if(Sick) { + if (Sick) { Sick = 0; /* David Neves */ pline("What a relief!"); } - } else lesshungry(ftmp->nutrition); + } else + lesshungry(ftmp->nutrition); break; default: - if(otmp->otyp >= CORPSE) - pline("That %s tasted terrible!",ftmp->oc_name); + if (otmp->otyp >= CORPSE) + pline("That %s tasted terrible!", ftmp->oc_name); else - pline("That %s was delicious!",ftmp->oc_name); + pline("That %s was delicious!", ftmp->oc_name); lesshungry(ftmp->nutrition); - if(otmp->otyp == DEAD_LIZARD && (Confusion > 2)) + if (otmp->otyp == DEAD_LIZARD && (Confusion > 2)) Confusion = 2; else #ifdef QUEST - if(otmp->otyp == CARROT && !Blind){ + if (otmp->otyp == CARROT && !Blind) { u.uhorizon++; setsee(); pline("Your vision improves."); } else -#endif QUEST - if(otmp->otyp == FORTUNE_COOKIE) { - if(Blind) { - pline("This cookie has a scrap of paper inside!"); - pline("What a pity, that you cannot read it!"); - } else - outrumor(); - } else - if(otmp->otyp == LUMP_OF_ROYAL_JELLY) { +#endif /* QUEST */ + if (otmp->otyp == FORTUNE_COOKIE) { + if (Blind) { + pline("This cookie has a scrap of paper inside!"); + pline("What a pity, that you cannot read it!"); + } else + outrumor(); + } else if (otmp->otyp == LUMP_OF_ROYAL_JELLY) { /* This stuff seems to be VERY healthy! */ - if(u.ustrmax < 118) u.ustrmax++; - if(u.ustr < u.ustrmax) u.ustr++; + if (u.ustrmax < 118) + u.ustrmax++; + if (u.ustr < u.ustrmax) + u.ustr++; u.uhp += rnd(20); - if(u.uhp > u.uhpmax) { - if(!rn2(17)) u.uhpmax++; + if (u.uhp > u.uhpmax) { + if (!rn2(17)) + u.uhpmax++; u.uhp = u.uhpmax; } heal_legs(); @@ -253,71 +271,89 @@ gotit: } } eatx: - if(multi<0 && !nomovemsg){ - static char msgbuf[BUFSZ]; + if (multi < 0 && !nomovemsg) { + static char msgbuf[BUFSZ]; (void) sprintf(msgbuf, "You finished eating the %s.", - ftmp->oc_name); + ftmp->oc_name); nomovemsg = msgbuf; } useup(otmp); - return(1); + return (1); } /* called in hack.main.c */ -gethungry(){ +void +gethungry() +{ --u.uhunger; - if(moves % 2) { - if(Regeneration) u.uhunger--; - if(Hunger) u.uhunger--; - /* a3: if(Hunger & LEFT_RING) u.uhunger--; - if(Hunger & RIGHT_RING) u.uhunger--; - etc. */ + if (moves % 2) { + if (Regeneration) + u.uhunger--; + if (Hunger) + u.uhunger--; + /* + * a3: if(Hunger & LEFT_RING) u.uhunger--; if(Hunger & + * RIGHT_RING) u.uhunger--; etc. + */ } - if(moves % 20 == 0) { /* jimt@asgb */ - if(uleft) u.uhunger--; - if(uright) u.uhunger--; + if (moves % 20 == 0) { /* jimt@asgb */ + if (uleft) + u.uhunger--; + if (uright) + u.uhunger--; } newuhs(TRUE); } /* called after vomiting and after performing feats of magic */ -morehungry(num) register num; { +void +morehungry(num) + int num; +{ u.uhunger -= num; newuhs(TRUE); } /* called after eating something (and after drinking fruit juice) */ -lesshungry(num) register num; { +void +lesshungry(num) + int num; +{ u.uhunger += num; newuhs(FALSE); } -unfaint(){ +int +unfaint() +{ u.uhs = FAINTING; flags.botl = 1; + return 0; } -newuhs(incr) boolean incr; { - register int newhs, h = u.uhunger; +void +newuhs(incr) + boolean incr; +{ + int newhs, h = u.uhunger; newhs = (h > 1000) ? SATIATED : (h > 150) ? NOT_HUNGRY : (h > 50) ? HUNGRY : (h > 0) ? WEAK : FAINTING; - if(newhs == FAINTING) { - if(u.uhs == FAINTED) + if (newhs == FAINTING) { + if (u.uhs == FAINTED) newhs = FAINTED; - if(u.uhs <= WEAK || rn2(20-u.uhunger/10) >= 19) { - if(u.uhs != FAINTED && multi >= 0 /* %% */) { + if (u.uhs <= WEAK || rn2(20 - u.uhunger / 10) >= 19) { + if (u.uhs != FAINTED && multi >= 0 /* %% */ ) { pline("You faint from lack of food."); - nomul(-10+(u.uhunger/10)); + nomul(-10 + (u.uhunger / 10)); nomovemsg = "You regain consciousness."; afternmv = unfaint; newhs = FAINTED; } - } else - if(u.uhunger < -(int)(200 + 25*u.ulevel)) { + } else if (u.uhunger < -(int) (200 + 25 * u.ulevel)) { u.uhs = STARVED; flags.botl = 1; bot(); @@ -325,28 +361,26 @@ newuhs(incr) boolean incr; { done("starved"); } } - - if(newhs != u.uhs) { - if(newhs >= WEAK && u.uhs < WEAK) + if (newhs != u.uhs) { + if (newhs >= WEAK && u.uhs < WEAK) losestr(1); /* this may kill you -- see below */ - else - if(newhs < WEAK && u.uhs >= WEAK && u.ustr < u.ustrmax) + else if (newhs < WEAK && u.uhs >= WEAK && u.ustr < u.ustrmax) losestr(-1); - switch(newhs){ + switch (newhs) { case HUNGRY: pline((!incr) ? "You only feel hungry now." : (u.uhunger < 145) ? "You feel hungry." : - "You are beginning to feel hungry."); + "You are beginning to feel hungry."); break; case WEAK: pline((!incr) ? "You feel weak now." : (u.uhunger < 45) ? "You feel weak." : - "You are beginning to feel weak."); + "You are beginning to feel weak."); break; } u.uhs = newhs; flags.botl = 1; - if(u.uhp < 1) { + if (u.uhp < 1) { pline("You die from hunger and exhaustion."); killer = "exhaustion"; done("starved"); @@ -357,36 +391,40 @@ newuhs(incr) boolean incr; { #define CORPSE_I_TO_C(otyp) (char) ((otyp >= DEAD_ACID_BLOB)\ ? 'a' + (otyp - DEAD_ACID_BLOB)\ : '@' + (otyp - DEAD_HUMAN)) +int poisonous(otmp) -register struct obj *otmp; + struct obj *otmp; { - return(index(POISONOUS, CORPSE_I_TO_C(otmp->otyp)) != 0); + return (strchr(POISONOUS, CORPSE_I_TO_C(otmp->otyp)) != 0); } /* returns 1 if some text was printed */ -eatcorpse(otmp) register struct obj *otmp; { -register char let = CORPSE_I_TO_C(otmp->otyp); -register tp = 0; - if(let != 'a' && moves > otmp->age + 50 + rn2(100)) { +int +eatcorpse(otmp) + struct obj *otmp; +{ + char let = CORPSE_I_TO_C(otmp->otyp); + int tp = 0; + if (let != 'a' && moves > otmp->age + 50 + rn2(100)) { tp++; pline("Ulch -- that meat was tainted!"); pline("You get very sick."); Sick = 10 + rn2(10); u.usick_cause = objects[otmp->otyp].oc_name; - } else if(index(POISONOUS, let) && rn2(5)){ + } else if (strchr(POISONOUS, let) && rn2(5)) { tp++; pline("Ecch -- that must have been poisonous!"); - if(!Poison_resistance){ + if (!Poison_resistance) { losestr(rnd(4)); losehp(rnd(15), "poisonous corpse"); } else pline("You don't seem affected by the poison."); - } else if(index("ELNOPQRUuxz", let) && rn2(5)){ + } else if (strchr("ELNOPQRUuxz", let) && rn2(5)) { tp++; pline("You feel sick."); losehp(rnd(8), "cadaver"); } - switch(let) { + switch (let) { case 'L': case 'N': case 't': @@ -407,9 +445,9 @@ register tp = 0; Aggravate_monster |= INTRINSIC; break; case 'I': - if(!Invis) { - Invis = 50+rn2(100); - if(!See_invisible) + if (!Invis) { + Invis = 50 + rn2(100); + if (!See_invisible) newsym(u.ux, u.uy); } else { Invis |= INTRINSIC; @@ -419,7 +457,7 @@ register tp = 0; case 'y': #ifdef QUEST u.uhorizon++; -#endif QUEST +#endif /* QUEST */ /* fall into next case */ case 'B': Confusion = 50; @@ -444,21 +482,21 @@ register tp = 0; done("died"); /* NOTREACHED */ case 'a': - if(Stoned) { - pline("What a pity - you just destroyed a future piece of art!"); - tp++; - Stoned = 0; - } - break; + if (Stoned) { + pline("What a pity - you just destroyed a future piece of art!"); + tp++; + Stoned = 0; + } + break; case 'M': - pline("You cannot resist the temptation to mimic a treasure chest."); - tp++; - nomul(-30); - afternmv = Meatdone; - nomovemsg = "You now again prefer mimicking a human."; - u.usym = '$'; - prme(); - break; + pline("You cannot resist the temptation to mimic a treasure chest."); + tp++; + nomul(-30); + afternmv = Meatdone; + nomovemsg = "You now again prefer mimicking a human."; + u.usym = '$'; + prme(); + break; } - return(tp); + return (tp); } diff --git a/hack/hack.end.c b/hack/hack.end.c index 20b77e4f..0d99ef58 100644 --- a/hack/hack.end.c +++ b/hack/hack.end.c @@ -1,202 +1,241 @@ +/* $NetBSD: hack.end.c,v 1.4 1997/10/19 16:57:55 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.end.c,v 1.3 1995/03/23 08:30:05 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.end.c,v 1.4 1997/10/19 16:57:55 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -#include <stdio.h> #include <signal.h> +#include <unistd.h> +#include <stdlib.h> +#include "hack.h" +#include "extern.h" #define Sprintf (void) sprintf -extern char plname[], pl_character[]; -extern char *itoa(), *ordin(), *eos(); -xchar maxdlevel = 1; +xchar maxdlevel = 1; +int +dodone() +{ + done1(0); + return 0; +} + + +/*ARGSUSED*/ void -done1() +done1(n) + int n; { - (void) signal(SIGINT,SIG_IGN); + (void) signal(SIGINT, SIG_IGN); pline("Really quit?"); - if(readchar() != 'y') { - (void) signal(SIGINT,done1); + if (readchar() != 'y') { + (void) signal(SIGINT, done1); clrlin(); (void) fflush(stdout); - if(multi > 0) nomul(0); + if (multi > 0) + nomul(0); return; } done("quit"); /* NOTREACHED */ } -int done_stopprint; -int done_hup; +int done_stopprint; +int done_hup; +/*ARGSUSED*/ void -done_intr(){ +done_intr(n) + int n; +{ done_stopprint++; (void) signal(SIGINT, SIG_IGN); (void) signal(SIGQUIT, SIG_IGN); } void -done_hangup(){ +done_hangup(n) + int n; +{ done_hup++; (void) signal(SIGHUP, SIG_IGN); - done_intr(); + done_intr(n); } -done_in_by(mtmp) register struct monst *mtmp; { -static char buf[BUFSZ]; +void +done_in_by(mtmp) + struct monst *mtmp; +{ + static char buf[BUFSZ]; pline("You die ..."); - if(mtmp->data->mlet == ' '){ + if (mtmp->data->mlet == ' ') { Sprintf(buf, "the ghost of %s", (char *) mtmp->mextra); killer = buf; - } else if(mtmp->mnamelth) { + } else if (mtmp->mnamelth) { Sprintf(buf, "%s called %s", mtmp->data->mname, NAME(mtmp)); killer = buf; - } else if(mtmp->minvis) { + } else if (mtmp->minvis) { Sprintf(buf, "invisible %s", mtmp->data->mname); killer = buf; - } else killer = mtmp->data->mname; + } else + killer = mtmp->data->mname; done("died"); } -/* called with arg "died", "drowned", "escaped", "quit", "choked", "panicked", - "burned", "starved" or "tricked" */ +/* + * called with arg "died", "drowned", "escaped", "quit", "choked", + * "panicked", "burned", "starved" or "tricked" + */ /* Be careful not to call panic from here! */ +void done(st1) -register char *st1; + char *st1; { #ifdef WIZARD - if(wizard && *st1 == 'd'){ + if (wizard && *st1 == 'd') { u.uswldtim = 0; - if(u.uhpmax < 0) u.uhpmax = 100; /* arbitrary */ + if (u.uhpmax < 0) + u.uhpmax = 100; /* arbitrary */ u.uhp = u.uhpmax; pline("For some reason you are still alive."); flags.move = 0; - if(multi > 0) multi = 0; else multi = -1; + if (multi > 0) + multi = 0; + else + multi = -1; flags.botl = 1; return; } -#endif WIZARD +#endif /* WIZARD */ (void) signal(SIGINT, done_intr); (void) signal(SIGQUIT, done_intr); (void) signal(SIGHUP, done_hangup); - if(*st1 == 'q' && u.uhp < 1){ + if (*st1 == 'q' && u.uhp < 1) { st1 = "died"; killer = "quit while already on Charon's boat"; } - if(*st1 == 's') killer = "starvation"; else - if(*st1 == 'd' && st1[1] == 'r') killer = "drowning"; else - if(*st1 == 'p') killer = "panic"; else - if(*st1 == 't') killer = "trickery"; else - if(!index("bcd", *st1)) killer = st1; + if (*st1 == 's') + killer = "starvation"; + else if (*st1 == 'd' && st1[1] == 'r') + killer = "drowning"; + else if (*st1 == 'p') + killer = "panic"; + else if (*st1 == 't') + killer = "trickery"; + else if (!strchr("bcd", *st1)) + killer = st1; paybill(); clearlocks(); - if(flags.toplin == 1) more(); - if(index("bcds", *st1)){ + if (flags.toplin == 1) + more(); + if (strchr("bcds", *st1)) { #ifdef WIZARD - if(!wizard) -#endif WIZARD - savebones(); - if(!flags.notombstone) + if (!wizard) +#endif /* WIZARD */ + savebones(); + if (!flags.notombstone) outrip(); } - if(*st1 == 'c') killer = st1; /* after outrip() */ + if (*st1 == 'c') + killer = st1; /* after outrip() */ settty((char *) 0); /* does a clear_screen() */ - if(!done_stopprint) + if (!done_stopprint) printf("Goodbye %s %s...\n\n", pl_character, plname); - { long int tmp; - tmp = u.ugold - u.ugold0; - if(tmp < 0) - tmp = 0; - if(*st1 == 'd' || *st1 == 'b') - tmp -= tmp/10; - u.urexp += tmp; - u.urexp += 50 * maxdlevel; - if(maxdlevel > 20) - u.urexp += 1000*((maxdlevel > 30) ? 10 : maxdlevel - 20); + { + long int tmp; + tmp = u.ugold - u.ugold0; + if (tmp < 0) + tmp = 0; + if (*st1 == 'd' || *st1 == 'b') + tmp -= tmp / 10; + u.urexp += tmp; + u.urexp += 50 * maxdlevel; + if (maxdlevel > 20) + u.urexp += 1000 * ((maxdlevel > 30) ? 10 : maxdlevel - 20); } - if(*st1 == 'e') { - extern struct monst *mydogs; - register struct monst *mtmp; - register struct obj *otmp; - register int i; - register unsigned worthlessct = 0; - boolean has_amulet = FALSE; + if (*st1 == 'e') { + struct monst *mtmp; + struct obj *otmp; + int i; + unsigned worthlessct = 0; + boolean has_amulet = FALSE; killer = st1; keepdogs(); mtmp = mydogs; - if(mtmp) { - if(!done_stopprint) printf("You"); - while(mtmp) { - if(!done_stopprint) + if (mtmp) { + if (!done_stopprint) + printf("You"); + while (mtmp) { + if (!done_stopprint) printf(" and %s", monnam(mtmp)); - if(mtmp->mtame) + if (mtmp->mtame) u.urexp += mtmp->mhp; mtmp = mtmp->nmon; } - if(!done_stopprint) - printf("\nescaped from the dungeon with %ld points,\n", - u.urexp); - } else - if(!done_stopprint) - printf("You escaped from the dungeon with %ld points,\n", - u.urexp); - for(otmp = invent; otmp; otmp = otmp->nobj) { - if(otmp->olet == GEM_SYM){ + if (!done_stopprint) + printf("\nescaped from the dungeon with %ld points,\n", + u.urexp); + } else if (!done_stopprint) + printf("You escaped from the dungeon with %ld points,\n", + u.urexp); + for (otmp = invent; otmp; otmp = otmp->nobj) { + if (otmp->olet == GEM_SYM) { objects[otmp->otyp].oc_name_known = 1; - i = otmp->quan*objects[otmp->otyp].g_val; - if(i == 0) { + i = otmp->quan * objects[otmp->otyp].g_val; + if (i == 0) { worthlessct += otmp->quan; continue; } u.urexp += i; - if(!done_stopprint) - printf("\t%s (worth %d Zorkmids),\n", - doname(otmp), i); - } else if(otmp->olet == AMULET_SYM) { + if (!done_stopprint) + printf("\t%s (worth %d Zorkmids),\n", + doname(otmp), i); + } else if (otmp->olet == AMULET_SYM) { otmp->known = 1; i = (otmp->spe < 0) ? 2 : 5000; u.urexp += i; - if(!done_stopprint) - printf("\t%s (worth %d Zorkmids),\n", - doname(otmp), i); - if(otmp->spe >= 0) { + if (!done_stopprint) + printf("\t%s (worth %d Zorkmids),\n", + doname(otmp), i); + if (otmp->spe >= 0) { has_amulet = TRUE; killer = "escaped (with amulet)"; } } } - if(worthlessct) if(!done_stopprint) - printf("\t%u worthless piece%s of coloured glass,\n", - worthlessct, plur(worthlessct)); - if(has_amulet) u.urexp *= 2; - } else - if(!done_stopprint) - printf("You %s on dungeon level %d with %ld points,\n", - st1, dlevel, u.urexp); - if(!done_stopprint) - printf("and %ld piece%s of gold, after %ld move%s.\n", - u.ugold, plur(u.ugold), moves, plur(moves)); - if(!done_stopprint) - printf("You were level %u with a maximum of %d hit points when you %s.\n", - u.ulevel, u.uhpmax, st1); - if(*st1 == 'e' && !done_stopprint){ + if (worthlessct) + if (!done_stopprint) + printf("\t%u worthless piece%s of coloured glass,\n", + worthlessct, plur(worthlessct)); + if (has_amulet) + u.urexp *= 2; + } else if (!done_stopprint) + printf("You %s on dungeon level %d with %ld points,\n", + st1, dlevel, u.urexp); + if (!done_stopprint) + printf("and %ld piece%s of gold, after %ld move%s.\n", + u.ugold, plur(u.ugold), moves, plur(moves)); + if (!done_stopprint) + printf("You were level %u with a maximum of %d hit points when you %s.\n", + u.ulevel, u.uhpmax, st1); + if (*st1 == 'e' && !done_stopprint) { getret(); /* all those pieces of coloured glass ... */ cls(); } #ifdef WIZARD - if(!wizard) -#endif WIZARD + if (!wizard) +#endif /* WIZARD */ topten(); - if(done_stopprint) printf("\n\n"); + if (done_stopprint) + printf("\n\n"); exit(0); } @@ -209,45 +248,46 @@ register char *st1; #define PERS_IS_UID /* delete for PERSMAX per name; now per uid */ struct toptenentry { struct toptenentry *tt_next; - long int points; - int level,maxlvl,hp,maxhp; - int uid; - char plchar; - char sex; - char name[NAMSZ+1]; - char death[DTHSZ+1]; - char date[7]; /* yymmdd */ -} *tt_head; + long int points; + int level, maxlvl, hp, maxhp; + int uid; + char plchar; + char sex; + char name[NAMSZ + 1]; + char death[DTHSZ + 1]; + char date[7];/* yymmdd */ +} *tt_head; -topten(){ - int uid = getuid(); - int rank, rank0 = -1, rank1 = 0; - int occ_cnt = PERSMAX; - register struct toptenentry *t0, *t1, *tprev; - char *recfile = RECORD; - char *reclock = "record_lock"; - int sleepct = 300; - FILE *rfile; - register flg = 0; - extern char *getdate(); +void +topten() +{ + int uid = getuid(); + int rank, rank0 = -1, rank1 = 0; + int occ_cnt = PERSMAX; + struct toptenentry *t0, *t1, *tprev; + char *recfile = RECORD; + char *reclock = "record_lock"; + int sleepct = 300; + FILE *rfile; + int flg = 0; #define HUP if(!done_hup) - while(link(recfile, reclock) == -1) { - HUP perror(reclock); - if(!sleepct--) { - HUP puts("I give up. Sorry."); - HUP puts("Perhaps there is an old record_lock around?"); + while (link(recfile, reclock) == -1) { + HUP perror(reclock); + if (!sleepct--) { + HUP puts("I give up. Sorry."); + HUP puts("Perhaps there is an old record_lock around?"); return; } - HUP printf("Waiting for access to record file. (%d)\n", - sleepct); - HUP (void) fflush(stdout); + HUP printf("Waiting for access to record file. (%d)\n", + sleepct); + HUP(void) fflush(stdout); sleep(1); } - if(!(rfile = fopen(recfile,"r"))){ - HUP puts("Cannot open record file!"); + if (!(rfile = fopen(recfile, "r"))) { + HUP puts("Cannot open record file!"); goto unlock; } - HUP (void) putchar('\n'); + HUP(void) putchar('\n'); /* create a new 'topten' entry */ t0 = newttentry(); @@ -266,238 +306,275 @@ topten(){ (void) strcpy(t0->date, getdate()); /* assure minimum number of points */ - if(t0->points < POINTSMIN) + if (t0->points < POINTSMIN) t0->points = 0; t1 = tt_head = newttentry(); tprev = 0; /* rank0: -1 undefined, 0 not_on_list, n n_th on list */ - for(rank = 1; ; ) { - if(fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]", - t1->date, &t1->uid, - &t1->level, &t1->maxlvl, - &t1->hp, &t1->maxhp, &t1->points, - &t1->plchar, &t1->sex, t1->name, t1->death) != 11 - || t1->points < POINTSMIN) + for (rank = 1;;) { + if (fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]", + t1->date, &t1->uid, + &t1->level, &t1->maxlvl, + &t1->hp, &t1->maxhp, &t1->points, + &t1->plchar, &t1->sex, t1->name, t1->death) != 11 + || t1->points < POINTSMIN) t1->points = 0; - if(rank0 < 0 && t1->points < t0->points) { - rank0 = rank++; - if(tprev == 0) - tt_head = t0; - else - tprev->tt_next = t0; - t0->tt_next = t1; - occ_cnt--; - flg++; /* ask for a rewrite */ - } else - tprev = t1; - if(t1->points == 0) break; - if( + if (rank0 < 0 && t1->points < t0->points) { + rank0 = rank++; + if (tprev == 0) + tt_head = t0; + else + tprev->tt_next = t0; + t0->tt_next = t1; + occ_cnt--; + flg++; /* ask for a rewrite */ + } else + tprev = t1; + if (t1->points == 0) + break; + if ( #ifdef PERS_IS_UID - t1->uid == t0->uid && + t1->uid == t0->uid && #else - strncmp(t1->name, t0->name, NAMSZ) == 0 && -#endif PERS_IS_UID - t1->plchar == t0->plchar && --occ_cnt <= 0){ - if(rank0 < 0){ - rank0 = 0; - rank1 = rank; - HUP printf("You didn't beat your previous score of %ld points.\n\n", - t1->points); + strncmp(t1->name, t0->name, NAMSZ) == 0 && +#endif /* PERS_IS_UID */ + t1->plchar == t0->plchar && --occ_cnt <= 0) { + if (rank0 < 0) { + rank0 = 0; + rank1 = rank; + HUP printf("You didn't beat your previous score of %ld points.\n\n", + t1->points); + } + if (occ_cnt < 0) { + flg++; + continue; + } } - if(occ_cnt < 0){ - flg++; - continue; + if (rank <= ENTRYMAX) { + t1 = t1->tt_next = newttentry(); + rank++; + } + if (rank > ENTRYMAX) { + t1->points = 0; + break; } - } - if(rank <= ENTRYMAX){ - t1 = t1->tt_next = newttentry(); - rank++; - } - if(rank > ENTRYMAX){ - t1->points = 0; - break; - } } - if(flg) { /* rewrite record file */ + if (flg) { /* rewrite record file */ (void) fclose(rfile); - if(!(rfile = fopen(recfile,"w"))){ - HUP puts("Cannot write record file\n"); + if (!(rfile = fopen(recfile, "w"))) { + HUP puts("Cannot write record file\n"); goto unlock; } - - if(!done_stopprint) if(rank0 > 0){ - if(rank0 <= 10) - puts("You made the top ten list!\n"); - else - printf("You reached the %d%s place on the top %d list.\n\n", - rank0, ordin(rank0), ENTRYMAX); - } + if (!done_stopprint) + if (rank0 > 0) { + if (rank0 <= 10) + puts("You made the top ten list!\n"); + else + printf("You reached the %d%s place on the top %d list.\n\n", + rank0, ordin(rank0), ENTRYMAX); + } } - if(rank0 == 0) rank0 = rank1; - if(rank0 <= 0) rank0 = rank; - if(!done_stopprint) outheader(); + if (rank0 == 0) + rank0 = rank1; + if (rank0 <= 0) + rank0 = rank; + if (!done_stopprint) + outheader(); t1 = tt_head; - for(rank = 1; t1->points != 0; rank++, t1 = t1->tt_next) { - if(flg) fprintf(rfile,"%6s %d %d %d %d %d %ld %c%c %s,%s\n", - t1->date, t1->uid, - t1->level, t1->maxlvl, - t1->hp, t1->maxhp, t1->points, - t1->plchar, t1->sex, t1->name, t1->death); - if(done_stopprint) continue; - if(rank > flags.end_top && - (rank < rank0-flags.end_around || rank > rank0+flags.end_around) - && (!flags.end_own || + for (rank = 1; t1->points != 0; rank++, t1 = t1->tt_next) { + if (flg) + fprintf(rfile, "%6s %d %d %d %d %d %ld %c%c %s,%s\n", + t1->date, t1->uid, + t1->level, t1->maxlvl, + t1->hp, t1->maxhp, t1->points, + t1->plchar, t1->sex, t1->name, t1->death); + if (done_stopprint) + continue; + if (rank > flags.end_top && + (rank < rank0 - flags.end_around || rank > rank0 + flags.end_around) + && (!flags.end_own || #ifdef PERS_IS_UID - t1->uid != t0->uid )) + t1->uid != t0->uid)) #else - strncmp(t1->name, t0->name, NAMSZ))) -#endif PERS_IS_UID - continue; - if(rank == rank0-flags.end_around && - rank0 > flags.end_top+flags.end_around+1 && - !flags.end_own) - (void) putchar('\n'); - if(rank != rank0) - (void) outentry(rank, t1, 0); - else if(!rank1) - (void) outentry(rank, t1, 1); - else { - int t0lth = outentry(0, t0, -1); - int t1lth = outentry(rank, t1, t0lth); - if(t1lth > t0lth) t0lth = t1lth; - (void) outentry(0, t0, t0lth); - } + strncmp(t1->name, t0->name, NAMSZ))) +#endif /* PERS_IS_UID */ + continue; + if (rank == rank0 - flags.end_around && + rank0 > flags.end_top + flags.end_around + 1 && + !flags.end_own) + (void) putchar('\n'); + if (rank != rank0) + (void) outentry(rank, t1, 0); + else if (!rank1) + (void) outentry(rank, t1, 1); + else { + int t0lth = outentry(0, t0, -1); + int t1lth = outentry(rank, t1, t0lth); + if (t1lth > t0lth) + t0lth = t1lth; + (void) outentry(0, t0, t0lth); + } } - if(rank0 >= rank) if(!done_stopprint) - (void) outentry(0, t0, 1); + if (rank0 >= rank) + if (!done_stopprint) + (void) outentry(0, t0, 1); (void) fclose(rfile); unlock: (void) unlink(reclock); } -outheader() { -char linebuf[BUFSZ]; -register char *bp; +void +outheader() +{ + char linebuf[BUFSZ]; + char *bp; (void) strcpy(linebuf, "Number Points Name"); bp = eos(linebuf); - while(bp < linebuf + COLNO - 9) *bp++ = ' '; + while (bp < linebuf + COLNO - 9) + *bp++ = ' '; (void) strcpy(bp, "Hp [max]"); puts(linebuf); } /* so>0: standout line; so=0: ordinary line; so<0: no output, return lth */ int -outentry(rank,t1,so) register struct toptenentry *t1; { -boolean quit = FALSE, killed = FALSE, starv = FALSE; -char linebuf[BUFSZ]; +outentry(rank, t1, so) + struct toptenentry *t1; +{ + boolean quit = FALSE, killed = FALSE, starv = FALSE; + char linebuf[BUFSZ]; linebuf[0] = 0; - if(rank) Sprintf(eos(linebuf), "%3d", rank); - else Sprintf(eos(linebuf), " "); + if (rank) + Sprintf(eos(linebuf), "%3d", rank); + else + Sprintf(eos(linebuf), " "); Sprintf(eos(linebuf), " %6ld %8s", t1->points, t1->name); - if(t1->plchar == 'X') Sprintf(eos(linebuf), " "); - else Sprintf(eos(linebuf), "-%c ", t1->plchar); - if(!strncmp("escaped", t1->death, 7)) { - if(!strcmp(" (with amulet)", t1->death+7)) - Sprintf(eos(linebuf), "escaped the dungeon with amulet"); - else - Sprintf(eos(linebuf), "escaped the dungeon [max level %d]", - t1->maxlvl); + if (t1->plchar == 'X') + Sprintf(eos(linebuf), " "); + else + Sprintf(eos(linebuf), "-%c ", t1->plchar); + if (!strncmp("escaped", t1->death, 7)) { + if (!strcmp(" (with amulet)", t1->death + 7)) + Sprintf(eos(linebuf), "escaped the dungeon with amulet"); + else + Sprintf(eos(linebuf), "escaped the dungeon [max level %d]", + t1->maxlvl); } else { - if(!strncmp(t1->death,"quit",4)) { - quit = TRUE; - if(t1->maxhp < 3*t1->hp && t1->maxlvl < 4) - Sprintf(eos(linebuf), "cravenly gave up"); - else - Sprintf(eos(linebuf), "quit"); - } - else if(!strcmp(t1->death,"choked")) - Sprintf(eos(linebuf), "choked on %s food", - (t1->sex == 'F') ? "her" : "his"); - else if(!strncmp(t1->death,"starv",5)) - Sprintf(eos(linebuf), "starved to death"), starv = TRUE; - else Sprintf(eos(linebuf), "was killed"), killed = TRUE; - Sprintf(eos(linebuf), " on%s level %d", - (killed || starv) ? "" : " dungeon", t1->level); - if(t1->maxlvl != t1->level) - Sprintf(eos(linebuf), " [max %d]", t1->maxlvl); - if(quit && t1->death[4]) Sprintf(eos(linebuf), t1->death + 4); + if (!strncmp(t1->death, "quit", 4)) { + quit = TRUE; + if (t1->maxhp < 3 * t1->hp && t1->maxlvl < 4) + Sprintf(eos(linebuf), "cravenly gave up"); + else + Sprintf(eos(linebuf), "quit"); + } else if (!strcmp(t1->death, "choked")) + Sprintf(eos(linebuf), "choked on %s food", + (t1->sex == 'F') ? "her" : "his"); + else if (!strncmp(t1->death, "starv", 5)) + Sprintf(eos(linebuf), "starved to death"), starv = TRUE; + else + Sprintf(eos(linebuf), "was killed"), killed = TRUE; + Sprintf(eos(linebuf), " on%s level %d", + (killed || starv) ? "" : " dungeon", t1->level); + if (t1->maxlvl != t1->level) + Sprintf(eos(linebuf), " [max %d]", t1->maxlvl); + if (quit && t1->death[4]) + Sprintf(eos(linebuf), t1->death + 4); } - if(killed) Sprintf(eos(linebuf), " by %s%s", - (!strncmp(t1->death, "trick", 5) || !strncmp(t1->death, "the ", 4)) - ? "" : - index(vowels,*t1->death) ? "an " : "a ", - t1->death); + if (killed) + Sprintf(eos(linebuf), " by %s%s", + (!strncmp(t1->death, "trick", 5) || !strncmp(t1->death, "the ", 4)) + ? "" : + strchr(vowels, *t1->death) ? "an " : "a ", + t1->death); Sprintf(eos(linebuf), "."); - if(t1->maxhp) { - register char *bp = eos(linebuf); - char hpbuf[10]; - int hppos; - Sprintf(hpbuf, (t1->hp > 0) ? itoa(t1->hp) : "-"); - hppos = COLNO - 7 - strlen(hpbuf); - if(bp <= linebuf + hppos) { - while(bp < linebuf + hppos) *bp++ = ' '; - (void) strcpy(bp, hpbuf); - Sprintf(eos(bp), " [%d]", t1->maxhp); - } + if (t1->maxhp) { + char *bp = eos(linebuf); + char hpbuf[10]; + int hppos; + Sprintf(hpbuf, (t1->hp > 0) ? itoa(t1->hp) : "-"); + hppos = COLNO - 7 - strlen(hpbuf); + if (bp <= linebuf + hppos) { + while (bp < linebuf + hppos) + *bp++ = ' '; + (void) strcpy(bp, hpbuf); + Sprintf(eos(bp), " [%d]", t1->maxhp); + } } - if(so == 0) puts(linebuf); - else if(so > 0) { - register char *bp = eos(linebuf); - if(so >= COLNO) so = COLNO-1; - while(bp < linebuf + so) *bp++ = ' '; - *bp = 0; - standoutbeg(); - fputs(linebuf,stdout); - standoutend(); - (void) putchar('\n'); + if (so == 0) + puts(linebuf); + else if (so > 0) { + char *bp = eos(linebuf); + if (so >= COLNO) + so = COLNO - 1; + while (bp < linebuf + so) + *bp++ = ' '; + *bp = 0; + standoutbeg(); + fputs(linebuf, stdout); + standoutend(); + (void) putchar('\n'); } - return(strlen(linebuf)); + return (strlen(linebuf)); } -char * -itoa(a) int a; { -static char buf[12]; - Sprintf(buf,"%d",a); - return(buf); +char * +itoa(a) + int a; +{ + static char buf[12]; + Sprintf(buf, "%d", a); + return (buf); } -char * -ordin(n) int n; { -register int d = n%10; - return((d==0 || d>3 || n/10==1) ? "th" : (d==1) ? "st" : - (d==2) ? "nd" : "rd"); +char * +ordin(n) + int n; +{ + int d = n % 10; + return ((d == 0 || d > 3 || n / 10 == 1) ? "th" : (d == 1) ? "st" : + (d == 2) ? "nd" : "rd"); } -clearlocks(){ -register x; - (void) signal(SIGHUP,SIG_IGN); - for(x = maxdlevel; x >= 0; x--) { +void +clearlocks() +{ + int x; + (void) signal(SIGHUP, SIG_IGN); + for (x = maxdlevel; x >= 0; x--) { glo(x); (void) unlink(lock); /* not all levels need be present */ } } #ifdef NOSAVEONHANGUP -hangup() +/*ARGSUSED*/ +void +hangup(n) + int n; { (void) signal(SIGINT, SIG_IGN); clearlocks(); exit(1); } -#endif NOSAVEONHANGUP +#endif /* NOSAVEONHANGUP */ -char * +char * eos(s) -register char *s; + char *s; { - while(*s) s++; - return(s); + while (*s) + s++; + return (s); } /* it is the callers responsibility to check that there is room for c */ -charcat(s,c) register char *s, c; { - while(*s) s++; +void +charcat(s, c) + char *s, c; +{ + while (*s) + s++; *s++ = c; *s = 0; } @@ -507,141 +584,151 @@ charcat(s,c) register char *s, c; { * requested. Otherwise, find scores for the current player (and list them * if argc == -1). */ -prscore(argc,argv) int argc; char **argv; { - extern char *hname; - char **players; - int playerct; - int rank; - register struct toptenentry *t1, *t2; - char *recfile = RECORD; - FILE *rfile; - register flg = 0; - register int i; +void +prscore(argc, argv) + int argc; + char **argv; +{ + char **players = NULL; + int playerct; + int rank; + struct toptenentry *t1, *t2; + char *recfile = RECORD; + FILE *rfile; + int flg = 0; + int i; #ifdef nonsense - long total_score = 0L; - char totchars[10]; - int totcharct = 0; -#endif nonsense - int outflg = (argc >= -1); + long total_score = 0L; + char totchars[10]; + int totcharct = 0; +#endif /* nonsense */ + int outflg = (argc >= -1); #ifdef PERS_IS_UID - int uid = -1; + int uid = -1; #else - char *player0; -#endif PERS_IS_UID + char *player0; +#endif /* PERS_IS_UID */ - if(!(rfile = fopen(recfile,"r"))){ + if (!(rfile = fopen(recfile, "r"))) { puts("Cannot open record file!"); return; } - - if(argc > 1 && !strncmp(argv[1], "-s", 2)){ - if(!argv[1][2]){ + if (argc > 1 && !strncmp(argv[1], "-s", 2)) { + if (!argv[1][2]) { argc--; argv++; - } else if(!argv[1][3] && index("CFKSTWX", argv[1][2])) { + } else if (!argv[1][3] && strchr("CFKSTWX", argv[1][2])) { argv[1]++; argv[1][0] = '-'; - } else argv[1] += 2; + } else + argv[1] += 2; } - if(argc <= 1){ + if (argc <= 1) { #ifdef PERS_IS_UID uid = getuid(); playerct = 0; #else player0 = plname; - if(!*player0) + if (!*player0) player0 = "hackplayer"; playerct = 1; players = &player0; -#endif PERS_IS_UID +#endif /* PERS_IS_UID */ } else { playerct = --argc; players = ++argv; } - if(outflg) putchar('\n'); + if (outflg) + putchar('\n'); t1 = tt_head = newttentry(); - for(rank = 1; ; rank++) { - if(fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]", - t1->date, &t1->uid, - &t1->level, &t1->maxlvl, - &t1->hp, &t1->maxhp, &t1->points, - &t1->plchar, &t1->sex, t1->name, t1->death) != 11) + for (rank = 1;; rank++) { + if (fscanf(rfile, "%6s %d %d %d %d %d %ld %c%c %[^,],%[^\n]", + t1->date, &t1->uid, + &t1->level, &t1->maxlvl, + &t1->hp, &t1->maxhp, &t1->points, + &t1->plchar, &t1->sex, t1->name, t1->death) != 11) t1->points = 0; - if(t1->points == 0) break; + if (t1->points == 0) + break; #ifdef PERS_IS_UID - if(!playerct && t1->uid == uid) - flg++; - else -#endif PERS_IS_UID - for(i = 0; i < playerct; i++){ - if(strcmp(players[i], "all") == 0 || - strncmp(t1->name, players[i], NAMSZ) == 0 || - (players[i][0] == '-' && - players[i][1] == t1->plchar && - players[i][2] == 0) || - (digit(players[i][0]) && rank <= atoi(players[i]))) + if (!playerct && t1->uid == uid) flg++; - } - t1 = t1->tt_next = newttentry(); + else +#endif /* PERS_IS_UID */ + for (i = 0; i < playerct; i++) { + if (strcmp(players[i], "all") == 0 || + strncmp(t1->name, players[i], NAMSZ) == 0 || + (players[i][0] == '-' && + players[i][1] == t1->plchar && + players[i][2] == 0) || + (digit(players[i][0]) && rank <= atoi(players[i]))) + flg++; + } + t1 = t1->tt_next = newttentry(); } (void) fclose(rfile); - if(!flg) { - if(outflg) { - printf("Cannot find any entries for "); - if(playerct < 1) printf("you.\n"); - else { - if(playerct > 1) printf("any of "); - for(i=0; i<playerct; i++) - printf("%s%s", players[i], (i<playerct-1)?", ":".\n"); - printf("Call is: %s -s [playernames]\n", hname); + if (!flg) { + if (outflg) { + printf("Cannot find any entries for "); + if (playerct < 1) + printf("you.\n"); + else { + if (playerct > 1) + printf("any of "); + for (i = 0; i < playerct; i++) + printf("%s%s", players[i], (i < playerct - 1) ? ", " : ".\n"); + printf("Call is: %s -s [playernames]\n", hname); + } } - } - return; + return; } - - if(outflg) outheader(); + if (outflg) + outheader(); t1 = tt_head; - for(rank = 1; t1->points != 0; rank++, t1 = t2) { + for (rank = 1; t1->points != 0; rank++, t1 = t2) { t2 = t1->tt_next; #ifdef PERS_IS_UID - if(!playerct && t1->uid == uid) + if (!playerct && t1->uid == uid) goto outwithit; else -#endif PERS_IS_UID - for(i = 0; i < playerct; i++){ - if(strcmp(players[i], "all") == 0 || - strncmp(t1->name, players[i], NAMSZ) == 0 || - (players[i][0] == '-' && - players[i][1] == t1->plchar && - players[i][2] == 0) || - (digit(players[i][0]) && rank <= atoi(players[i]))){ +#endif /* PERS_IS_UID */ + for (i = 0; i < playerct; i++) { + if (strcmp(players[i], "all") == 0 || + strncmp(t1->name, players[i], NAMSZ) == 0 || + (players[i][0] == '-' && + players[i][1] == t1->plchar && + players[i][2] == 0) || + (digit(players[i][0]) && rank <= atoi(players[i]))) { outwithit: - if(outflg) - (void) outentry(rank, t1, 0); + if (outflg) + (void) outentry(rank, t1, 0); #ifdef nonsense - total_score += t1->points; - if(totcharct < sizeof(totchars)-1) - totchars[totcharct++] = t1->plchar; -#endif nonsense - break; + total_score += t1->points; + if (totcharct < sizeof(totchars) - 1) + totchars[totcharct++] = t1->plchar; +#endif /* nonsense */ + break; + } } - } free((char *) t1); } #ifdef nonsense totchars[totcharct] = 0; - /* We would like to determine whether he is experienced. However, - the information collected here only tells about the scores/roles - that got into the topten (top 100?). We should maintain a - .hacklog or something in his home directory. */ + /* + * We would like to determine whether he is experienced. However, the + * information collected here only tells about the scores/roles that + * got into the topten (top 100?). We should maintain a .hacklog or + * something in his home directory. + */ flags.beginner = (total_score < 6000); - for(i=0; i<6; i++) - if(!index(totchars, "CFKSTWX"[i])) { - flags.beginner = 1; - if(!pl_character[0]) pl_character[0] = "CFKSTWX"[i]; - break; - } -#endif nonsense + for (i = 0; i < 6; i++) + if (!strchr(totchars, "CFKSTWX"[i])) { + flags.beginner = 1; + if (!pl_character[0]) + pl_character[0] = "CFKSTWX"[i]; + break; + } +#endif /* nonsense */ } diff --git a/hack/hack.engrave.c b/hack/hack.engrave.c index e32807d3..8261967f 100644 --- a/hack/hack.engrave.c +++ b/hack/hack.engrave.c @@ -1,275 +1,303 @@ +/* $NetBSD: hack.engrave.c,v 1.4 1997/10/19 16:57:58 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.engrave.c,v 1.3 1995/03/23 08:30:08 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.engrave.c,v 1.4 1997/10/19 16:57:58 christos Exp $"); +#endif /* not lint */ -#include "hack.h" +#include <stdlib.h> +#include "hack.h" +#include "extern.h" -extern char *nomovemsg; -extern char nul[]; -extern struct obj zeroobj; struct engr { - struct engr *nxt_engr; - char *engr_txt; - xchar engr_x, engr_y; - unsigned engr_lth; /* for save & restore; not length of text */ - long engr_time; /* moment engraving was (will be) finished */ - xchar engr_type; + struct engr *nxt_engr; + char *engr_txt; + xchar engr_x, engr_y; + unsigned engr_lth; /* for save & restore; not length of + * text */ + long engr_time; /* moment engraving was (will be) + * finished */ + xchar engr_type; #define DUST 1 #define ENGRAVE 2 #define BURN 3 -} *head_engr; +} *head_engr; -struct engr * -engr_at(x,y) register xchar x,y; { -register struct engr *ep = head_engr; - while(ep) { - if(x == ep->engr_x && y == ep->engr_y) - return(ep); +struct engr * +engr_at(x, y) + xchar x, y; +{ + struct engr *ep = head_engr; + while (ep) { + if (x == ep->engr_x && y == ep->engr_y) + return (ep); ep = ep->nxt_engr; } - return((struct engr *) 0); + return ((struct engr *) 0); } -sengr_at(s,x,y) register char *s; register xchar x,y; { -register struct engr *ep = engr_at(x,y); -register char *t; -register int n; - if(ep && ep->engr_time <= moves) { +int +sengr_at(s, x, y) + char *s; + xchar x, y; +{ + struct engr *ep = engr_at(x, y); + char *t; + int n; + if (ep && ep->engr_time <= moves) { t = ep->engr_txt; -/* - if(!strcmp(s,t)) return(1); -*/ + /* + if(!strcmp(s,t)) return(1); + */ n = strlen(s); - while(*t) { - if(!strncmp(s,t,n)) return(1); + while (*t) { + if (!strncmp(s, t, n)) + return (1); t++; } } - return(0); + return (0); } +void u_wipe_engr(cnt) -register int cnt; + int cnt; { - if(!u.uswallow && !Levitation) + if (!u.uswallow && !Levitation) wipe_engr_at(u.ux, u.uy, cnt); } -wipe_engr_at(x,y,cnt) register xchar x,y,cnt; { -register struct engr *ep = engr_at(x,y); -register int lth,pos; -char ch; - if(ep){ - if((ep->engr_type != DUST) || Levitation) { - cnt = rn2(1 + 50/(cnt+1)) ? 0 : 1; +void +wipe_engr_at(x, y, cnt) + xchar x, y, cnt; +{ + struct engr *ep = engr_at(x, y); + int lth, pos; + char ch; + if (ep) { + if ((ep->engr_type != DUST) || Levitation) { + cnt = rn2(1 + 50 / (cnt + 1)) ? 0 : 1; } lth = strlen(ep->engr_txt); - if(lth && cnt > 0 ) { - while(cnt--) { + if (lth && cnt > 0) { + while (cnt--) { pos = rn2(lth); - if((ch = ep->engr_txt[pos]) == ' ') + if ((ch = ep->engr_txt[pos]) == ' ') continue; ep->engr_txt[pos] = (ch != '?') ? '?' : ' '; } } - while(lth && ep->engr_txt[lth-1] == ' ') + while (lth && ep->engr_txt[lth - 1] == ' ') ep->engr_txt[--lth] = 0; - while(ep->engr_txt[0] == ' ') + while (ep->engr_txt[0] == ' ') ep->engr_txt++; - if(!ep->engr_txt[0]) del_engr(ep); + if (!ep->engr_txt[0]) + del_engr(ep); } } -read_engr_at(x,y) register int x,y; { -register struct engr *ep = engr_at(x,y); - if(ep && ep->engr_txt[0]) { - switch(ep->engr_type) { - case DUST: - pline("Something is written here in the dust."); - break; - case ENGRAVE: - pline("Something is engraved here on the floor."); - break; - case BURN: - pline("Some text has been burned here in the floor."); - break; - default: - impossible("Something is written in a very strange way."); - } - pline("You read: \"%s\".", ep->engr_txt); +void +read_engr_at(x, y) + int x, y; +{ + struct engr *ep = engr_at(x, y); + if (ep && ep->engr_txt[0]) { + switch (ep->engr_type) { + case DUST: + pline("Something is written here in the dust."); + break; + case ENGRAVE: + pline("Something is engraved here on the floor."); + break; + case BURN: + pline("Some text has been burned here in the floor."); + break; + default: + impossible("Something is written in a very strange way."); + } + pline("You read: \"%s\".", ep->engr_txt); } } -make_engr_at(x,y,s) -register int x,y; -register char *s; +void +make_engr_at(x, y, s) + int x, y; + char *s; { - register struct engr *ep; + struct engr *ep; - if(ep = engr_at(x,y)) - del_engr(ep); + if ((ep = engr_at(x, y)) != NULL) + del_engr(ep); ep = (struct engr *) - alloc((unsigned)(sizeof(struct engr) + strlen(s) + 1)); + alloc((unsigned) (sizeof(struct engr) + strlen(s) + 1)); ep->nxt_engr = head_engr; head_engr = ep; ep->engr_x = x; ep->engr_y = y; - ep->engr_txt = (char *)(ep + 1); + ep->engr_txt = (char *) (ep + 1); (void) strcpy(ep->engr_txt, s); ep->engr_time = 0; ep->engr_type = DUST; ep->engr_lth = strlen(s) + 1; } -doengrave(){ -register int len; -register char *sp; -register struct engr *ep, *oep = engr_at(u.ux,u.uy); -char buf[BUFSZ]; -xchar type; -int spct; /* number of leading spaces */ -register struct obj *otmp; +int +doengrave() +{ + int len; + char *sp; + struct engr *ep, *oep = engr_at(u.ux, u.uy); + char buf[BUFSZ]; + xchar type; + int spct; /* number of leading spaces */ + struct obj *otmp; multi = 0; - if(u.uswallow) { + if (u.uswallow) { pline("You're joking. Hahaha!"); /* riv05!a3 */ - return(0); + return (0); } - /* one may write with finger, weapon or wand */ otmp = getobj("#-)/", "write with"); - if(!otmp) return(0); + if (!otmp) + return (0); - if(otmp == &zeroobj) + if (otmp == &zeroobj) otmp = 0; - if(otmp && otmp->otyp == WAN_FIRE && otmp->spe) { + if (otmp && otmp->otyp == WAN_FIRE && otmp->spe) { type = BURN; otmp->spe--; } else { /* first wield otmp */ - if(otmp != uwep) { - if(uwep && uwep->cursed) { - /* Andreas Bormann */ - pline("Since your weapon is welded to your hand,"); - pline("you use the %s.", aobjnam(uwep, (char *) 0)); - otmp = uwep; + if (otmp != uwep) { + if (uwep && uwep->cursed) { + /* Andreas Bormann */ + pline("Since your weapon is welded to your hand,"); + pline("you use the %s.", aobjnam(uwep, (char *) 0)); + otmp = uwep; } else { - if(!otmp) - pline("You are now empty-handed."); - else if(otmp->cursed) - pline("The %s %s to your hand!", - aobjnam(otmp, "weld"), - (otmp->quan == 1) ? "itself" : "themselves"); - else - pline("You now wield %s.", doname(otmp)); - setuwep(otmp); + if (!otmp) + pline("You are now empty-handed."); + else if (otmp->cursed) + pline("The %s %s to your hand!", + aobjnam(otmp, "weld"), + (otmp->quan == 1) ? "itself" : "themselves"); + else + pline("You now wield %s.", doname(otmp)); + setuwep(otmp); } } - - if(!otmp) + if (!otmp) type = DUST; - else - if(otmp->otyp == DAGGER || otmp->otyp == TWO_HANDED_SWORD || - otmp->otyp == CRYSKNIFE || - otmp->otyp == LONG_SWORD || otmp->otyp == AXE) { + else if (otmp->otyp == DAGGER || otmp->otyp == TWO_HANDED_SWORD || + otmp->otyp == CRYSKNIFE || + otmp->otyp == LONG_SWORD || otmp->otyp == AXE) { type = ENGRAVE; - if((int)otmp->spe <= -3) { + if ((int) otmp->spe <= -3) { type = DUST; pline("Your %s too dull for engraving.", - aobjnam(otmp, "are")); - if(oep && oep->engr_type != DUST) return(1); + aobjnam(otmp, "are")); + if (oep && oep->engr_type != DUST) + return (1); } - } else type = DUST; + } else + type = DUST; } - if(Levitation && type != BURN){ /* riv05!a3 */ + if (Levitation && type != BURN) { /* riv05!a3 */ pline("You can't reach the floor!"); - return(1); + return (1); } - if(oep && oep->engr_type == DUST){ - pline("You wipe out the message that was written here."); - del_engr(oep); - oep = 0; + if (oep && oep->engr_type == DUST) { + pline("You wipe out the message that was written here."); + del_engr(oep); + oep = 0; } - if(type == DUST && oep){ - pline("You cannot wipe out the message that is %s in the rock.", - (oep->engr_type == BURN) ? "burned" : "engraved"); - return(1); + if (type == DUST && oep) { + pline("You cannot wipe out the message that is %s in the rock.", + (oep->engr_type == BURN) ? "burned" : "engraved"); + return (1); } - pline("What do you want to %s on the floor here? ", - (type == ENGRAVE) ? "engrave" : (type == BURN) ? "burn" : "write"); + (type == ENGRAVE) ? "engrave" : (type == BURN) ? "burn" : "write"); getlin(buf); clrlin(); spct = 0; sp = buf; - while(*sp == ' ') spct++, sp++; + while (*sp == ' ') + spct++, sp++; len = strlen(sp); - if(!len || *buf == '\033') { - if(type == BURN) otmp->spe++; - return(0); + if (!len || *buf == '\033') { + if (type == BURN) + otmp->spe++; + return (0); } - - switch(type) { + switch (type) { case DUST: case BURN: - if(len > 15) { - multi = -(len/10); + if (len > 15) { + multi = -(len / 10); nomovemsg = "You finished writing."; } break; case ENGRAVE: /* here otmp != 0 */ - { int len2 = (otmp->spe + 3) * 2 + 1; + { + int len2 = (otmp->spe + 3) * 2 + 1; pline("Your %s dull.", aobjnam(otmp, "get")); - if(len2 < len) { + if (len2 < len) { len = len2; sp[len] = 0; otmp->spe = -3; nomovemsg = "You cannot engrave more."; } else { - otmp->spe -= len/2; + otmp->spe -= len / 2; nomovemsg = "You finished engraving."; } multi = -len; } break; } - if(oep) len += strlen(oep->engr_txt) + spct; - ep = (struct engr *) alloc((unsigned)(sizeof(struct engr) + len + 1)); + if (oep) + len += strlen(oep->engr_txt) + spct; + ep = (struct engr *) alloc((unsigned) (sizeof(struct engr) + len + 1)); ep->nxt_engr = head_engr; head_engr = ep; ep->engr_x = u.ux; ep->engr_y = u.uy; - sp = (char *)(ep + 1); /* (char *)ep + sizeof(struct engr) */ + sp = (char *) (ep + 1); /* (char *)ep + sizeof(struct engr) */ ep->engr_txt = sp; - if(oep) { + if (oep) { (void) strcpy(sp, oep->engr_txt); (void) strcat(sp, buf); del_engr(oep); } else (void) strcpy(sp, buf); - ep->engr_lth = len+1; + ep->engr_lth = len + 1; ep->engr_type = type; - ep->engr_time = moves-multi; + ep->engr_time = moves - multi; /* kludge to protect pline against excessively long texts */ - if(len > BUFSZ-20) sp[BUFSZ-20] = 0; + if (len > BUFSZ - 20) + sp[BUFSZ - 20] = 0; - return(1); + return (1); } -save_engravings(fd) int fd; { -register struct engr *ep = head_engr; - while(ep) { - if(!ep->engr_lth || !ep->engr_txt[0]){ +void +save_engravings(fd) + int fd; +{ + struct engr *ep = head_engr; + while (ep) { + if (!ep->engr_lth || !ep->engr_txt[0]) { ep = ep->nxt_engr; continue; } - bwrite(fd, (char *) & (ep->engr_lth), sizeof(ep->engr_lth)); + bwrite(fd, (char *) &(ep->engr_lth), sizeof(ep->engr_lth)); bwrite(fd, (char *) ep, sizeof(struct engr) + ep->engr_lth); ep = ep->nxt_engr; } @@ -277,13 +305,17 @@ register struct engr *ep = head_engr; head_engr = 0; } -rest_engravings(fd) int fd; { -register struct engr *ep; -unsigned lth; +void +rest_engravings(fd) + int fd; +{ + struct engr *ep; + unsigned lth; head_engr = 0; - while(1) { + while (1) { mread(fd, (char *) <h, sizeof(unsigned)); - if(lth == 0) return; + if (lth == 0) + return; ep = (struct engr *) alloc(sizeof(struct engr) + lth); mread(fd, (char *) ep, sizeof(struct engr) + lth); ep->nxt_engr = head_engr; @@ -292,20 +324,23 @@ unsigned lth; } } -del_engr(ep) register struct engr *ep; { -register struct engr *ept; - if(ep == head_engr) +void +del_engr(ep) + struct engr *ep; +{ + struct engr *ept; + if (ep == head_engr) head_engr = ep->nxt_engr; else { - for(ept = head_engr; ept; ept = ept->nxt_engr) { - if(ept->nxt_engr == ep) { + for (ept = head_engr; ept; ept = ept->nxt_engr) { + if (ept->nxt_engr == ep) { ept->nxt_engr = ep->nxt_engr; goto fnd; } } impossible("Error in del_engr?"); return; - fnd: ; +fnd: ; } free((char *) ep); } diff --git a/hack/hack.fight.c b/hack/hack.fight.c index 92d11c2e..9ca08a19 100644 --- a/hack/hack.fight.c +++ b/hack/hack.fight.c @@ -1,276 +1,312 @@ +/* $NetBSD: hack.fight.c,v 1.4 1997/10/19 16:58:00 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.fight.c,v 1.3 1995/03/23 08:30:12 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.fight.c,v 1.4 1997/10/19 16:58:00 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -extern struct permonst li_dog, dog, la_dog; -extern char *exclam(), *xname(); -extern struct obj *mkobj_at(); +#include "hack.h" +#include "extern.h" -static boolean far_noise; -static long noisetime; +static boolean far_noise; +static long noisetime; /* hitmm returns 0 (miss), 1 (hit), or 2 (kill) */ -hitmm(magr,mdef) register struct monst *magr,*mdef; { -register struct permonst *pa = magr->data, *pd = mdef->data; -int hit; -schar tmp; -boolean vis; - if(index("Eauy", pa->mlet)) return(0); - if(magr->mfroz) return(0); /* riv05!a3 */ +int +hitmm(magr, mdef) + struct monst *magr, *mdef; +{ + struct permonst *pa = magr->data, *pd = mdef->data; + int hit; + schar tmp; + boolean vis; + if (strchr("Eauy", pa->mlet)) + return (0); + if (magr->mfroz) + return (0); /* riv05!a3 */ tmp = pd->ac + pa->mlevel; - if(mdef->mconf || mdef->mfroz || mdef->msleep){ + if (mdef->mconf || mdef->mfroz || mdef->msleep) { tmp += 4; - if(mdef->msleep) mdef->msleep = 0; + if (mdef->msleep) + mdef->msleep = 0; } hit = (tmp > rnd(20)); - if(hit) mdef->msleep = 0; - vis = (cansee(magr->mx,magr->my) && cansee(mdef->mx,mdef->my)); - if(vis){ - char buf[BUFSZ]; - if(mdef->mimic) seemimic(mdef); - if(magr->mimic) seemimic(magr); - (void) sprintf(buf,"%s %s", Monnam(magr), - hit ? "hits" : "misses"); + if (hit) + mdef->msleep = 0; + vis = (cansee(magr->mx, magr->my) && cansee(mdef->mx, mdef->my)); + if (vis) { + char buf[BUFSZ]; + if (mdef->mimic) + seemimic(mdef); + if (magr->mimic) + seemimic(magr); + (void) sprintf(buf, "%s %s", Monnam(magr), + hit ? "hits" : "misses"); pline("%s %s.", buf, monnam(mdef)); } else { - boolean far = (dist(magr->mx, magr->my) > 15); - if(far != far_noise || moves-noisetime > 10) { + boolean far = (dist(magr->mx, magr->my) > 15); + if (far != far_noise || moves - noisetime > 10) { far_noise = far; noisetime = moves; pline("You hear some noises%s.", - far ? " in the distance" : ""); + far ? " in the distance" : ""); } } - if(hit){ - if(magr->data->mlet == 'c' && !magr->cham) { + if (hit) { + if (magr->data->mlet == 'c' && !magr->cham) { magr->mhpmax += 3; - if(vis) pline("%s is turned to stone!", Monnam(mdef)); - else if(mdef->mtame) - pline("You have a peculiarly sad feeling for a moment, then it passes."); + if (vis) + pline("%s is turned to stone!", Monnam(mdef)); + else if (mdef->mtame) + pline("You have a peculiarly sad feeling for a moment, then it passes."); monstone(mdef); hit = 2; - } else - if((mdef->mhp -= d(pa->damn,pa->damd)) < 1) { - magr->mhpmax += 1 + rn2(pd->mlevel+1); - if(magr->mtame && magr->mhpmax > 8*pa->mlevel){ - if(pa == &li_dog) magr->data = pa = &dog; - else if(pa == &dog) magr->data = pa = &la_dog; + } else if ((mdef->mhp -= d(pa->damn, pa->damd)) < 1) { + magr->mhpmax += 1 + rn2(pd->mlevel + 1); + if (magr->mtame && magr->mhpmax > 8 * pa->mlevel) { + if (pa == &li_dog) + magr->data = pa = &dog; + else if (pa == &dog) + magr->data = pa = &la_dog; } - if(vis) pline("%s is killed!", Monnam(mdef)); - else if(mdef->mtame) - pline("You have a sad feeling for a moment, then it passes."); + if (vis) + pline("%s is killed!", Monnam(mdef)); + else if (mdef->mtame) + pline("You have a sad feeling for a moment, then it passes."); mondied(mdef); hit = 2; } } - return(hit); + return (hit); } /* drop (perhaps) a cadaver and remove monster */ -mondied(mdef) register struct monst *mdef; { -register struct permonst *pd = mdef->data; - if(letter(pd->mlet) && rn2(3)){ - (void) mkobj_at(pd->mlet,mdef->mx,mdef->my); - if(cansee(mdef->mx,mdef->my)){ - unpmon(mdef); - atl(mdef->mx,mdef->my,fobj->olet); - } - stackobj(fobj); +void +mondied(mdef) + struct monst *mdef; +{ + struct permonst *pd = mdef->data; + if (letter(pd->mlet) && rn2(3)) { + (void) mkobj_at(pd->mlet, mdef->mx, mdef->my); + if (cansee(mdef->mx, mdef->my)) { + unpmon(mdef); + atl(mdef->mx, mdef->my, fobj->olet); } - mondead(mdef); + stackobj(fobj); + } + mondead(mdef); } /* drop a rock and remove monster */ -monstone(mdef) register struct monst *mdef; { - extern char mlarge[]; - if(index(mlarge, mdef->data->mlet)) +void +monstone(mdef) + struct monst *mdef; +{ + if (strchr(mlarge, mdef->data->mlet)) mksobj_at(ENORMOUS_ROCK, mdef->mx, mdef->my); else mksobj_at(ROCK, mdef->mx, mdef->my); - if(cansee(mdef->mx, mdef->my)){ + if (cansee(mdef->mx, mdef->my)) { unpmon(mdef); - atl(mdef->mx,mdef->my,fobj->olet); + atl(mdef->mx, mdef->my, fobj->olet); } mondead(mdef); } - -fightm(mtmp) register struct monst *mtmp; { -register struct monst *mon; - for(mon = fmon; mon; mon = mon->nmon) if(mon != mtmp) { - if(DIST(mon->mx,mon->my,mtmp->mx,mtmp->my) < 3) - if(rn2(4)) - return(hitmm(mtmp,mon)); - } - return(-1); + +int +fightm(mtmp) + struct monst *mtmp; +{ + struct monst *mon; + for (mon = fmon; mon; mon = mon->nmon) + if (mon != mtmp) { + if (DIST(mon->mx, mon->my, mtmp->mx, mtmp->my) < 3) + if (rn2(4)) + return (hitmm(mtmp, mon)); + } + return (-1); } /* u is hit by sth, but not a monster */ -thitu(tlev,dam,name) -register tlev,dam; -register char *name; +int +thitu(tlev, dam, name) + int tlev, dam; + char *name; { -char buf[BUFSZ]; - setan(name,buf); - if(u.uac + tlev <= rnd(20)) { - if(Blind) pline("It misses."); - else pline("You are almost hit by %s!", buf); - return(0); + char buf[BUFSZ]; + setan(name, buf); + if (u.uac + tlev <= rnd(20)) { + if (Blind) + pline("It misses."); + else + pline("You are almost hit by %s!", buf); + return (0); } else { - if(Blind) pline("You are hit!"); - else pline("You are hit by %s!", buf); - losehp(dam,name); - return(1); + if (Blind) + pline("You are hit!"); + else + pline("You are hit by %s!", buf); + losehp(dam, name); + return (1); } } -char mlarge[] = "bCDdegIlmnoPSsTUwY',&"; +char mlarge[] = "bCDdegIlmnoPSsTUwY',&"; boolean -hmon(mon,obj,thrown) /* return TRUE if mon still alive */ -register struct monst *mon; -register struct obj *obj; -register thrown; +hmon(mon, obj, thrown) /* return TRUE if mon still alive */ + struct monst *mon; + struct obj *obj; + int thrown; { - register tmp; - boolean hittxt = FALSE; + int tmp; + boolean hittxt = FALSE; - if(!obj){ + if (!obj) { tmp = rnd(2); /* attack with bare hands */ - if(mon->data->mlet == 'c' && !uarmg){ + if (mon->data->mlet == 'c' && !uarmg) { pline("You hit the cockatrice with your bare hands."); pline("You turn to stone ..."); done_in_by(mon); } - } else if(obj->olet == WEAPON_SYM || obj->otyp == PICK_AXE) { - if(obj == uwep && (obj->otyp > SPEAR || obj->otyp < BOOMERANG)) - tmp = rnd(2); - else { - if(index(mlarge, mon->data->mlet)) { - tmp = rnd(objects[obj->otyp].wldam); - if(obj->otyp == TWO_HANDED_SWORD) tmp += d(2,6); - else if(obj->otyp == FLAIL) tmp += rnd(4); - } else { - tmp = rnd(objects[obj->otyp].wsdam); - } - tmp += obj->spe; - if(!thrown && obj == uwep && obj->otyp == BOOMERANG - && !rn2(3)){ - pline("As you hit %s, the boomerang breaks into splinters.", - monnam(mon)); - freeinv(obj); - setworn((struct obj *) 0, obj->owornmask); - obfree(obj, (struct obj *) 0); - tmp++; + } else if (obj->olet == WEAPON_SYM || obj->otyp == PICK_AXE) { + if (obj == uwep && (obj->otyp > SPEAR || obj->otyp < BOOMERANG)) + tmp = rnd(2); + else { + if (strchr(mlarge, mon->data->mlet)) { + tmp = rnd(objects[obj->otyp].wldam); + if (obj->otyp == TWO_HANDED_SWORD) + tmp += d(2, 6); + else if (obj->otyp == FLAIL) + tmp += rnd(4); + } else { + tmp = rnd(objects[obj->otyp].wsdam); + } + tmp += obj->spe; + if (!thrown && obj == uwep && obj->otyp == BOOMERANG + && !rn2(3)) { + pline("As you hit %s, the boomerang breaks into splinters.", + monnam(mon)); + freeinv(obj); + setworn((struct obj *) 0, obj->owornmask); + obfree(obj, (struct obj *) 0); + tmp++; + } } - } - if(mon->data->mlet == 'O' && obj->otyp == TWO_HANDED_SWORD && - !strcmp(ONAME(obj), "Orcrist")) - tmp += rnd(10); - } else switch(obj->otyp) { + if (mon->data->mlet == 'O' && obj->otyp == TWO_HANDED_SWORD && + !strcmp(ONAME(obj), "Orcrist")) + tmp += rnd(10); + } else + switch (obj->otyp) { case HEAVY_IRON_BALL: - tmp = rnd(25); break; + tmp = rnd(25); + break; case EXPENSIVE_CAMERA: - pline("You succeed in destroying your camera. Congratulations!"); + pline("You succeed in destroying your camera. Congratulations!"); freeinv(obj); - if(obj->owornmask) + if (obj->owornmask) setworn((struct obj *) 0, obj->owornmask); obfree(obj, (struct obj *) 0); - return(TRUE); + return (TRUE); case DEAD_COCKATRICE: pline("You hit %s with the cockatrice corpse.", - monnam(mon)); - if(mon->data->mlet == 'c') { + monnam(mon)); + if (mon->data->mlet == 'c') { tmp = 1; hittxt = TRUE; break; } pline("%s is turned to stone!", Monnam(mon)); killed(mon); - return(FALSE); - case CLOVE_OF_GARLIC: /* no effect against demons */ - if(index(UNDEAD, mon->data->mlet)) + return (FALSE); + case CLOVE_OF_GARLIC: /* no effect against demons */ + if (strchr(UNDEAD, mon->data->mlet)) mon->mflee = 1; tmp = 1; break; default: /* non-weapons can damage because of their weight */ /* (but not too much) */ - tmp = obj->owt/10; - if(tmp < 1) tmp = 1; - else tmp = rnd(tmp); - if(tmp > 6) tmp = 6; + tmp = obj->owt / 10; + if (tmp < 1) + tmp = 1; + else + tmp = rnd(tmp); + if (tmp > 6) + tmp = 6; } /****** NOTE: perhaps obj is undefined!! (if !thrown && BOOMERANG) */ tmp += u.udaminc + dbon(); - if(u.uswallow) { - if((tmp -= u.uswldtim) <= 0) { + if (u.uswallow) { + if ((tmp -= u.uswldtim) <= 0) { pline("Your arms are no longer able to hit."); - return(TRUE); + return (TRUE); } } - if(tmp < 1) tmp = 1; + if (tmp < 1) + tmp = 1; mon->mhp -= tmp; - if(mon->mhp < 1) { + if (mon->mhp < 1) { killed(mon); - return(FALSE); + return (FALSE); } - if(mon->mtame && (!mon->mflee || mon->mfleetim)) { - mon->mflee = 1; /* Rick Richardson */ - mon->mfleetim += 10*rnd(tmp); + if (mon->mtame && (!mon->mflee || mon->mfleetim)) { + mon->mflee = 1; /* Rick Richardson */ + mon->mfleetim += 10 * rnd(tmp); } - - if(!hittxt) { - if(thrown) + if (!hittxt) { + if (thrown) /* this assumes that we cannot throw plural things */ - hit( xname(obj) /* or: objects[obj->otyp].oc_name */, - mon, exclam(tmp) ); - else if(Blind) + hit(xname(obj) /* or: objects[obj->otyp].oc_name */ , + mon, exclam(tmp)); + else if (Blind) pline("You hit it."); else pline("You hit %s%s", monnam(mon), exclam(tmp)); } - - if(u.umconf && !thrown) { - if(!Blind) { + if (u.umconf && !thrown) { + if (!Blind) { pline("Your hands stop glowing blue."); - if(!mon->mfroz && !mon->msleep) - pline("%s appears confused.",Monnam(mon)); + if (!mon->mfroz && !mon->msleep) + pline("%s appears confused.", Monnam(mon)); } mon->mconf = 1; u.umconf = 0; } - return(TRUE); /* mon still alive */ + return (TRUE); /* mon still alive */ } /* try to attack; return FALSE if monster evaded */ /* u.dx and u.dy must be set */ +int attack(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - schar tmp; - boolean malive = TRUE; - register struct permonst *mdat; + schar tmp; + boolean malive = TRUE; + struct permonst *mdat; mdat = mtmp->data; - u_wipe_engr(3); /* andrew@orca: prevent unlimited pick-axe attacks */ + u_wipe_engr(3); /* andrew@orca: prevent unlimited pick-axe + * attacks */ - if(mdat->mlet == 'L' && !mtmp->mfroz && !mtmp->msleep && - !mtmp->mconf && mtmp->mcansee && !rn2(7) && - (m_move(mtmp, 0) == 2 /* he died */ || /* he moved: */ - mtmp->mx != u.ux+u.dx || mtmp->my != u.uy+u.dy)) - return(FALSE); + if (mdat->mlet == 'L' && !mtmp->mfroz && !mtmp->msleep && + !mtmp->mconf && mtmp->mcansee && !rn2(7) && + (m_move(mtmp, 0) == 2 /* he died */ || /* he moved: */ + mtmp->mx != u.ux + u.dx || mtmp->my != u.uy + u.dy)) + return (FALSE); - if(mtmp->mimic){ - if(!u.ustuck && !mtmp->mflee) u.ustuck = mtmp; - switch(levl[u.ux+u.dx][u.uy+u.dy].scrsym){ + if (mtmp->mimic) { + if (!u.ustuck && !mtmp->mflee) + u.ustuck = mtmp; + switch (levl[u.ux + u.dx][u.uy + u.dy].scrsym) { case '+': pline("The door actually was a Mimic."); break; @@ -281,83 +317,95 @@ register struct monst *mtmp; pline("Wait! That's a Mimic!"); } wakeup(mtmp); /* clears mtmp->mimic */ - return(TRUE); + return (TRUE); } - wakeup(mtmp); - if(mtmp->mhide && mtmp->mundetected){ - register struct obj *obj; + if (mtmp->mhide && mtmp->mundetected) { + struct obj *obj; mtmp->mundetected = 0; - if((obj = o_at(mtmp->mx,mtmp->my)) && !Blind) + if ((obj = o_at(mtmp->mx, mtmp->my)) && !Blind) pline("Wait! There's a %s hiding under %s!", - mdat->mname, doname(obj)); - return(TRUE); + mdat->mname, doname(obj)); + return (TRUE); } - tmp = u.uluck + u.ulevel + mdat->ac + abon(); - if(uwep) { - if(uwep->olet == WEAPON_SYM || uwep->otyp == PICK_AXE) + if (uwep) { + if (uwep->olet == WEAPON_SYM || uwep->otyp == PICK_AXE) tmp += uwep->spe; - if(uwep->otyp == TWO_HANDED_SWORD) tmp -= 1; - else if(uwep->otyp == DAGGER) tmp += 2; - else if(uwep->otyp == CRYSKNIFE) tmp += 3; - else if(uwep->otyp == SPEAR && - index("XDne", mdat->mlet)) tmp += 2; + if (uwep->otyp == TWO_HANDED_SWORD) + tmp -= 1; + else if (uwep->otyp == DAGGER) + tmp += 2; + else if (uwep->otyp == CRYSKNIFE) + tmp += 3; + else if (uwep->otyp == SPEAR && + strchr("XDne", mdat->mlet)) + tmp += 2; } - if(mtmp->msleep) { + if (mtmp->msleep) { mtmp->msleep = 0; tmp += 2; } - if(mtmp->mfroz) { + if (mtmp->mfroz) { tmp += 4; - if(!rn2(10)) mtmp->mfroz = 0; + if (!rn2(10)) + mtmp->mfroz = 0; } - if(mtmp->mflee) tmp += 2; - if(u.utrap) tmp -= 3; + if (mtmp->mflee) + tmp += 2; + if (u.utrap) + tmp -= 3; /* with a lot of luggage, your agility diminishes */ - tmp -= (inv_weight() + 40)/20; + tmp -= (inv_weight() + 40) / 20; - if(tmp <= rnd(20) && !u.uswallow){ - if(Blind) pline("You miss it."); - else pline("You miss %s.",monnam(mtmp)); + if (tmp <= rnd(20) && !u.uswallow) { + if (Blind) + pline("You miss it."); + else + pline("You miss %s.", monnam(mtmp)); } else { /* we hit the monster; be careful: it might die! */ - if((malive = hmon(mtmp,uwep,0)) == TRUE) { - /* monster still alive */ - if(!rn2(25) && mtmp->mhp < mtmp->mhpmax/2) { + if ((malive = hmon(mtmp, uwep, 0)) == TRUE) { + /* monster still alive */ + if (!rn2(25) && mtmp->mhp < mtmp->mhpmax / 2) { mtmp->mflee = 1; - if(!rn2(3)) mtmp->mfleetim = rnd(100); - if(u.ustuck == mtmp && !u.uswallow) + if (!rn2(3)) + mtmp->mfleetim = rnd(100); + if (u.ustuck == mtmp && !u.uswallow) u.ustuck = 0; } #ifndef NOWORM - if(mtmp->wormno) - cutworm(mtmp, u.ux+u.dx, u.uy+u.dy, + if (mtmp->wormno) + cutworm(mtmp, u.ux + u.dx, u.uy + u.dy, uwep ? uwep->otyp : 0); -#endif NOWORM +#endif /* NOWORM */ } - if(mdat->mlet == 'a') { - if(rn2(2)) { + if (mdat->mlet == 'a') { + if (rn2(2)) { pline("You are splashed by the blob's acid!"); losehp_m(rnd(6), mtmp); - if(!rn2(30)) corrode_armor(); + if (!rn2(30)) + corrode_armor(); } - if(!rn2(6)) corrode_weapon(); + if (!rn2(6)) + corrode_weapon(); } } - if(malive && mdat->mlet == 'E' && canseemon(mtmp) - && !mtmp->mcan && rn2(3)) { - if(mtmp->mcansee) { - pline("You are frozen by the floating eye's gaze!"); - nomul((u.ulevel > 6 || rn2(4)) ? rn1(20,-21) : -200); - } else { - pline("The blinded floating eye cannot defend itself."); - if(!rn2(500)) if((int)u.uluck > LUCKMIN) u.uluck--; - } + if (malive && mdat->mlet == 'E' && canseemon(mtmp) + && !mtmp->mcan && rn2(3)) { + if (mtmp->mcansee) { + pline("You are frozen by the floating eye's gaze!"); + nomul((u.ulevel > 6 || rn2(4)) ? rn1(20, -21) : -200); + } else { + pline("The blinded floating eye cannot defend itself."); + if (!rn2(500)) + if ((int) u.uluck > LUCKMIN) + u.uluck--; + } } - return(TRUE); + return (TRUE); } diff --git a/hack/hack.h b/hack/hack.h index f097252f..eb0f785d 100644 --- a/hack/hack.h +++ b/hack/hack.h @@ -1,8 +1,10 @@ +/* $NetBSD: hack.h,v 1.4 1997/10/19 16:58:02 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: hack.h,v 1.3 1995/03/23 08:30:21 cgd Exp $ */ +#ifndef _HACK_H_ +#define _HACK_H_ #include "config.h" #include <string.h> @@ -10,7 +12,7 @@ #ifndef BSD #define index strchr #define rindex strrchr -#endif BSD +#endif /* BSD */ #define Null(type) ((struct type *) 0) @@ -34,23 +36,12 @@ typedef struct { #include "def.rm.h" #include "def.permonst.h" -extern long *alloc(); - -extern xchar xdnstair, ydnstair, xupstair, yupstair; /* stairs up and down. */ - -extern xchar dlevel; #define newstring(x) (char *) alloc((unsigned)(x)) #include "hack.onames.h" #define ON 1 #define OFF 0 -extern struct obj *invent, *uwep, *uarm, *uarm2, *uarmh, *uarms, *uarmg, - *uleft, *uright, *fcobj; -extern struct obj *uchain; /* defined iff PUNISHED */ -extern struct obj *uball; /* defined if PUNISHED */ -struct obj *o_at(), *getobj(), *sobj_at(); - struct prop { #define TIMEOUT 007777 /* mask */ #define LEFT_RING W_RINGL /* 010000L */ @@ -60,7 +51,7 @@ struct prop { #define RIGHT_SIDE RIGHT_RING #define BOTH_SIDES (LEFT_SIDE | RIGHT_SIDE) long p_flgs; - int (*p_tofn)(); /* called after timeout */ + void (*p_tofn) __P((void)); /* called after timeout */ }; struct you { @@ -130,34 +121,72 @@ struct you { int nr_killed[CMNUM+2]; /* used for experience bookkeeping */ }; -extern struct you u; - -extern char *traps[]; -extern char *monnam(), *Monnam(), *amonnam(), *Amonnam(), - *doname(), *aobjnam(); -extern char readchar(); -extern char vowels[]; - -extern xchar curx,cury; /* cursor location on screen */ - -extern coord bhitpos; /* place where thrown weapon falls to the ground */ - -extern xchar seehx,seelx,seehy,seely; /* where to see*/ -extern char *save_cm,*killer; - -extern xchar dlevel, maxdlevel; /* dungeon level */ - -extern long moves; - -extern int multi; - - -extern char lock[]; - - #define DIST(x1,y1,x2,y2) (((x1)-(x2))*((x1)-(x2)) + ((y1)-(y2))*((y1)-(y2))) #define PL_CSIZ 20 /* sizeof pl_character */ #define MAX_CARR_CAP 120 /* so that boulders can be heavier */ #define MAXLEVEL 40 #define FAR (COLNO+2) /* position outside screen */ + +extern boolean in_mklev; +extern boolean level_exists[]; +extern boolean restoring; +extern char *CD; +extern char *catmore; +extern char *hname; +extern char *hu_stat[]; /* in eat.c */ +extern char *nomovemsg; +extern char *occtxt; +extern char *save_cm,*killer; +extern char *traps[]; +extern char SAVEF[]; +extern char fut_geno[60]; /* idem */ +extern char genocided[60]; /* defined in Decl.c */ +extern char lock[]; +extern char mlarge[]; +extern char morc; +extern char nul[]; +extern char pl_character[]; +extern char plname[PL_NSIZ], pl_character[PL_CSIZ]; +extern char quitchars[]; +extern char sdir[]; /* defined in hack.c */ +extern char shtypes[]; /* = "=/)%?!["; 8 types: 7 specialized, 1 mixed */ +extern char vowels[]; +extern coord bhitpos; /* place where thrown weapon falls to the ground */ +extern int (*afternmv) __P((void)); +extern int (*occupation) __P((void)); +extern int CO, LI; /* usually COLNO and ROWNO+2 */ +extern int bases[]; +extern int doorindex; +extern int hackpid; +extern int multi; +extern int nroom; +extern long moves; +extern long wailmsg; +extern schar xdir[], ydir[]; /* idem */ +extern struct gold *fgold; +extern struct monst *mydogs; +extern struct monst youmonst; +extern struct obj *billobjs; +extern struct obj *invent, *uwep, *uarm, *uarm2, *uarmh, *uarms, *uarmg; +extern struct obj *uleft, *uright, *fcobj; +extern struct obj *uball; /* defined if PUNISHED */ +extern struct obj *uchain; /* defined iff PUNISHED */ +extern struct obj zeroobj; +extern struct permonst li_dog, dog, la_dog; +extern struct permonst mons[CMNUM + 2]; +extern struct permonst pm_eel; +extern struct permonst pm_ghost; +extern struct permonst pm_mail_daemon; +extern struct permonst pm_wizard; +#ifndef NOWORM +extern long wgrowtime[32]; +extern struct wseg *m_atseg; +extern struct wseg *wsegs[32], *wheads[32]; +#endif +extern struct you u; +extern xchar curx, cury; /* cursor location on screen */ +extern xchar dlevel, maxdlevel; /* dungeon level */ +extern xchar seehx,seelx,seehy,seely; /* where to see*/ +extern xchar xdnstair, ydnstair, xupstair, yupstair; /* stairs up and down. */ +#endif /* _HACK_H_ */ diff --git a/hack/hack.invent.c b/hack/hack.invent.c index 3cc42763..2c8b94cf 100644 --- a/hack/hack.invent.c +++ b/hack/hack.invent.c @@ -1,106 +1,117 @@ +/* $NetBSD: hack.invent.c,v 1.5 1997/10/19 16:58:05 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.invent.c,v 1.4 1995/03/23 08:30:25 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.invent.c,v 1.5 1997/10/19 16:58:05 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -#include <stdio.h> -extern struct obj *splitobj(); -extern struct obj zeroobj; -extern char morc; -extern char quitchars[]; -static char *xprname(); +#include <stdlib.h> +#include "hack.h" +#include "extern.h" #ifndef NOWORM #include "def.wseg.h" -extern struct wseg *wsegs[32]; -#endif NOWORM +#endif /* NOWORM */ #define NOINVSYM '#' -static int lastinvnr = 51; /* 0 ... 51 */ -static +static int lastinvnr = 51; /* 0 ... 51 */ + +static void assigninvlet __P((struct obj *)); +static char *xprname __P((struct obj *, char)); + +static void assigninvlet(otmp) -register struct obj *otmp; + struct obj *otmp; { - boolean inuse[52]; - register int i; - register struct obj *obj; - - for(i = 0; i < 52; i++) inuse[i] = FALSE; - for(obj = invent; obj; obj = obj->nobj) if(obj != otmp) { - i = obj->invlet; - if('a' <= i && i <= 'z') inuse[i - 'a'] = TRUE; else - if('A' <= i && i <= 'Z') inuse[i - 'A' + 26] = TRUE; - if(i == otmp->invlet) otmp->invlet = 0; - } - if((i = otmp->invlet) && + boolean inuse[52]; + int i; + struct obj *obj; + + for (i = 0; i < 52; i++) + inuse[i] = FALSE; + for (obj = invent; obj; obj = obj->nobj) + if (obj != otmp) { + i = obj->invlet; + if ('a' <= i && i <= 'z') + inuse[i - 'a'] = TRUE; + else if ('A' <= i && i <= 'Z') + inuse[i - 'A' + 26] = TRUE; + if (i == otmp->invlet) + otmp->invlet = 0; + } + if ((i = otmp->invlet) && (('a' <= i && i <= 'z') || ('A' <= i && i <= 'Z'))) return; - for(i = lastinvnr+1; i != lastinvnr; i++) { - if(i == 52) { i = -1; continue; } - if(!inuse[i]) break; + for (i = lastinvnr + 1; i != lastinvnr; i++) { + if (i == 52) { + i = -1; + continue; + } + if (!inuse[i]) + break; } otmp->invlet = (inuse[i] ? NOINVSYM : - (i < 26) ? ('a'+i) : ('A'+i-26)); + (i < 26) ? ('a' + i) : ('A' + i - 26)); lastinvnr = i; } -struct obj * +struct obj * addinv(obj) -register struct obj *obj; + struct obj *obj; { - register struct obj *otmp; + struct obj *otmp; /* merge or attach to end of chain */ - if(!invent) { + if (!invent) { invent = obj; otmp = 0; } else - for(otmp = invent; /* otmp */; otmp = otmp->nobj) { - if(merged(otmp, obj, 0)) - return(otmp); - if(!otmp->nobj) { - otmp->nobj = obj; - break; + for (otmp = invent; /* otmp */ ; otmp = otmp->nobj) { + if (merged(otmp, obj, 0)) + return (otmp); + if (!otmp->nobj) { + otmp->nobj = obj; + break; + } } - } obj->nobj = 0; - if(flags.invlet_constant) { + if (flags.invlet_constant) { assigninvlet(obj); /* * The ordering of the chain is nowhere significant * so in case you prefer some other order than the * historical one, change the code below. */ - if(otmp) { /* find proper place in chain */ + if (otmp) { /* find proper place in chain */ otmp->nobj = 0; - if((invent->invlet ^ 040) > (obj->invlet ^ 040)) { + if ((invent->invlet ^ 040) > (obj->invlet ^ 040)) { obj->nobj = invent; invent = obj; } else - for(otmp = invent; ; otmp = otmp->nobj) { - if(!otmp->nobj || - (otmp->nobj->invlet ^ 040) > (obj->invlet ^ 040)){ - obj->nobj = otmp->nobj; - otmp->nobj = obj; - break; - } - } + for (otmp = invent;; otmp = otmp->nobj) { + if (!otmp->nobj || + (otmp->nobj->invlet ^ 040) > (obj->invlet ^ 040)) { + obj->nobj = otmp->nobj; + otmp->nobj = obj; + break; + } + } } } - - return(obj); + return (obj); } +void useup(obj) -register struct obj *obj; + struct obj *obj; { - if(obj->quan > 1){ + if (obj->quan > 1) { obj->quan--; obj->owt = weight(obj); } else { @@ -110,174 +121,202 @@ register struct obj *obj; } } +void freeinv(obj) -register struct obj *obj; + struct obj *obj; { - register struct obj *otmp; + struct obj *otmp; - if(obj == invent) + if (obj == invent) invent = invent->nobj; else { - for(otmp = invent; otmp->nobj != obj; otmp = otmp->nobj) - if(!otmp->nobj) panic("freeinv"); + for (otmp = invent; otmp->nobj != obj; otmp = otmp->nobj) + if (!otmp->nobj) + panic("freeinv"); otmp->nobj = obj->nobj; } } /* destroy object in fobj chain (if unpaid, it remains on the bill) */ -delobj(obj) register struct obj *obj; { +void +delobj(obj) + struct obj *obj; +{ freeobj(obj); unpobj(obj); obfree(obj, (struct obj *) 0); } /* unlink obj from chain starting with fobj */ -freeobj(obj) register struct obj *obj; { - register struct obj *otmp; +void +freeobj(obj) + struct obj *obj; +{ + struct obj *otmp; - if(obj == fobj) fobj = fobj->nobj; + if (obj == fobj) + fobj = fobj->nobj; else { - for(otmp = fobj; otmp->nobj != obj; otmp = otmp->nobj) - if(!otmp) panic("error in freeobj"); + for (otmp = fobj; otmp->nobj != obj; otmp = otmp->nobj) + if (!otmp) + panic("error in freeobj"); otmp->nobj = obj->nobj; } } /* Note: freegold throws away its argument! */ -freegold(gold) register struct gold *gold; { - register struct gold *gtmp; +void +freegold(gold) + struct gold *gold; +{ + struct gold *gtmp; - if(gold == fgold) fgold = gold->ngold; + if (gold == fgold) + fgold = gold->ngold; else { - for(gtmp = fgold; gtmp->ngold != gold; gtmp = gtmp->ngold) - if(!gtmp) panic("error in freegold"); + for (gtmp = fgold; gtmp->ngold != gold; gtmp = gtmp->ngold) + if (!gtmp) + panic("error in freegold"); gtmp->ngold = gold->ngold; } free((char *) gold); } +void deltrap(trap) -register struct trap *trap; + struct trap *trap; { - register struct trap *ttmp; + struct trap *ttmp; - if(trap == ftrap) + if (trap == ftrap) ftrap = ftrap->ntrap; else { - for(ttmp = ftrap; ttmp->ntrap != trap; ttmp = ttmp->ntrap) ; + for (ttmp = ftrap; ttmp->ntrap != trap; ttmp = ttmp->ntrap); ttmp->ntrap = trap->ntrap; } free((char *) trap); } -struct wseg *m_atseg; +struct wseg *m_atseg; -struct monst * -m_at(x,y) -register x,y; +struct monst * +m_at(x, y) + int x, y; { - register struct monst *mtmp; + struct monst *mtmp; #ifndef NOWORM - register struct wseg *wtmp; -#endif NOWORM + struct wseg *wtmp; +#endif /* NOWORM */ m_atseg = 0; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon){ - if(mtmp->mx == x && mtmp->my == y) - return(mtmp); + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + if (mtmp->mx == x && mtmp->my == y) + return (mtmp); #ifndef NOWORM - if(mtmp->wormno){ - for(wtmp = wsegs[mtmp->wormno]; wtmp; wtmp = wtmp->nseg) - if(wtmp->wx == x && wtmp->wy == y){ - m_atseg = wtmp; - return(mtmp); - } + if (mtmp->wormno) { + for (wtmp = wsegs[mtmp->wormno]; wtmp; wtmp = wtmp->nseg) + if (wtmp->wx == x && wtmp->wy == y) { + m_atseg = wtmp; + return (mtmp); + } } -#endif NOWORM +#endif /* NOWORM */ } - return(0); + return (0); } -struct obj * -o_at(x,y) -register x,y; +struct obj * +o_at(x, y) + int x, y; { - register struct obj *otmp; + struct obj *otmp; - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(otmp->ox == x && otmp->oy == y) return(otmp); - return(0); + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp->ox == x && otmp->oy == y) + return (otmp); + return (0); } -struct obj * -sobj_at(n,x,y) -register n,x,y; +struct obj * +sobj_at(n, x, y) + int n, x, y; { - register struct obj *otmp; + struct obj *otmp; - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(otmp->ox == x && otmp->oy == y && otmp->otyp == n) - return(otmp); - return(0); + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp->ox == x && otmp->oy == y && otmp->otyp == n) + return (otmp); + return (0); } -carried(obj) register struct obj *obj; { -register struct obj *otmp; - for(otmp = invent; otmp; otmp = otmp->nobj) - if(otmp == obj) return(1); - return(0); +int +carried(obj) + struct obj *obj; +{ + struct obj *otmp; + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp == obj) + return (1); + return (0); } +int carrying(type) -register int type; + int type; { - register struct obj *otmp; + struct obj *otmp; - for(otmp = invent; otmp; otmp = otmp->nobj) - if(otmp->otyp == type) - return(TRUE); - return(FALSE); + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp->otyp == type) + return (TRUE); + return (FALSE); } -struct obj * -o_on(id, objchn) unsigned int id; register struct obj *objchn; { - while(objchn) { - if(objchn->o_id == id) return(objchn); +struct obj * +o_on(id, objchn) + unsigned int id; + struct obj *objchn; +{ + while (objchn) { + if (objchn->o_id == id) + return (objchn); objchn = objchn->nobj; } - return((struct obj *) 0); + return ((struct obj *) 0); } -struct trap * -t_at(x,y) -register x,y; +struct trap * +t_at(x, y) + int x, y; { - register struct trap *trap = ftrap; - while(trap) { - if(trap->tx == x && trap->ty == y) return(trap); + struct trap *trap = ftrap; + while (trap) { + if (trap->tx == x && trap->ty == y) + return (trap); trap = trap->ntrap; } - return(0); + return (0); } -struct gold * -g_at(x,y) -register x,y; +struct gold * +g_at(x, y) + int x, y; { - register struct gold *gold = fgold; - while(gold) { - if(gold->gx == x && gold->gy == y) return(gold); + struct gold *gold = fgold; + while (gold) { + if (gold->gx == x && gold->gy == y) + return (gold); gold = gold->ngold; } - return(0); + return (0); } /* make dummy object structure containing gold - for temporary use only */ -struct obj * +struct obj * mkgoldobj(q) -register long q; + long q; { - register struct obj *otmp; + struct obj *otmp; otmp = newobj(0); /* should set o_id etc. but otmp will be freed soon */ @@ -285,7 +324,7 @@ register long q; u.ugold -= q; OGOLD(otmp) = q; flags.botl = 1; - return(otmp); + return (otmp); } /* @@ -294,61 +333,72 @@ register long q; * (struct obj *) 0 error return: no object. * &zeroobj explicitly no object (as in w-). */ -struct obj * -getobj(let,word) -register char *let,*word; -{ - register struct obj *otmp; - register char ilet,ilet1,ilet2; - char buf[BUFSZ]; - char lets[BUFSZ]; - register int foo = 0, foo2; - register char *bp = buf; - xchar allowcnt = 0; /* 0, 1 or 2 */ - boolean allowgold = FALSE; - boolean allowall = FALSE; - boolean allownone = FALSE; - xchar foox = 0; - long cnt; - - if(*let == '0') let++, allowcnt = 1; - if(*let == '$') let++, allowgold = TRUE; - if(*let == '#') let++, allowall = TRUE; - if(*let == '-') let++, allownone = TRUE; - if(allownone) *bp++ = '-'; - if(allowgold) *bp++ = '$'; - if(bp > buf && bp[-1] == '-') *bp++ = ' '; +struct obj * +getobj(let, word) + char *let, *word; +{ + struct obj *otmp; + char ilet, ilet1, ilet2; + char buf[BUFSZ]; + char lets[BUFSZ]; + int foo = 0, foo2; + char *bp = buf; + xchar allowcnt = 0; /* 0, 1 or 2 */ + boolean allowgold = FALSE; + boolean allowall = FALSE; + boolean allownone = FALSE; + xchar foox = 0; + long cnt; + + if (*let == '0') + let++, allowcnt = 1; + if (*let == '$') + let++, allowgold = TRUE; + if (*let == '#') + let++, allowall = TRUE; + if (*let == '-') + let++, allownone = TRUE; + if (allownone) + *bp++ = '-'; + if (allowgold) + *bp++ = '$'; + if (bp > buf && bp[-1] == '-') + *bp++ = ' '; ilet = 'a'; - for(otmp = invent; otmp; otmp = otmp->nobj){ - if(!*let || index(let, otmp->olet)) { - bp[foo++] = flags.invlet_constant ? otmp->invlet : ilet; - - /* ugly check: remove inappropriate things */ - if((!strcmp(word, "take off") && - !(otmp->owornmask & (W_ARMOR - W_ARM2))) - || (!strcmp(word, "wear") && - (otmp->owornmask & (W_ARMOR | W_RING))) - || (!strcmp(word, "wield") && - (otmp->owornmask & W_WEP))) { - foo--; - foox++; + for (otmp = invent; otmp; otmp = otmp->nobj) { + if (!*let || strchr(let, otmp->olet)) { + bp[foo++] = flags.invlet_constant ? otmp->invlet : ilet; + + /* ugly check: remove inappropriate things */ + if ((!strcmp(word, "take off") && + !(otmp->owornmask & (W_ARMOR - W_ARM2))) + || (!strcmp(word, "wear") && + (otmp->owornmask & (W_ARMOR | W_RING))) + || (!strcmp(word, "wield") && + (otmp->owornmask & W_WEP))) { + foo--; + foox++; + } } - } - if(ilet == 'z') ilet = 'A'; else ilet++; + if (ilet == 'z') + ilet = 'A'; + else + ilet++; } bp[foo] = 0; - if(foo == 0 && bp > buf && bp[-1] == ' ') *--bp = 0; - (void) strcpy(lets, bp); /* necessary since we destroy buf */ - if(foo > 5) { /* compactify string */ + if (foo == 0 && bp > buf && bp[-1] == ' ') + *--bp = 0; + (void) strcpy(lets, bp);/* necessary since we destroy buf */ + if (foo > 5) { /* compactify string */ foo = foo2 = 1; ilet2 = bp[0]; ilet1 = bp[1]; - while(ilet = bp[++foo2] = bp[++foo]){ - if(ilet == ilet1+1){ - if(ilet1 == ilet2+1) + while ((ilet = bp[++foo2] = bp[++foo]) != '\0') { + if (ilet == ilet1 + 1) { + if (ilet1 == ilet2 + 1) bp[foo2 - 1] = ilet1 = '-'; - else if(ilet2 == '-') { + else if (ilet2 == '-') { bp[--foo2] = ++ilet1; continue; } @@ -357,162 +407,180 @@ register char *let,*word; ilet1 = ilet; } } - if(!foo && !allowall && !allowgold && !allownone) { + if (!foo && !allowall && !allowgold && !allownone) { pline("You don't have anything %sto %s.", - foox ? "else " : "", word); - return(0); + foox ? "else " : "", word); + return (0); } - for(;;) { - if(!buf[0]) + for (;;) { + if (!buf[0]) pline("What do you want to %s [*]? ", word); else pline("What do you want to %s [%s or ?*]? ", - word, buf); + word, buf); cnt = 0; ilet = readchar(); - while(digit(ilet) && allowcnt) { + while (digit(ilet) && allowcnt) { if (cnt < 100000000) - cnt = 10*cnt + (ilet - '0'); + cnt = 10 * cnt + (ilet - '0'); else - cnt = 999999999; + cnt = 999999999; allowcnt = 2; /* signal presence of cnt */ ilet = readchar(); } - if(digit(ilet)) { + if (digit(ilet)) { pline("No count allowed with this command."); continue; } - if(index(quitchars,ilet)) - return((struct obj *)0); - if(ilet == '-') { - return(allownone ? &zeroobj : (struct obj *) 0); + if (strchr(quitchars, ilet)) + return ((struct obj *) 0); + if (ilet == '-') { + return (allownone ? &zeroobj : (struct obj *) 0); } - if(ilet == '$') { - if(!allowgold){ + if (ilet == '$') { + if (!allowgold) { pline("You cannot %s gold.", word); continue; } - if(!(allowcnt == 2 && cnt < u.ugold)) + if (!(allowcnt == 2 && cnt < u.ugold)) cnt = u.ugold; - return(mkgoldobj(cnt)); + return (mkgoldobj(cnt)); } - if(ilet == '?') { + if (ilet == '?') { doinv(lets); - if(!(ilet = morc)) continue; + if (!(ilet = morc)) + continue; /* he typed a letter (not a space) to more() */ - } else if(ilet == '*') { + } else if (ilet == '*') { doinv((char *) 0); - if(!(ilet = morc)) continue; + if (!(ilet = morc)) + continue; /* ... */ } - if(flags.invlet_constant) { - for(otmp = invent; otmp; otmp = otmp->nobj) - if(otmp->invlet == ilet) break; + if (flags.invlet_constant) { + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp->invlet == ilet) + break; } else { - if(ilet >= 'A' && ilet <= 'Z') ilet += 'z'-'A'+1; + if (ilet >= 'A' && ilet <= 'Z') + ilet += 'z' - 'A' + 1; ilet -= 'a'; - for(otmp = invent; otmp && ilet; - ilet--, otmp = otmp->nobj) ; + for (otmp = invent; otmp && ilet; + ilet--, otmp = otmp->nobj); } - if(!otmp) { + if (!otmp) { pline("You don't have that object."); continue; } - if(cnt < 0 || otmp->quan < cnt) { + if (cnt < 0 || otmp->quan < cnt) { pline("You don't have that many! [You have %u]" - , otmp->quan); + ,otmp->quan); continue; } break; } - if(!allowall && let && !index(let,otmp->olet)) { - pline("That is a silly thing to %s.",word); - return(0); + if (!allowall && let && !strchr(let, otmp->olet)) { + pline("That is a silly thing to %s.", word); + return (0); } - if(allowcnt == 2) { /* cnt given */ - if(cnt == 0) return(0); - if(cnt != otmp->quan) { - register struct obj *obj; + if (allowcnt == 2) { /* cnt given */ + if (cnt == 0) + return (0); + if (cnt != otmp->quan) { + struct obj *obj; obj = splitobj(otmp, (int) cnt); - if(otmp == uwep) setuwep(obj); + if (otmp == uwep) + setuwep(obj); } } - return(otmp); + return (otmp); } -ckunpaid(otmp) register struct obj *otmp; { - return( otmp->unpaid ); +int +ckunpaid(otmp) + struct obj *otmp; +{ + return (otmp->unpaid); } /* interactive version of getobj - used for Drop and Identify */ /* return the number of times fn was called successfully */ +int ggetobj(word, fn, max) -char *word; -int (*fn)(), max; -{ -char buf[BUFSZ]; -register char *ip; -register char sym; -register int oletct = 0, iletct = 0; -register boolean allflag = FALSE; -char olets[20], ilets[20]; -int (*ckfn)() = (int (*)()) 0; -xchar allowgold = (u.ugold && !strcmp(word, "drop")) ? 1 : 0; /* BAH */ - if(!invent && !allowgold){ + char *word; + int (*fn) __P((struct obj *)); + int max; +{ + char buf[BUFSZ]; + char *ip; + char sym; + int oletct = 0, iletct = 0; + boolean allflag = FALSE; + char olets[20], ilets[20]; + int (*ckfn) __P((struct obj *)) = + (int (*) __P((struct obj *))) 0; + xchar allowgold = (u.ugold && !strcmp(word, "drop")) ? 1 : 0; /* BAH */ + if (!invent && !allowgold) { pline("You have nothing to %s.", word); - return(0); + return (0); } else { - register struct obj *otmp = invent; - register int uflg = 0; + struct obj *otmp = invent; + int uflg = 0; - if(allowgold) ilets[iletct++] = '$'; + if (allowgold) + ilets[iletct++] = '$'; ilets[iletct] = 0; - while(otmp) { - if(!index(ilets, otmp->olet)){ + while (otmp) { + if (!strchr(ilets, otmp->olet)) { ilets[iletct++] = otmp->olet; ilets[iletct] = 0; } - if(otmp->unpaid) uflg = 1; + if (otmp->unpaid) + uflg = 1; otmp = otmp->nobj; } ilets[iletct++] = ' '; - if(uflg) ilets[iletct++] = 'u'; - if(invent) ilets[iletct++] = 'a'; + if (uflg) + ilets[iletct++] = 'u'; + if (invent) + ilets[iletct++] = 'a'; ilets[iletct] = 0; } pline("What kinds of thing do you want to %s? [%s] ", - word, ilets); + word, ilets); getlin(buf); - if(buf[0] == '\033') { + if (buf[0] == '\033') { clrlin(); - return(0); + return (0); } ip = buf; olets[0] = 0; - while(sym = *ip++){ - if(sym == ' ') continue; - if(sym == '$') { - if(allowgold == 1) - (*fn)(mkgoldobj(u.ugold)); - else if(!u.ugold) + while ((sym = *ip++) != '\0') { + if (sym == ' ') + continue; + if (sym == '$') { + if (allowgold == 1) + (*fn) (mkgoldobj(u.ugold)); + else if (!u.ugold) pline("You have no gold."); allowgold = 2; - } else - if(sym == 'a' || sym == 'A') allflag = TRUE; else - if(sym == 'u' || sym == 'U') ckfn = ckunpaid; else - if(index("!%?[()=*/\"0", sym)){ - if(!index(olets, sym)){ + } else if (sym == 'a' || sym == 'A') + allflag = TRUE; + else if (sym == 'u' || sym == 'U') + ckfn = ckunpaid; + else if (strchr("!%?[()=*/\"0", sym)) { + if (!strchr(olets, sym)) { olets[oletct++] = sym; olets[oletct] = 0; } - } - else pline("You don't have any %c's.", sym); + } else + pline("You don't have any %c's.", sym); } - if(allowgold == 2 && !oletct) - return(1); /* he dropped gold (or at least tried to) */ + if (allowgold == 2 && !oletct) + return (1); /* he dropped gold (or at least tried to) */ else - return(askchain(invent, olets, allflag, fn, ckfn, max)); + return (askchain(invent, olets, allflag, fn, ckfn, max)); } /* @@ -522,35 +590,43 @@ xchar allowgold = (u.ugold && !strcmp(word, "drop")) ? 1 : 0; /* BAH */ * If allflag then no questions are asked. Max gives the max nr of * objects to be treated. Return the number of objects treated. */ +int askchain(objchn, olets, allflag, fn, ckfn, max) -struct obj *objchn; -register char *olets; -int allflag; -int (*fn)(), (*ckfn)(); -int max; -{ -register struct obj *otmp, *otmp2; -register char sym, ilet; -register int cnt = 0; - ilet = 'a'-1; - for(otmp = objchn; otmp; otmp = otmp2){ - if(ilet == 'z') ilet = 'A'; else ilet++; + struct obj *objchn; + char *olets; + int allflag; + int (*fn) __P((struct obj *)); + int (*ckfn) __P((struct obj *)); + int max; +{ + struct obj *otmp, *otmp2; + char sym, ilet; + int cnt = 0; + ilet = 'a' - 1; + for (otmp = objchn; otmp; otmp = otmp2) { + if (ilet == 'z') + ilet = 'A'; + else + ilet++; otmp2 = otmp->nobj; - if(olets && *olets && !index(olets, otmp->olet)) continue; - if(ckfn && !(*ckfn)(otmp)) continue; - if(!allflag) { + if (olets && *olets && !strchr(olets, otmp->olet)) + continue; + if (ckfn && !(*ckfn) (otmp)) + continue; + if (!allflag) { pline(xprname(otmp, ilet)); addtopl(" [nyaq]? "); sym = readchar(); - } - else sym = 'y'; + } else + sym = 'y'; - switch(sym){ + switch (sym) { case 'a': allflag = 1; case 'y': - cnt += (*fn)(otmp); - if(--max == 0) goto ret; + cnt += (*fn) (otmp); + if (--max == 0) + goto ret; case 'n': default: break; @@ -560,258 +636,281 @@ register int cnt = 0; } pline(cnt ? "That was all." : "No applicable objects."); ret: - return(cnt); + return (cnt); } -obj_to_let(obj) /* should of course only be called for things in invent */ -register struct obj *obj; +char +obj_to_let(obj) /* should of course only be called for things + * in invent */ + struct obj *obj; { - register struct obj *otmp; - register char ilet; + struct obj *otmp; + char ilet; - if(flags.invlet_constant) - return(obj->invlet); + if (flags.invlet_constant) + return (obj->invlet); ilet = 'a'; - for(otmp = invent; otmp && otmp != obj; otmp = otmp->nobj) - if(++ilet > 'z') ilet = 'A'; - return(otmp ? ilet : NOINVSYM); + for (otmp = invent; otmp && otmp != obj; otmp = otmp->nobj) + if (++ilet > 'z') + ilet = 'A'; + return (otmp ? ilet : NOINVSYM); } +void prinv(obj) -register struct obj *obj; + struct obj *obj; { pline(xprname(obj, obj_to_let(obj))); } -static char * -xprname(obj,let) -register struct obj *obj; -register char let; +static char * +xprname(obj, let) + struct obj *obj; + char let; { - static char li[BUFSZ]; + static char li[BUFSZ]; (void) sprintf(li, "%c - %s.", - flags.invlet_constant ? obj->invlet : let, - doname(obj)); - return(li); + flags.invlet_constant ? obj->invlet : let, + doname(obj)); + return (li); } +int ddoinv() { doinv((char *) 0); - return(0); + return (0); } /* called with 0 or "": all objects in inventory */ /* otherwise: all objects with (serial) letter in lets */ +void doinv(lets) -register char *lets; + char *lets; { - register struct obj *otmp; - register char ilet; - int ct = 0; - char any[BUFSZ]; + struct obj *otmp; + char ilet; + int ct = 0; + char any[BUFSZ]; morc = 0; /* just to be sure */ - if(!invent){ + if (!invent) { pline("Not carrying anything."); return; } - cornline(0, (char *) 0); ilet = 'a'; - for(otmp = invent; otmp; otmp = otmp->nobj) { - if(flags.invlet_constant) ilet = otmp->invlet; - if(!lets || !*lets || index(lets, ilet)) { - cornline(1, xprname(otmp, ilet)); - any[ct++] = ilet; - } - if(!flags.invlet_constant) if(++ilet > 'z') ilet = 'A'; + for (otmp = invent; otmp; otmp = otmp->nobj) { + if (flags.invlet_constant) + ilet = otmp->invlet; + if (!lets || !*lets || strchr(lets, ilet)) { + cornline(1, xprname(otmp, ilet)); + any[ct++] = ilet; + } + if (!flags.invlet_constant) + if (++ilet > 'z') + ilet = 'A'; } any[ct] = 0; cornline(2, any); } -dotypeinv () /* free after Robert Viduya */ -/* Changed to one type only, so he doesnt have to type cr */ -{ - char c, ilet; - char stuff[BUFSZ]; - register int stct; - register struct obj *otmp; - boolean billx = inshop() && doinvbill(0); - boolean unpd = FALSE; +int +dotypeinv() +{ /* free after Robert Viduya */ + /* Changed to one type only, so he doesnt have to type cr */ + char c, ilet; + char stuff[BUFSZ]; + int stct; + struct obj *otmp; + boolean billx = inshop() && doinvbill(0); + boolean unpd = FALSE; if (!invent && !u.ugold && !billx) { - pline ("You aren't carrying anything."); - return(0); + pline("You aren't carrying anything."); + return (0); } - stct = 0; - if(u.ugold) stuff[stct++] = '$'; + if (u.ugold) + stuff[stct++] = '$'; stuff[stct] = 0; - for(otmp = invent; otmp; otmp = otmp->nobj) { - if (!index (stuff, otmp->olet)) { - stuff[stct++] = otmp->olet; - stuff[stct] = 0; - } - if(otmp->unpaid) - unpd = TRUE; - } - if(unpd) stuff[stct++] = 'u'; - if(billx) stuff[stct++] = 'x'; + for (otmp = invent; otmp; otmp = otmp->nobj) { + if (!strchr(stuff, otmp->olet)) { + stuff[stct++] = otmp->olet; + stuff[stct] = 0; + } + if (otmp->unpaid) + unpd = TRUE; + } + if (unpd) + stuff[stct++] = 'u'; + if (billx) + stuff[stct++] = 'x'; stuff[stct] = 0; - if(stct > 1) { - pline ("What type of object [%s] do you want an inventory of? ", - stuff); - c = readchar(); - if(index(quitchars,c)) return(0); + if (stct > 1) { + pline("What type of object [%s] do you want an inventory of? ", + stuff); + c = readchar(); + if (strchr(quitchars, c)) + return (0); } else - c = stuff[0]; + c = stuff[0]; - if(c == '$') - return(doprgold()); + if (c == '$') + return (doprgold()); - if(c == 'x' || c == 'X') { - if(billx) - (void) doinvbill(1); - else - pline("No used-up objects on the shopping bill."); - return(0); + if (c == 'x' || c == 'X') { + if (billx) + (void) doinvbill(1); + else + pline("No used-up objects on the shopping bill."); + return (0); } - - if((c == 'u' || c == 'U') && !unpd) { + if ((c == 'u' || c == 'U') && !unpd) { pline("You are not carrying any unpaid objects."); - return(0); + return (0); } - stct = 0; ilet = 'a'; - for (otmp = invent; otmp; otmp = otmp -> nobj) { - if(flags.invlet_constant) ilet = otmp->invlet; - if (c == otmp -> olet || (c == 'u' && otmp -> unpaid)) - stuff[stct++] = ilet; - if(!flags.invlet_constant) if(++ilet > 'z') ilet = 'A'; + for (otmp = invent; otmp; otmp = otmp->nobj) { + if (flags.invlet_constant) + ilet = otmp->invlet; + if (c == otmp->olet || (c == 'u' && otmp->unpaid)) + stuff[stct++] = ilet; + if (!flags.invlet_constant) + if (++ilet > 'z') + ilet = 'A'; } stuff[stct] = '\0'; - if(stct == 0) + if (stct == 0) pline("You have no such objects."); else - doinv (stuff); + doinv(stuff); - return(0); + return (0); } /* look at what is here */ -dolook() { - register struct obj *otmp, *otmp0; - register struct gold *gold; - char *verb = Blind ? "feel" : "see"; - int ct = 0; - - if(!u.uswallow) { - if(Blind) { - pline("You try to feel what is lying here on the floor."); - if(Levitation) { /* ab@unido */ - pline("You cannot reach the floor!"); - return(1); - } - } - otmp0 = o_at(u.ux, u.uy); - gold = g_at(u.ux, u.uy); - } - - if(u.uswallow || (!otmp0 && !gold)) { - pline("You %s no objects here.", verb); - return(!!Blind); - } - - cornline(0, "Things that are here:"); - for(otmp = otmp0; otmp; otmp = otmp->nobj) { - if(otmp->ox == u.ux && otmp->oy == u.uy) { - ct++; - cornline(1, doname(otmp)); - if(Blind && otmp->otyp == DEAD_COCKATRICE && !uarmg) { - pline("Touching the dead cockatrice is a fatal mistake ..."); - pline("You die ..."); - killer = "dead cockatrice"; - done("died"); - } - } - } - - if(gold) { - char gbuf[30]; - - (void) sprintf(gbuf, "%ld gold piece%s", - gold->amount, plur(gold->amount)); - if(!ct++) - pline("You %s here %s.", verb, gbuf); - else - cornline(1, gbuf); - } +int +dolook() +{ + struct obj *otmp, *otmp0; + struct gold *gold; + char *verb = Blind ? "feel" : "see"; + int ct = 0; + + if (!u.uswallow) { + if (Blind) { + pline("You try to feel what is lying here on the floor."); + if (Levitation) { /* ab@unido */ + pline("You cannot reach the floor!"); + return (1); + } + } + otmp0 = o_at(u.ux, u.uy); + gold = g_at(u.ux, u.uy); + } + if (u.uswallow || (!otmp0 && !gold)) { + pline("You %s no objects here.", verb); + return (!!Blind); + } + cornline(0, "Things that are here:"); + for (otmp = otmp0; otmp; otmp = otmp->nobj) { + if (otmp->ox == u.ux && otmp->oy == u.uy) { + ct++; + cornline(1, doname(otmp)); + if (Blind && otmp->otyp == DEAD_COCKATRICE && !uarmg) { + pline("Touching the dead cockatrice is a fatal mistake ..."); + pline("You die ..."); + killer = "dead cockatrice"; + done("died"); + } + } + } + + if (gold) { + char gbuf[30]; - if(ct == 1 && !gold) { - pline("You %s here %s.", verb, doname(otmp0)); - cornline(3, (char *) 0); - } - if(ct > 1) - cornline(2, (char *) 0); - return(!!Blind); + (void) sprintf(gbuf, "%ld gold piece%s", + gold->amount, plur(gold->amount)); + if (!ct++) + pline("You %s here %s.", verb, gbuf); + else + cornline(1, gbuf); + } + if (ct == 1 && !gold) { + pline("You %s here %s.", verb, doname(otmp0)); + cornline(3, (char *) 0); + } + if (ct > 1) + cornline(2, (char *) 0); + return (!!Blind); } -stackobj(obj) register struct obj *obj; { -register struct obj *otmp = fobj; - for(otmp = fobj; otmp; otmp = otmp->nobj) if(otmp != obj) - if(otmp->ox == obj->ox && otmp->oy == obj->oy && - merged(obj,otmp,1)) - return; +void +stackobj(obj) + struct obj *obj; +{ + struct obj *otmp = fobj; + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp != obj) + if (otmp->ox == obj->ox && otmp->oy == obj->oy && + merged(obj, otmp, 1)) + return; } /* merge obj with otmp and delete obj if types agree */ -merged(otmp,obj,lose) register struct obj *otmp, *obj; { - if(obj->otyp == otmp->otyp && - obj->unpaid == otmp->unpaid && - obj->spe == otmp->spe && - obj->dknown == otmp->dknown && - obj->cursed == otmp->cursed && - (index("%*?!", obj->olet) || - (obj->known == otmp->known && - (obj->olet == WEAPON_SYM && obj->otyp < BOOMERANG)))) { +int +merged(otmp, obj, lose) + struct obj *otmp, *obj; +{ + if (obj->otyp == otmp->otyp && + obj->unpaid == otmp->unpaid && + obj->spe == otmp->spe && + obj->dknown == otmp->dknown && + obj->cursed == otmp->cursed && + (strchr("%*?!", obj->olet) || + (obj->known == otmp->known && + (obj->olet == WEAPON_SYM && obj->otyp < BOOMERANG)))) { otmp->quan += obj->quan; otmp->owt += obj->owt; - if(lose) freeobj(obj); - obfree(obj,otmp); /* free(obj), bill->otmp */ - return(1); - } else return(0); + if (lose) + freeobj(obj); + obfree(obj, otmp); /* free(obj), bill->otmp */ + return (1); + } else + return (0); } +static long goldcounted; /* * Gold is no longer displayed; in fact, when you have a lot of money, * it may take a while before you have counted it all. * [Bug: d$ and pickup still tell you how much it was.] */ -extern int (*occupation)(); -extern char *occtxt; -static long goldcounted; - -countgold(){ - if((goldcounted += 100*(u.ulevel + 1)) >= u.ugold) { - long eps = 0; - if(!rn2(2)) eps = rnd((int) (u.ugold/100 + 1)); +int +countgold() +{ + if ((goldcounted += 100 * (u.ulevel + 1)) >= u.ugold) { + long eps = 0; + if (!rn2(2)) + eps = rnd((int) (u.ugold / 100 + 1)); pline("You probably have about %ld gold pieces.", - u.ugold + eps); - return(0); /* done */ + u.ugold + eps); + return (0); /* done */ } - return(1); /* continue */ + return (1); /* continue */ } -doprgold(){ - if(!u.ugold) +int +doprgold() +{ + if (!u.ugold) pline("You do not carry any gold."); - else if(u.ugold <= 500) + else if (u.ugold <= 500) pline("You are carrying %ld gold pieces.", u.ugold); else { pline("You sit down in order to count your gold pieces."); @@ -819,50 +918,67 @@ doprgold(){ occupation = countgold; occtxt = "counting your gold"; } - return(1); + return (1); } /* --- end of gold counting section --- */ - -doprwep(){ - if(!uwep) pline("You are empty handed."); - else prinv(uwep); - return(0); +int +doprwep() +{ + if (!uwep) + pline("You are empty handed."); + else + prinv(uwep); + return (0); } -doprarm(){ - if(!uarm && !uarmg && !uarms && !uarmh) +int +doprarm() +{ + if (!uarm && !uarmg && !uarms && !uarmh) pline("You are not wearing any armor."); else { - char lets[6]; - register int ct = 0; - - if(uarm) lets[ct++] = obj_to_let(uarm); - if(uarm2) lets[ct++] = obj_to_let(uarm2); - if(uarmh) lets[ct++] = obj_to_let(uarmh); - if(uarms) lets[ct++] = obj_to_let(uarms); - if(uarmg) lets[ct++] = obj_to_let(uarmg); + char lets[6]; + int ct = 0; + + if (uarm) + lets[ct++] = obj_to_let(uarm); + if (uarm2) + lets[ct++] = obj_to_let(uarm2); + if (uarmh) + lets[ct++] = obj_to_let(uarmh); + if (uarms) + lets[ct++] = obj_to_let(uarms); + if (uarmg) + lets[ct++] = obj_to_let(uarmg); lets[ct] = 0; doinv(lets); } - return(0); + return (0); } -doprring(){ - if(!uleft && !uright) +int +doprring() +{ + if (!uleft && !uright) pline("You are not wearing any rings."); else { - char lets[3]; - register int ct = 0; + char lets[3]; + int ct = 0; - if(uleft) lets[ct++] = obj_to_let(uleft); - if(uright) lets[ct++] = obj_to_let(uright); + if (uleft) + lets[ct++] = obj_to_let(uleft); + if (uright) + lets[ct++] = obj_to_let(uright); lets[ct] = 0; doinv(lets); } - return(0); + return (0); } -digit(c) char c; { - return(c >= '0' && c <= '9'); +int +digit(c) + char c; +{ + return (c >= '0' && c <= '9'); } diff --git a/hack/hack.ioctl.c b/hack/hack.ioctl.c index fccd359f..d9fece93 100644 --- a/hack/hack.ioctl.c +++ b/hack/hack.ioctl.c @@ -1,32 +1,43 @@ +/* $NetBSD: hack.ioctl.c,v 1.6 1997/10/19 16:58:07 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.ioctl.c,v 1.5 1995/04/28 23:01:45 mycroft Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.ioctl.c,v 1.6 1997/10/19 16:58:07 christos Exp $"); +#endif /* not lint */ -/* This cannot be part of hack.tty.c (as it was earlier) since on some - systems (e.g. MUNIX) the include files <termio.h> and <sgtty.h> - define the same constants, and the C preprocessor complains. */ -#include <stdio.h> +/* + * This cannot be part of hack.tty.c (as it was earlier) since on some + * systems (e.g. MUNIX) the include files <termio.h> and <sgtty.h> define the + * same constants, and the C preprocessor complains. + */ #include <termios.h> -#include "config.h" -struct termios termios; +#include "hack.h" +#include "extern.h" +struct termios termios; -getioctls() { +void +getioctls() +{ (void) tcgetattr(fileno(stdin), &termios); } -setioctls() { +void +setioctls() +{ (void) tcsetattr(fileno(stdin), TCSADRAIN, &termios); } -#ifdef SUSPEND /* implies BSD */ +#ifdef SUSPEND /* implies BSD */ #include <signal.h> -dosuspend() { +int +dosuspend() +{ #ifdef SIGTSTP - if(signal(SIGTSTP, SIG_IGN) == SIG_DFL) { + if (signal(SIGTSTP, SIG_IGN) == SIG_DFL) { settty((char *) 0); (void) signal(SIGTSTP, SIG_DFL); (void) kill(0, SIGTSTP); @@ -36,9 +47,9 @@ dosuspend() { } else { pline("I don't think your shell has job control."); } -#else SIGTSTP +#else /* SIGTSTP */ pline("Sorry, it seems we have no SIGTSTP here. Try ! or S."); -#endif SIGTSTP - return(0); +#endif /* SIGTSTP */ + return (0); } -#endif SUSPEND +#endif /* SUSPEND */ diff --git a/hack/hack.lev.c b/hack/hack.lev.c index e15d39ee..1454d3db 100644 --- a/hack/hack.lev.c +++ b/hack/hack.lev.c @@ -1,52 +1,49 @@ +/* $NetBSD: hack.lev.c,v 1.4 1997/10/19 16:58:09 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.lev.c,v 1.3 1995/03/23 08:30:32 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.lev.c,v 1.4 1997/10/19 16:58:09 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> +#include <unistd.h> #include "hack.h" +#include "extern.h" #include "def.mkroom.h" -#include <stdio.h> -extern struct monst *restmonchn(); -extern struct obj *restobjchn(); -extern struct obj *billobjs; -extern char *itoa(); -extern char SAVEF[]; -extern int hackpid; -extern xchar dlevel; -extern char nul[]; #ifndef NOWORM #include "def.wseg.h" -extern struct wseg *wsegs[32], *wheads[32]; -extern long wgrowtime[32]; -#endif NOWORM +#endif /* NOWORM */ -boolean level_exists[MAXLEVEL+1]; +boolean level_exists[MAXLEVEL + 1]; -savelev(fd,lev) -int fd; -xchar lev; +void +savelev(fd, lev) + int fd; + xchar lev; { #ifndef NOWORM - register struct wseg *wtmp, *wtmp2; - register tmp; -#endif NOWORM + struct wseg *wtmp, *wtmp2; + int tmp; +#endif /* NOWORM */ - if(fd < 0) panic("Save on bad file!"); /* impossible */ - if(lev >= 0 && lev <= MAXLEVEL) + if (fd < 0) + panic("Save on bad file!"); /* impossible */ + if (lev >= 0 && lev <= MAXLEVEL) level_exists[lev] = TRUE; - bwrite(fd,(char *) &hackpid,sizeof(hackpid)); - bwrite(fd,(char *) &lev,sizeof(lev)); - bwrite(fd,(char *) levl,sizeof(levl)); - bwrite(fd,(char *) &moves,sizeof(long)); - bwrite(fd,(char *) &xupstair,sizeof(xupstair)); - bwrite(fd,(char *) &yupstair,sizeof(yupstair)); - bwrite(fd,(char *) &xdnstair,sizeof(xdnstair)); - bwrite(fd,(char *) &ydnstair,sizeof(ydnstair)); + bwrite(fd, (char *) &hackpid, sizeof(hackpid)); + bwrite(fd, (char *) &lev, sizeof(lev)); + bwrite(fd, (char *) levl, sizeof(levl)); + bwrite(fd, (char *) &moves, sizeof(long)); + bwrite(fd, (char *) &xupstair, sizeof(xupstair)); + bwrite(fd, (char *) &yupstair, sizeof(yupstair)); + bwrite(fd, (char *) &xdnstair, sizeof(xdnstair)); + bwrite(fd, (char *) &ydnstair, sizeof(ydnstair)); savemonchn(fd, fmon); savegoldchn(fd, fgold); savetrapchn(fd, ftrap); @@ -55,45 +52,47 @@ xchar lev; billobjs = 0; save_engravings(fd); #ifndef QUEST - bwrite(fd,(char *) rooms,sizeof(rooms)); - bwrite(fd,(char *) doors,sizeof(doors)); -#endif QUEST + bwrite(fd, (char *) rooms, sizeof(rooms)); + bwrite(fd, (char *) doors, sizeof(doors)); +#endif /* QUEST */ fgold = 0; ftrap = 0; fmon = 0; fobj = 0; #ifndef NOWORM - bwrite(fd,(char *) wsegs,sizeof(wsegs)); - for(tmp=1; tmp<32; tmp++){ - for(wtmp = wsegs[tmp]; wtmp; wtmp = wtmp2){ + bwrite(fd, (char *) wsegs, sizeof(wsegs)); + for (tmp = 1; tmp < 32; tmp++) { + for (wtmp = wsegs[tmp]; wtmp; wtmp = wtmp2) { wtmp2 = wtmp->nseg; - bwrite(fd,(char *) wtmp,sizeof(struct wseg)); + bwrite(fd, (char *) wtmp, sizeof(struct wseg)); } wsegs[tmp] = 0; } - bwrite(fd,(char *) wgrowtime,sizeof(wgrowtime)); -#endif NOWORM + bwrite(fd, (char *) wgrowtime, sizeof(wgrowtime)); +#endif /* NOWORM */ } -bwrite(fd,loc,num) -register fd; -register char *loc; -register unsigned num; +void +bwrite(fd, loc, num) + int fd; + char *loc; + unsigned num; { -/* lint wants the 3rd arg of write to be an int; lint -p an unsigned */ - if(write(fd, loc, (int) num) != num) + /* lint wants the 3rd arg of write to be an int; lint -p an unsigned */ + if (write(fd, loc, (int) num) != num) panic("cannot write %u bytes to file #%d", num, fd); } -saveobjchn(fd,otmp) -register fd; -register struct obj *otmp; +void +saveobjchn(fd, otmp) + int fd; + struct obj *otmp; { - register struct obj *otmp2; - unsigned xl; - int minusone = -1; + struct obj *otmp2; + unsigned xl; + int minusone = -1; - while(otmp) { + while (otmp) { otmp2 = otmp->nobj; xl = otmp->onamelth; bwrite(fd, (char *) &xl, sizeof(int)); @@ -104,35 +103,38 @@ register struct obj *otmp; bwrite(fd, (char *) &minusone, sizeof(int)); } -savemonchn(fd,mtmp) -register fd; -register struct monst *mtmp; +void +savemonchn(fd, mtmp) + int fd; + struct monst *mtmp; { - register struct monst *mtmp2; - unsigned xl; - int minusone = -1; + struct monst *mtmp2; + unsigned xl; + int minusone = -1; struct permonst *monbegin = &mons[0]; bwrite(fd, (char *) &monbegin, sizeof(monbegin)); - while(mtmp) { + while (mtmp) { mtmp2 = mtmp->nmon; xl = mtmp->mxlth + mtmp->mnamelth; bwrite(fd, (char *) &xl, sizeof(int)); bwrite(fd, (char *) mtmp, xl + sizeof(struct monst)); - if(mtmp->minvent) saveobjchn(fd,mtmp->minvent); + if (mtmp->minvent) + saveobjchn(fd, mtmp->minvent); free((char *) mtmp); mtmp = mtmp2; } bwrite(fd, (char *) &minusone, sizeof(int)); } -savegoldchn(fd,gold) -register fd; -register struct gold *gold; +void +savegoldchn(fd, gold) + int fd; + struct gold *gold; { - register struct gold *gold2; - while(gold) { + struct gold *gold2; + while (gold) { gold2 = gold->ngold; bwrite(fd, (char *) gold, sizeof(struct gold)); free((char *) gold); @@ -141,12 +143,13 @@ register struct gold *gold; bwrite(fd, nul, sizeof(struct gold)); } -savetrapchn(fd,trap) -register fd; -register struct trap *trap; +void +savetrapchn(fd, trap) + int fd; + struct trap *trap; { - register struct trap *trap2; - while(trap) { + struct trap *trap2; + while (trap) { trap2 = trap->ntrap; bwrite(fd, (char *) trap, sizeof(struct trap)); free((char *) trap); @@ -155,122 +158,122 @@ register struct trap *trap; bwrite(fd, nul, sizeof(struct trap)); } -getlev(fd,pid,lev) -int fd,pid; -xchar lev; +void +getlev(fd, pid, lev) + int fd, pid; + xchar lev; { - register struct gold *gold; - register struct trap *trap; + struct gold *gold; + struct trap *trap; #ifndef NOWORM - register struct wseg *wtmp; -#endif NOWORM - register tmp; - long omoves; - int hpid; - xchar dlvl; + struct wseg *wtmp; +#endif /* NOWORM */ + int tmp; + long omoves; + int hpid; + xchar dlvl; /* First some sanity checks */ mread(fd, (char *) &hpid, sizeof(hpid)); mread(fd, (char *) &dlvl, sizeof(dlvl)); - if((pid && pid != hpid) || (lev && dlvl != lev)) { + if ((pid && pid != hpid) || (lev && dlvl != lev)) { pline("Strange, this map is not as I remember it."); pline("Somebody is trying some trickery here ..."); pline("This game is void ..."); done("tricked"); } - fgold = 0; ftrap = 0; mread(fd, (char *) levl, sizeof(levl)); - mread(fd, (char *)&omoves, sizeof(omoves)); - mread(fd, (char *)&xupstair, sizeof(xupstair)); - mread(fd, (char *)&yupstair, sizeof(yupstair)); - mread(fd, (char *)&xdnstair, sizeof(xdnstair)); - mread(fd, (char *)&ydnstair, sizeof(ydnstair)); + mread(fd, (char *) &omoves, sizeof(omoves)); + mread(fd, (char *) &xupstair, sizeof(xupstair)); + mread(fd, (char *) &yupstair, sizeof(yupstair)); + mread(fd, (char *) &xdnstair, sizeof(xdnstair)); + mread(fd, (char *) &ydnstair, sizeof(ydnstair)); fmon = restmonchn(fd); /* regenerate animals while on another level */ - { long tmoves = (moves > omoves) ? moves-omoves : 0; - register struct monst *mtmp, *mtmp2; - extern char genocided[]; + { + long tmoves = (moves > omoves) ? moves - omoves : 0; + struct monst *mtmp, *mtmp2; - for(mtmp = fmon; mtmp; mtmp = mtmp2) { - long newhp; /* tmoves may be very large */ - - mtmp2 = mtmp->nmon; - if(index(genocided, mtmp->data->mlet)) { - mondead(mtmp); - continue; - } + for (mtmp = fmon; mtmp; mtmp = mtmp2) { + long newhp; /* tmoves may be very large */ - if(mtmp->mtame && tmoves > 250) { - mtmp->mtame = 0; - mtmp->mpeaceful = 0; + mtmp2 = mtmp->nmon; + if (strchr(genocided, mtmp->data->mlet)) { + mondead(mtmp); + continue; + } + if (mtmp->mtame && tmoves > 250) { + mtmp->mtame = 0; + mtmp->mpeaceful = 0; + } + newhp = mtmp->mhp + + (strchr(MREGEN, mtmp->data->mlet) ? tmoves : tmoves / 20); + if (newhp > mtmp->mhpmax) + mtmp->mhp = mtmp->mhpmax; + else + mtmp->mhp = newhp; } - - newhp = mtmp->mhp + - (index(MREGEN, mtmp->data->mlet) ? tmoves : tmoves/20); - if(newhp > mtmp->mhpmax) - mtmp->mhp = mtmp->mhpmax; - else - mtmp->mhp = newhp; - } } setgd(); gold = newgold(); - mread(fd, (char *)gold, sizeof(struct gold)); - while(gold->gx) { + mread(fd, (char *) gold, sizeof(struct gold)); + while (gold->gx) { gold->ngold = fgold; fgold = gold; gold = newgold(); - mread(fd, (char *)gold, sizeof(struct gold)); + mread(fd, (char *) gold, sizeof(struct gold)); } free((char *) gold); trap = newtrap(); - mread(fd, (char *)trap, sizeof(struct trap)); - while(trap->tx) { + mread(fd, (char *) trap, sizeof(struct trap)); + while (trap->tx) { trap->ntrap = ftrap; ftrap = trap; trap = newtrap(); - mread(fd, (char *)trap, sizeof(struct trap)); + mread(fd, (char *) trap, sizeof(struct trap)); } free((char *) trap); fobj = restobjchn(fd); billobjs = restobjchn(fd); rest_engravings(fd); #ifndef QUEST - mread(fd, (char *)rooms, sizeof(rooms)); - mread(fd, (char *)doors, sizeof(doors)); -#endif QUEST + mread(fd, (char *) rooms, sizeof(rooms)); + mread(fd, (char *) doors, sizeof(doors)); +#endif /* QUEST */ #ifndef NOWORM - mread(fd, (char *)wsegs, sizeof(wsegs)); - for(tmp = 1; tmp < 32; tmp++) if(wsegs[tmp]){ - wheads[tmp] = wsegs[tmp] = wtmp = newseg(); - while(1) { - mread(fd, (char *)wtmp, sizeof(struct wseg)); - if(!wtmp->nseg) break; - wheads[tmp]->nseg = wtmp = newseg(); - wheads[tmp] = wtmp; + mread(fd, (char *) wsegs, sizeof(wsegs)); + for (tmp = 1; tmp < 32; tmp++) + if (wsegs[tmp]) { + wheads[tmp] = wsegs[tmp] = wtmp = newseg(); + while (1) { + mread(fd, (char *) wtmp, sizeof(struct wseg)); + if (!wtmp->nseg) + break; + wheads[tmp]->nseg = wtmp = newseg(); + wheads[tmp] = wtmp; + } } - } - mread(fd, (char *)wgrowtime, sizeof(wgrowtime)); -#endif NOWORM + mread(fd, (char *) wgrowtime, sizeof(wgrowtime)); +#endif /* NOWORM */ } +void mread(fd, buf, len) -register fd; -register char *buf; -register unsigned len; + int fd; + char *buf; + unsigned len; { - register int rlen; - extern boolean restoring; + int rlen; rlen = read(fd, buf, (int) len); - if(rlen != len){ + if (rlen != len) { pline("Read %d instead of %u bytes.\n", rlen, len); - if(restoring) { + if (restoring) { (void) unlink(SAVEF); error("Error restoring old game."); } @@ -278,11 +281,11 @@ register unsigned len; } } +void mklev() { - extern boolean in_mklev; - - if(getbones()) return; + if (getbones()) + return; in_mklev = TRUE; makelevel(); diff --git a/hack/hack.main.c b/hack/hack.main.c index cdec0b25..991f577d 100644 --- a/hack/hack.main.c +++ b/hack/hack.main.c @@ -1,14 +1,20 @@ +/* $NetBSD: hack.main.c,v 1.4 1997/10/19 16:58:11 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.main.c,v 1.3 1995/03/23 08:30:35 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.main.c,v 1.4 1997/10/19 16:58:11 christos Exp $"); +#endif /* not lint */ -#include <stdio.h> #include <signal.h> +#include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> #include "hack.h" +#include "extern.h" #ifdef QUEST #define gamename "quest" @@ -16,41 +22,30 @@ static char rcsid[] = "$NetBSD: hack.main.c,v 1.3 1995/03/23 08:30:35 cgd Exp $" #define gamename "hack" #endif -extern char *getlogin(), *getenv(); -extern char plname[PL_NSIZ], pl_character[PL_CSIZ]; -extern struct permonst mons[CMNUM+2]; -extern char genocided[], fut_geno[]; - -int (*afternmv)(); -int (*occupation)(); -char *occtxt; /* defined when occupation != NULL */ - -void done1(); -void hangup(); +int (*afternmv) __P((void)); +int (*occupation) __P((void)); +char *occtxt; /* defined when occupation != NULL */ -int hackpid; /* current pid */ -int locknum; /* max num of players */ +int hackpid; /* current pid */ +int locknum; /* max num of players */ #ifdef DEF_PAGER -char *catmore; /* default pager */ +char *catmore; /* default pager */ #endif -char SAVEF[PL_NSIZ + 11] = "save/"; /* save/99999player */ -char *hname; /* name of the game (argv[0] of call) */ -char obuf[BUFSIZ]; /* BUFSIZ is defined in stdio.h */ +char SAVEF[PL_NSIZ + 11] = "save/"; /* save/99999player */ +char *hname; /* name of the game (argv[0] of call) */ +char obuf[BUFSIZ]; /* BUFSIZ is defined in stdio.h */ -extern char *nomovemsg; -extern long wailmsg; - -#ifdef CHDIR -static void chdirx(); -#endif +int main __P((int, char *[])); +static void chdirx __P((char *, boolean)); -main(argc,argv) -int argc; -char *argv[]; +int +main(argc, argv) + int argc; + char *argv[]; { - register int fd; + int fd; #ifdef CHDIR - register char *dir; + char *dir; #endif hname = argv[0]; @@ -66,18 +61,19 @@ char *argv[]; */ dir = getenv("HACKDIR"); - if(argc > 1 && !strncmp(argv[1], "-d", 2)) { + if (argc > 1 && !strncmp(argv[1], "-d", 2)) { argc--; argv++; - dir = argv[0]+2; - if(*dir == '=' || *dir == ':') dir++; - if(!*dir && argc > 1) { + dir = argv[0] + 2; + if (*dir == '=' || *dir == ':') + dir++; + if (!*dir && argc > 1) { argc--; argv++; dir = argv[0]; } - if(!*dir) - error("Flag -d must be followed by a directory name."); + if (!*dir) + error("Flag -d must be followed by a directory name."); } #endif @@ -92,40 +88,40 @@ char *argv[]; * Note that we trust him here; it is possible to play under * somebody else's name. */ - { register char *s; - - initoptions(); - if(!*plname && (s = getenv("USER"))) - (void) strncpy(plname, s, sizeof(plname)-1); - if(!*plname && (s = getenv("LOGNAME"))) - (void) strncpy(plname, s, sizeof(plname)-1); - if(!*plname && (s = getlogin())) - (void) strncpy(plname, s, sizeof(plname)-1); + { + char *s; + + initoptions(); + if (!*plname && (s = getenv("USER"))) + (void) strncpy(plname, s, sizeof(plname) - 1); + if (!*plname && (s = getenv("LOGNAME"))) + (void) strncpy(plname, s, sizeof(plname) - 1); + if (!*plname && (s = getlogin())) + (void) strncpy(plname, s, sizeof(plname) - 1); } /* * Now we know the directory containing 'record' and * may do a prscore(). */ - if(argc > 1 && !strncmp(argv[1], "-s", 2)) { + if (argc > 1 && !strncmp(argv[1], "-s", 2)) { #ifdef CHDIR - chdirx(dir,0); + chdirx(dir, 0); #endif prscore(argc, argv); exit(0); } - /* * It seems he really wants to play. * Remember tty modes, to be restored on exit. */ gettty(); - setbuf(stdout,obuf); + setbuf(stdout, obuf); setrandom(); startup(); cls(); - u.uhp = 1; /* prevent RIP on early quits */ - u.ux = FAR; /* prevent nscr() */ + u.uhp = 1; /* prevent RIP on early quits */ + u.ux = FAR; /* prevent nscr() */ (void) signal(SIGHUP, hangup); /* @@ -138,22 +134,23 @@ char *argv[]; * We cannot do chdir earlier, otherwise gethdate will fail. */ #ifdef CHDIR - chdirx(dir,1); + chdirx(dir, 1); #endif /* * Process options. */ - while(argc > 1 && argv[1][0] == '-'){ + while (argc > 1 && argv[1][0] == '-') { argv++; argc--; - switch(argv[0][1]){ + switch (argv[0][1]) { #ifdef WIZARD case 'D': -/* if(!strcmp(getlogin(), WIZARD)) */ - wizard = TRUE; -/* else - printf("Sorry.\n"); */ + /* if(!strcmp(getlogin(), WIZARD)) */ + wizard = TRUE; + /* + * else printf("Sorry.\n"); + */ break; #endif #ifdef NEWS @@ -162,76 +159,79 @@ char *argv[]; break; #endif case 'u': - if(argv[0][2]) - (void) strncpy(plname, argv[0]+2, sizeof(plname)-1); - else if(argc > 1) { - argc--; - argv++; - (void) strncpy(plname, argv[0], sizeof(plname)-1); + if (argv[0][2]) + (void) strncpy(plname, argv[0] + 2, sizeof(plname) - 1); + else if (argc > 1) { + argc--; + argv++; + (void) strncpy(plname, argv[0], sizeof(plname) - 1); } else printf("Player name expected after -u\n"); break; default: /* allow -T for Tourist, etc. */ - (void) strncpy(pl_character, argv[0]+1, - sizeof(pl_character)-1); + (void) strncpy(pl_character, argv[0] + 1, + sizeof(pl_character) - 1); /* printf("Unknown option: %s\n", *argv); */ } } - if(argc > 1) + if (argc > 1) locknum = atoi(argv[1]); #ifdef MAX_NR_OF_PLAYERS - if(!locknum || locknum > MAX_NR_OF_PLAYERS) + if (!locknum || locknum > MAX_NR_OF_PLAYERS) locknum = MAX_NR_OF_PLAYERS; #endif #ifdef DEF_PAGER - if(!(catmore = getenv("HACKPAGER")) && !(catmore = getenv("PAGER"))) + if (!(catmore = getenv("HACKPAGER")) && !(catmore = getenv("PAGER"))) catmore = DEF_PAGER; #endif #ifdef MAIL getmailstatus(); #endif #ifdef WIZARD - if(wizard) (void) strcpy(plname, "wizard"); else + if (wizard) + (void) strcpy(plname, "wizard"); + else #endif - if(!*plname || !strncmp(plname, "player", 4) + if (!*plname || !strncmp(plname, "player", 4) || !strncmp(plname, "games", 4)) askname(); plnamesuffix(); /* strip suffix from name; calls askname() */ - /* again if suffix was whole name */ - /* accepts any suffix */ + /* again if suffix was whole name */ + /* accepts any suffix */ #ifdef WIZARD - if(!wizard) { + if (!wizard) { #endif /* * check for multiple games under the same name * (if !locknum) or check max nr of players (otherwise) */ - (void) signal(SIGQUIT,SIG_IGN); - (void) signal(SIGINT,SIG_IGN); - if(!locknum) - (void) strcpy(lock,plname); + (void) signal(SIGQUIT, SIG_IGN); + (void) signal(SIGINT, SIG_IGN); + if (!locknum) + (void) strcpy(lock, plname); getlock(); /* sets lock if locknum != 0 */ #ifdef WIZARD } else { - register char *sfoo; - (void) strcpy(lock,plname); - if(sfoo = getenv("MAGIC")) - while(*sfoo) { - switch(*sfoo++) { - case 'n': (void) srandom(*sfoo++); + char *sfoo; + (void) strcpy(lock, plname); + if ((sfoo = getenv("MAGIC")) != NULL) + while (*sfoo) { + switch (*sfoo++) { + case 'n': + (void) srandom(*sfoo++); break; } } - if(sfoo = getenv("GENOCIDED")){ - if(*sfoo == '!'){ - register struct permonst *pm = mons; - register char *gp = genocided; + if ((sfoo = getenv("GENOCIDED")) != NULL) { + if (*sfoo == '!') { + struct permonst *pm = mons; + char *gp = genocided; - while(pm < mons+CMNUM+2){ - if(!index(sfoo, pm->mlet)) + while (pm < mons + CMNUM + 2) { + if (!strchr(sfoo, pm->mlet)) *gp++ = pm->mlet; pm++; } @@ -244,13 +244,13 @@ char *argv[]; #endif setftty(); (void) sprintf(SAVEF, "save/%d%s", getuid(), plname); - regularize(SAVEF+5); /* avoid . or / in name */ - if((fd = open(SAVEF,0)) >= 0 && - (uptodate(fd) || unlink(SAVEF) == 666)) { - (void) signal(SIGINT,done1); + regularize(SAVEF + 5); /* avoid . or / in name */ + if ((fd = open(SAVEF, 0)) >= 0 && + (uptodate(fd) || unlink(SAVEF) == 666)) { + (void) signal(SIGINT, done1); pline("Restoring old save file..."); (void) fflush(stdout); - if(!dorecover(fd)) + if (!dorecover(fd)) goto not_recovered; pline("Hello %s, welcome to %s!", plname, gamename); flags.move = 0; @@ -264,7 +264,7 @@ not_recovered: init_objects(); u_init(); - (void) signal(SIGINT,done1); + (void) signal(SIGINT, done1); mklev(); u.ux = xupstair; u.uy = yupstair; @@ -272,12 +272,14 @@ not_recovered: setsee(); flags.botlx = 1; makedog(); - { register struct monst *mtmp; - if(mtmp = m_at(u.ux, u.uy)) mnexto(mtmp); /* riv05!a3 */ + { + struct monst *mtmp; + if ((mtmp = m_at(u.ux, u.uy)) != NULL) + mnexto(mtmp); /* riv05!a3 */ } seemons(); #ifdef NEWS - if(flags.nonews || !readnews()) + if (flags.nonews || !readnews()) /* after reading news we did docrt() already */ #endif docrt(); @@ -286,134 +288,139 @@ not_recovered: pline("Hello %s, welcome to %s!", plname, gamename); pickup(1); - read_engr_at(u.ux,u.uy); + read_engr_at(u.ux, u.uy); flags.move = 1; } flags.moonphase = phase_of_the_moon(); - if(flags.moonphase == FULL_MOON) { + if (flags.moonphase == FULL_MOON) { pline("You are lucky! Full moon tonight."); u.uluck++; - } else if(flags.moonphase == NEW_MOON) { + } else if (flags.moonphase == NEW_MOON) { pline("Be careful! New moon tonight."); } - initrack(); - for(;;) { - if(flags.move) { /* actual time passed */ + for (;;) { + if (flags.move) { /* actual time passed */ settrack(); - if(moves%2 == 0 || - (!(Fast & ~INTRINSIC) && (!Fast || rn2(3)))) { - extern struct monst *makemon(); + if (moves % 2 == 0 || + (!(Fast & ~INTRINSIC) && (!Fast || rn2(3)))) { movemon(); - if(!rn2(70)) - (void) makemon((struct permonst *)0, 0, 0); + if (!rn2(70)) + (void) makemon((struct permonst *) 0, 0, 0); } - if(Glib) glibr(); + if (Glib) + glibr(); timeout(); ++moves; - if(flags.time) flags.botl = 1; - if(u.uhp < 1) { + if (flags.time) + flags.botl = 1; + if (u.uhp < 1) { pline("You die..."); done("died"); } - if(u.uhp*10 < u.uhpmax && moves-wailmsg > 50){ - wailmsg = moves; - if(u.uhp == 1) - pline("You hear the wailing of the Banshee..."); - else - pline("You hear the howling of the CwnAnnwn..."); + if (u.uhp * 10 < u.uhpmax && moves - wailmsg > 50) { + wailmsg = moves; + if (u.uhp == 1) + pline("You hear the wailing of the Banshee..."); + else + pline("You hear the howling of the CwnAnnwn..."); } - if(u.uhp < u.uhpmax) { - if(u.ulevel > 9) { - if(Regeneration || !(moves%3)) { - flags.botl = 1; - u.uhp += rnd((int) u.ulevel-9); - if(u.uhp > u.uhpmax) - u.uhp = u.uhpmax; + if (u.uhp < u.uhpmax) { + if (u.ulevel > 9) { + if (Regeneration || !(moves % 3)) { + flags.botl = 1; + u.uhp += rnd((int) u.ulevel - 9); + if (u.uhp > u.uhpmax) + u.uhp = u.uhpmax; } - } else if(Regeneration || - (!(moves%(22-u.ulevel*2)))) { + } else if (Regeneration || + (!(moves % (22 - u.ulevel * 2)))) { flags.botl = 1; u.uhp++; } } - if(Teleportation && !rn2(85)) tele(); - if(Searching && multi >= 0) (void) dosearch(); + if (Teleportation && !rn2(85)) + tele(); + if (Searching && multi >= 0) + (void) dosearch(); gethungry(); invault(); amulet(); } - if(multi < 0) { - if(!++multi){ + if (multi < 0) { + if (!++multi) { pline(nomovemsg ? nomovemsg : - "You can move again."); + "You can move again."); nomovemsg = 0; - if(afternmv) (*afternmv)(); + if (afternmv) + (*afternmv) (); afternmv = 0; } } - find_ac(); #ifndef QUEST - if(!flags.mv || Blind) + if (!flags.mv || Blind) #endif { seeobjs(); seemons(); nscr(); } - if(flags.botl || flags.botlx) bot(); + if (flags.botl || flags.botlx) + bot(); flags.move = 1; - if(multi >= 0 && occupation) { - if(monster_nearby()) + if (multi >= 0 && occupation) { + if (monster_nearby()) stop_occupation(); - else if ((*occupation)() == 0) + else if ((*occupation) () == 0) occupation = 0; continue; } - - if(multi > 0) { + if (multi > 0) { #ifdef QUEST - if(flags.run >= 4) finddir(); + if (flags.run >= 4) + finddir(); #endif lookaround(); - if(!multi) { /* lookaround may clear multi */ + if (!multi) { /* lookaround may clear multi */ flags.move = 0; continue; } - if(flags.mv) { - if(multi < COLNO && !--multi) + if (flags.mv) { + if (multi < COLNO && !--multi) flags.mv = flags.run = 0; domove(); } else { --multi; rhack(save_cm); } - } else if(multi == 0) { + } else if (multi == 0) { #ifdef MAIL ckmailstatus(); #endif rhack((char *) 0); } - if(multi && multi%7 == 0) + if (multi && multi % 7 == 0) (void) fflush(stdout); } } +void glo(foo) -register foo; + int foo; { /* construct the string xlock.n */ - register char *tf; + char *tf; tf = lock; - while(*tf && *tf != '.') tf++; + while (*tf && *tf != '.') + tf++; (void) sprintf(tf, ".%d", foo); } @@ -422,82 +429,104 @@ register foo; * explicitly (-w implies wizard) or by askname. * It may still contain a suffix denoting pl_character. */ -askname(){ -register int c,ct; +void +askname() +{ + int c, ct; printf("\nWho are you? "); (void) fflush(stdout); ct = 0; - while((c = getchar()) != '\n'){ - if(c == EOF) error("End of input\n"); + while ((c = getchar()) != '\n') { + if (c == EOF) + error("End of input\n"); /* some people get confused when their erase char is not ^H */ - if(c == '\010') { - if(ct) ct--; + if (c == '\010') { + if (ct) + ct--; continue; } - if(c != '-') - if(c < 'A' || (c > 'Z' && c < 'a') || c > 'z') c = '_'; - if(ct < sizeof(plname)-1) plname[ct++] = c; + if (c != '-') + if (c < 'A' || (c > 'Z' && c < 'a') || c > 'z') + c = '_'; + if (ct < sizeof(plname) - 1) + plname[ct++] = c; } plname[ct] = 0; - if(ct == 0) askname(); + if (ct == 0) + askname(); } -/*VARARGS1*/ -impossible(s,x1,x2) -register char *s; +/* VARARGS1 */ +void +#ifdef __STDC__ +impossible(const char *s, ...) +#else +impossible(va_alist) + va_dcl +#endif { - pline(s,x1,x2); + va_list ap; +#ifndef __STDC__ + const char *s; + + va_start(ap); + s = va_arg(ap, const char *); +#else + va_start(ap, s); +#endif + vpline(s, ap); + va_end(ap); pline("Program in disorder - perhaps you'd better Quit."); } #ifdef CHDIR static void chdirx(dir, wr) -char *dir; -boolean wr; + char *dir; + boolean wr; { #ifdef SECURE - if(dir /* User specified directory? */ + if (dir /* User specified directory? */ #ifdef HACKDIR - && strcmp(dir, HACKDIR) /* and not the default? */ + && strcmp(dir, HACKDIR) /* and not the default? */ #endif ) { - (void) setuid(getuid()); /* Ron Wessels */ + (void) setuid(getuid()); /* Ron Wessels */ (void) setgid(getgid()); } #endif #ifdef HACKDIR - if(dir == NULL) + if (dir == NULL) dir = HACKDIR; #endif - if(dir && chdir(dir) < 0) { + if (dir && chdir(dir) < 0) { perror(dir); error("Cannot chdir to %s.", dir); } - /* warn the player if he cannot write the record file */ /* perhaps we should also test whether . is writable */ /* unfortunately the access systemcall is worthless */ - if(wr) { - register fd; - - if(dir == NULL) - dir = "."; - if((fd = open(RECORD, 2)) < 0) { - printf("Warning: cannot write %s/%s", dir, RECORD); - getret(); - } else - (void) close(fd); + if (wr) { + int fd; + + if (dir == NULL) + dir = "."; + if ((fd = open(RECORD, 2)) < 0) { + printf("Warning: cannot write %s/%s", dir, RECORD); + getret(); + } else + (void) close(fd); } } #endif +void stop_occupation() { - if(occupation) { + if (occupation) { pline("You stop %s.", occtxt); occupation = 0; } diff --git a/hack/hack.makemon.c b/hack/hack.makemon.c index f7fc0ecb..b2e57fd1 100644 --- a/hack/hack.makemon.c +++ b/hack/hack.makemon.c @@ -1,15 +1,17 @@ +/* $NetBSD: hack.makemon.c,v 1.4 1997/10/19 16:58:17 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.makemon.c,v 1.3 1995/03/23 08:30:38 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.makemon.c,v 1.4 1997/10/19 16:58:17 christos Exp $"); +#endif /* not lint */ #include "hack.h" -extern char fut_geno[]; -extern char *index(); -extern struct obj *mkobj_at(); +#include "extern.h" + struct monst zeromonst; /* @@ -20,184 +22,203 @@ struct monst zeromonst; * In case we make an Orc or killer bee, we make an entire horde (swarm); * note that in this case we return only one of them (the one at [x,y]). */ -struct monst * -makemon(ptr,x,y) -register struct permonst *ptr; +struct monst * +makemon(ptr, x, y) + struct permonst *ptr; { - register struct monst *mtmp; - register tmp, ct; - boolean anything = (!ptr); - extern boolean in_mklev; + struct monst *mtmp; + int tmp, ct; + boolean anything = (!ptr); - if(x != 0 || y != 0) if(m_at(x,y)) return((struct monst *) 0); - if(ptr){ - if(index(fut_geno, ptr->mlet)) return((struct monst *) 0); + if (x != 0 || y != 0) + if (m_at(x, y)) + return ((struct monst *) 0); + if (ptr) { + if (strchr(fut_geno, ptr->mlet)) + return ((struct monst *) 0); } else { ct = CMNUM - strlen(fut_geno); - if(index(fut_geno, 'm')) ct++; /* make only 1 minotaur */ - if(index(fut_geno, '@')) ct++; - if(ct <= 0) return(0); /* no more monsters! */ - tmp = rn2(ct*dlevel/24 + 7); - if(tmp < dlevel - 4) tmp = rn2(ct*dlevel/24 + 12); - if(tmp >= ct) tmp = rn1(ct - ct/2, ct/2); - for(ct = 0; ct < CMNUM; ct++){ + if (strchr(fut_geno, 'm')) + ct++; /* make only 1 minotaur */ + if (strchr(fut_geno, '@')) + ct++; + if (ct <= 0) + return (0); /* no more monsters! */ + tmp = rn2(ct * dlevel / 24 + 7); + if (tmp < dlevel - 4) + tmp = rn2(ct * dlevel / 24 + 12); + if (tmp >= ct) + tmp = rn1(ct - ct / 2, ct / 2); + for (ct = 0; ct < CMNUM; ct++) { ptr = &mons[ct]; - if(index(fut_geno, ptr->mlet)) + if (strchr(fut_geno, ptr->mlet)) continue; - if(!tmp--) goto gotmon; + if (!tmp--) + goto gotmon; } panic("makemon?"); } gotmon: mtmp = newmonst(ptr->pxlth); *mtmp = zeromonst; /* clear all entries in structure */ - for(ct = 0; ct < ptr->pxlth; ct++) + for (ct = 0; ct < ptr->pxlth; ct++) ((char *) &(mtmp->mextra[0]))[ct] = 0; mtmp->nmon = fmon; fmon = mtmp; mtmp->m_id = flags.ident++; mtmp->data = ptr; mtmp->mxlth = ptr->pxlth; - if(ptr->mlet == 'D') mtmp->mhpmax = mtmp->mhp = 80; - else if(!ptr->mlevel) mtmp->mhpmax = mtmp->mhp = rnd(4); - else mtmp->mhpmax = mtmp->mhp = d(ptr->mlevel, 8); + if (ptr->mlet == 'D') + mtmp->mhpmax = mtmp->mhp = 80; + else if (!ptr->mlevel) + mtmp->mhpmax = mtmp->mhp = rnd(4); + else + mtmp->mhpmax = mtmp->mhp = d(ptr->mlevel, 8); mtmp->mx = x; mtmp->my = y; mtmp->mcansee = 1; - if(ptr->mlet == 'M'){ + if (ptr->mlet == 'M') { mtmp->mimic = 1; mtmp->mappearance = ']'; } - if(!in_mklev) { - if(x == u.ux && y == u.uy && ptr->mlet != ' ') + if (!in_mklev) { + if (x == u.ux && y == u.uy && ptr->mlet != ' ') mnexto(mtmp); - if(x == 0 && y == 0) + if (x == 0 && y == 0) rloc(mtmp); } - if(ptr->mlet == 's' || ptr->mlet == 'S') { + if (ptr->mlet == 's' || ptr->mlet == 'S') { mtmp->mhide = mtmp->mundetected = 1; - if(in_mklev) - if(mtmp->mx && mtmp->my) - (void) mkobj_at(0, mtmp->mx, mtmp->my); + if (in_mklev) + if (mtmp->mx && mtmp->my) + (void) mkobj_at(0, mtmp->mx, mtmp->my); } - if(ptr->mlet == ':') { + if (ptr->mlet == ':') { mtmp->cham = 1; - (void) newcham(mtmp, &mons[dlevel+14+rn2(CMNUM-14-dlevel)]); + (void) newcham(mtmp, &mons[dlevel + 14 + rn2(CMNUM - 14 - dlevel)]); } - if(ptr->mlet == 'I' || ptr->mlet == ';') + if (ptr->mlet == 'I' || ptr->mlet == ';') mtmp->minvis = 1; - if(ptr->mlet == 'L' || ptr->mlet == 'N' - || (in_mklev && index("&w;", ptr->mlet) && rn2(5)) - ) mtmp->msleep = 1; + if (ptr->mlet == 'L' || ptr->mlet == 'N' + || (in_mklev && strchr("&w;", ptr->mlet) && rn2(5)) + ) + mtmp->msleep = 1; #ifndef NOWORM - if(ptr->mlet == 'w' && getwn(mtmp)) + if (ptr->mlet == 'w' && getwn(mtmp)) initworm(mtmp); -#endif NOWORM +#endif /* NOWORM */ - if(anything) if(ptr->mlet == 'O' || ptr->mlet == 'k') { - coord enexto(); - coord mm; - register int cnt = rnd(10); - mm.x = x; - mm.y = y; - while(cnt--) { - mm = enexto(mm.x, mm.y); - (void) makemon(ptr, mm.x, mm.y); + if (anything) + if (ptr->mlet == 'O' || ptr->mlet == 'k') { + coord mm; + int cnt = rnd(10); + mm.x = x; + mm.y = y; + while (cnt--) { + mm = enexto(mm.x, mm.y); + (void) makemon(ptr, mm.x, mm.y); + } } - } - - return(mtmp); + return (mtmp); } coord -enexto(xx,yy) -register xchar xx,yy; +enexto(xx, yy) + xchar xx, yy; { - register xchar x,y; - coord foo[15], *tfoo; - int range; + xchar x, y; + coord foo[15], *tfoo; + int range; tfoo = foo; range = 1; - do { /* full kludge action. */ - for(x = xx-range; x <= xx+range; x++) - if(goodpos(x, yy-range)) { + do { /* full kludge action. */ + for (x = xx - range; x <= xx + range; x++) + if (goodpos(x, yy - range)) { tfoo->x = x; - tfoo++->y = yy-range; - if(tfoo == &foo[15]) goto foofull; + tfoo++->y = yy - range; + if (tfoo == &foo[15]) + goto foofull; } - for(x = xx-range; x <= xx+range; x++) - if(goodpos(x,yy+range)) { + for (x = xx - range; x <= xx + range; x++) + if (goodpos(x, yy + range)) { tfoo->x = x; - tfoo++->y = yy+range; - if(tfoo == &foo[15]) goto foofull; + tfoo++->y = yy + range; + if (tfoo == &foo[15]) + goto foofull; } - for(y = yy+1-range; y < yy+range; y++) - if(goodpos(xx-range,y)) { - tfoo->x = xx-range; + for (y = yy + 1 - range; y < yy + range; y++) + if (goodpos(xx - range, y)) { + tfoo->x = xx - range; tfoo++->y = y; - if(tfoo == &foo[15]) goto foofull; + if (tfoo == &foo[15]) + goto foofull; } - for(y = yy+1-range; y < yy+range; y++) - if(goodpos(xx+range,y)) { - tfoo->x = xx+range; + for (y = yy + 1 - range; y < yy + range; y++) + if (goodpos(xx + range, y)) { + tfoo->x = xx + range; tfoo++->y = y; - if(tfoo == &foo[15]) goto foofull; + if (tfoo == &foo[15]) + goto foofull; } range++; - } while(tfoo == foo); + } while (tfoo == foo); foofull: - return( foo[rn2(tfoo-foo)] ); + return (foo[rn2(tfoo - foo)]); } -goodpos(x,y) /* used only in mnexto and rloc */ -{ - return( - ! (x < 1 || x > COLNO-2 || y < 1 || y > ROWNO-2 || - m_at(x,y) || !ACCESSIBLE(levl[x][y].typ) - || (x == u.ux && y == u.uy) - || sobj_at(ENORMOUS_ROCK, x, y) - )); +int +goodpos(x, y) +{ /* used only in mnexto and rloc */ + return ( + !(x < 1 || x > COLNO - 2 || y < 1 || y > ROWNO - 2 || + m_at(x, y) || !ACCESSIBLE(levl[x][y].typ) + || (x == u.ux && y == u.uy) + || sobj_at(ENORMOUS_ROCK, x, y) + )); } +void rloc(mtmp) -struct monst *mtmp; + struct monst *mtmp; { - register tx,ty; - register char ch = mtmp->data->mlet; + int tx, ty; + char ch = mtmp->data->mlet; #ifndef NOWORM - if(ch == 'w' && mtmp->mx) return; /* do not relocate worms */ -#endif NOWORM + if (ch == 'w' && mtmp->mx) + return; /* do not relocate worms */ +#endif /* NOWORM */ do { - tx = rn1(COLNO-3,2); + tx = rn1(COLNO - 3, 2); ty = rn2(ROWNO); - } while(!goodpos(tx,ty)); + } while (!goodpos(tx, ty)); mtmp->mx = tx; mtmp->my = ty; - if(u.ustuck == mtmp){ - if(u.uswallow) { + if (u.ustuck == mtmp) { + if (u.uswallow) { u.ux = tx; u.uy = ty; docrt(); - } else u.ustuck = 0; + } else + u.ustuck = 0; } pmon(mtmp); } -struct monst * -mkmon_at(let,x,y) -char let; -register int x,y; +struct monst * +mkmon_at(let, x, y) + char let; + int x, y; { - register int ct; - register struct permonst *ptr; + int ct; + struct permonst *ptr; - for(ct = 0; ct < CMNUM; ct++) { + for (ct = 0; ct < CMNUM; ct++) { ptr = &mons[ct]; - if(ptr->mlet == let) - return(makemon(ptr,x,y)); + if (ptr->mlet == let) + return (makemon(ptr, x, y)); } - return(0); + return (0); } diff --git a/hack/hack.mfndpos.h b/hack/hack.mfndpos.h index f7c98a3e..5c3f60d3 100644 --- a/hack/hack.mfndpos.h +++ b/hack/hack.mfndpos.h @@ -1,9 +1,10 @@ +/* $NetBSD: hack.mfndpos.h,v 1.4 1997/10/19 16:58:19 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. - * - * $NetBSD: hack.mfndpos.h,v 1.3 1995/03/23 08:30:41 cgd Exp $ */ - +#ifndef _HACK_MFNDPOS_H_ +#define _HACK_MFNDPOS_H_ #define ALLOW_TRAPS 0777 #define ALLOW_U 01000 #define ALLOW_M 02000 @@ -13,3 +14,4 @@ #define ALLOW_ROCK 020000 #define NOTONL 040000 #define NOGARLIC 0100000 +#endif /* _HACK_MFNDPOS_H_ */ diff --git a/hack/hack.mhitu.c b/hack/hack.mhitu.c index 430bfa42..c5749cc1 100644 --- a/hack/hack.mhitu.c +++ b/hack/hack.mhitu.c @@ -1,129 +1,136 @@ +/* $NetBSD: hack.mhitu.c,v 1.4 1997/10/19 16:58:22 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.mhitu.c,v 1.3 1995/03/23 08:30:42 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.mhitu.c,v 1.4 1997/10/19 16:58:22 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -extern struct monst *makemon(); +#include "hack.h" +#include "extern.h" /* * mhitu: monster hits you * returns 1 if monster dies (e.g. 'y', 'F'), 0 otherwise */ +int mhitu(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - register struct permonst *mdat = mtmp->data; - register int tmp, ctmp; + struct permonst *mdat = mtmp->data; + int tmp, ctmp; nomul(0); /* If swallowed, can only be affected by hissers and by u.ustuck */ - if(u.uswallow) { - if(mtmp != u.ustuck) { - if(mdat->mlet == 'c' && !rn2(13)) { + if (u.uswallow) { + if (mtmp != u.ustuck) { + if (mdat->mlet == 'c' && !rn2(13)) { pline("Outside, you hear %s's hissing!", - monnam(mtmp)); + monnam(mtmp)); pline("%s gets turned to stone!", - Monnam(u.ustuck)); + Monnam(u.ustuck)); pline("And the same fate befalls you."); done_in_by(mtmp); /* "notreached": not return(1); */ } - return(0); + return (0); } - switch(mdat->mlet) { /* now mtmp == u.ustuck */ + switch (mdat->mlet) { /* now mtmp == u.ustuck */ case ',': - youswld(mtmp, (u.uac > 0) ? u.uac+4 : 4, + youswld(mtmp, (u.uac > 0) ? u.uac + 4 : 4, 5, "The trapper"); break; case '\'': - youswld(mtmp,rnd(6),7,"The lurker above"); + youswld(mtmp, rnd(6), 7, "The lurker above"); break; case 'P': - youswld(mtmp,d(2,4),12,"The purple worm"); + youswld(mtmp, d(2, 4), 12, "The purple worm"); break; default: /* This is not impossible! */ pline("The mysterious monster totally digests you."); u.uhp = 0; } - if(u.uhp < 1) done_in_by(mtmp); - return(0); + if (u.uhp < 1) + done_in_by(mtmp); + return (0); } - - if(mdat->mlet == 'c' && Stoned) - return(0); + if (mdat->mlet == 'c' && Stoned) + return (0); /* make eels visible the moment they hit/miss us */ - if(mdat->mlet == ';' && mtmp->minvis && cansee(mtmp->mx,mtmp->my)){ + if (mdat->mlet == ';' && mtmp->minvis && cansee(mtmp->mx, mtmp->my)) { mtmp->minvis = 0; pmon(mtmp); } - if(!index("1&DuxynNF",mdat->mlet)) - tmp = hitu(mtmp,d(mdat->damn,mdat->damd)); + if (!strchr("1&DuxynNF", mdat->mlet)) + tmp = hitu(mtmp, d(mdat->damn, mdat->damd)); else tmp = 0; - if(index(UNDEAD, mdat->mlet) && midnight()) - tmp += hitu(mtmp,d(mdat->damn,mdat->damd)); + if (strchr(UNDEAD, mdat->mlet) && midnight()) + tmp += hitu(mtmp, d(mdat->damn, mdat->damd)); ctmp = tmp && !mtmp->mcan && - (!uarm || objects[uarm->otyp].a_can < rnd(3) || !rn2(50)); - switch(mdat->mlet) { + (!uarm || objects[uarm->otyp].a_can < rnd(3) || !rn2(50)); + switch (mdat->mlet) { case '1': - if(wiz_hit(mtmp)) return(1); /* he disappeared */ + if (wiz_hit(mtmp)) + return (1); /* he disappeared */ break; case '&': - if(!mtmp->cham && !mtmp->mcan && !rn2(13)) { - (void) makemon(PM_DEMON,u.ux,u.uy); + if (!mtmp->cham && !mtmp->mcan && !rn2(13)) { + (void) makemon(PM_DEMON, u.ux, u.uy); } else { - (void) hitu(mtmp,d(2,6)); - (void) hitu(mtmp,d(2,6)); - (void) hitu(mtmp,rnd(3)); - (void) hitu(mtmp,rnd(3)); - (void) hitu(mtmp,rn1(4,2)); + (void) hitu(mtmp, d(2, 6)); + (void) hitu(mtmp, d(2, 6)); + (void) hitu(mtmp, rnd(3)); + (void) hitu(mtmp, rnd(3)); + (void) hitu(mtmp, rn1(4, 2)); } break; case ',': - if(tmp) justswld(mtmp,"The trapper"); + if (tmp) + justswld(mtmp, "The trapper"); break; case '\'': - if(tmp) justswld(mtmp, "The lurker above"); + if (tmp) + justswld(mtmp, "The lurker above"); break; case ';': - if(ctmp) { - if(!u.ustuck && !rn2(10)) { + if (ctmp) { + if (!u.ustuck && !rn2(10)) { pline("%s swings itself around you!", - Monnam(mtmp)); + Monnam(mtmp)); u.ustuck = mtmp; - } else if(u.ustuck == mtmp && - levl[mtmp->mx][mtmp->my].typ == POOL) { + } else if (u.ustuck == mtmp && + levl[mtmp->mx][mtmp->my].typ == POOL) { pline("%s drowns you ...", Monnam(mtmp)); done("drowned"); } } break; case 'A': - if(ctmp && rn2(2)) { - if(Poison_resistance) - pline("The sting doesn't seem to affect you."); - else { - pline("You feel weaker!"); - losestr(1); - } + if (ctmp && rn2(2)) { + if (Poison_resistance) + pline("The sting doesn't seem to affect you."); + else { + pline("You feel weaker!"); + losestr(1); + } } break; case 'C': - (void) hitu(mtmp,rnd(6)); + (void) hitu(mtmp, rnd(6)); break; case 'c': - if(!rn2(5)) { + if (!rn2(5)) { pline("You hear %s's hissing!", monnam(mtmp)); - if(ctmp || !rn2(20) || (flags.moonphase == NEW_MOON - && !carrying(DEAD_LIZARD))) { + if (ctmp || !rn2(20) || (flags.moonphase == NEW_MOON + && !carrying(DEAD_LIZARD))) { Stoned = 5; /* pline("You get turned to stone!"); */ /* done_in_by(mtmp); */ @@ -131,238 +138,261 @@ register struct monst *mtmp; } break; case 'D': - if(rn2(6) || mtmp->mcan) { - (void) hitu(mtmp,d(3,10)); - (void) hitu(mtmp,rnd(8)); - (void) hitu(mtmp,rnd(8)); + if (rn2(6) || mtmp->mcan) { + (void) hitu(mtmp, d(3, 10)); + (void) hitu(mtmp, rnd(8)); + (void) hitu(mtmp, rnd(8)); break; } - kludge("%s breathes fire!","The dragon"); - buzz(-1,mtmp->mx,mtmp->my,u.ux-mtmp->mx,u.uy-mtmp->my); + kludge("%s breathes fire!", "The dragon"); + buzz(-1, mtmp->mx, mtmp->my, u.ux - mtmp->mx, u.uy - mtmp->my); break; case 'd': - (void) hitu(mtmp,d(2, (flags.moonphase == FULL_MOON) ? 3 : 4)); + (void) hitu(mtmp, d(2, (flags.moonphase == FULL_MOON) ? 3 : 4)); break; case 'e': - (void) hitu(mtmp,d(3,6)); + (void) hitu(mtmp, d(3, 6)); break; case 'F': - if(mtmp->mcan) break; - kludge("%s explodes!","The freezing sphere"); - if(Cold_resistance) pline("You don't seem affected by it."); + if (mtmp->mcan) + break; + kludge("%s explodes!", "The freezing sphere"); + if (Cold_resistance) + pline("You don't seem affected by it."); else { - xchar dn; - if(17-(u.ulevel/2) > rnd(20)) { + xchar dn; + if (17 - (u.ulevel / 2) > rnd(20)) { pline("You get blasted!"); dn = 6; } else { pline("You duck the blast..."); dn = 3; } - losehp_m(d(dn,6), mtmp); + losehp_m(d(dn, 6), mtmp); } mondead(mtmp); - return(1); + return (1); case 'g': - if(ctmp && multi >= 0 && !rn2(3)) { - kludge("You are frozen by %ss juices","the cube'"); + if (ctmp && multi >= 0 && !rn2(3)) { + kludge("You are frozen by %ss juices", "the cube'"); nomul(-rnd(10)); } break; case 'h': - if(ctmp && multi >= 0 && !rn2(5)) { + if (ctmp && multi >= 0 && !rn2(5)) { nomul(-rnd(10)); kludge("You are put to sleep by %ss bite!", - "the homunculus'"); + "the homunculus'"); } break; case 'j': - tmp = hitu(mtmp,rnd(3)); - tmp &= hitu(mtmp,rnd(3)); - if(tmp){ - (void) hitu(mtmp,rnd(4)); - (void) hitu(mtmp,rnd(4)); + tmp = hitu(mtmp, rnd(3)); + tmp &= hitu(mtmp, rnd(3)); + if (tmp) { + (void) hitu(mtmp, rnd(4)); + (void) hitu(mtmp, rnd(4)); } break; case 'k': - if((hitu(mtmp,rnd(4)) || !rn2(3)) && ctmp){ - poisoned("bee's sting",mdat->mname); + if ((hitu(mtmp, rnd(4)) || !rn2(3)) && ctmp) { + poisoned("bee's sting", mdat->mname); } break; case 'L': - if(tmp) stealgold(mtmp); + if (tmp) + stealgold(mtmp); break; case 'N': - if(mtmp->mcan && !Blind) { - pline("%s tries to seduce you, but you seem not interested.", - Amonnam(mtmp, "plain")); - if(rn2(3)) rloc(mtmp); - } else if(steal(mtmp)) { + if (mtmp->mcan && !Blind) { + pline("%s tries to seduce you, but you seem not interested.", + Amonnam(mtmp, "plain")); + if (rn2(3)) + rloc(mtmp); + } else if (steal(mtmp)) { rloc(mtmp); mtmp->mflee = 1; } break; case 'n': - if(!uwep && !uarm && !uarmh && !uarms && !uarmg) { - pline("%s hits! (I hope you don't mind)", - Monnam(mtmp)); + if (!uwep && !uarm && !uarmh && !uarms && !uarmg) { + pline("%s hits! (I hope you don't mind)", + Monnam(mtmp)); u.uhp += rnd(7); - if(!rn2(7)) u.uhpmax++; - if(u.uhp > u.uhpmax) u.uhp = u.uhpmax; + if (!rn2(7)) + u.uhpmax++; + if (u.uhp > u.uhpmax) + u.uhp = u.uhpmax; flags.botl = 1; - if(!rn2(50)) rloc(mtmp); + if (!rn2(50)) + rloc(mtmp); } else { - (void) hitu(mtmp,d(2,6)); - (void) hitu(mtmp,d(2,6)); + (void) hitu(mtmp, d(2, 6)); + (void) hitu(mtmp, d(2, 6)); } break; case 'o': - tmp = hitu(mtmp,rnd(6)); - if(hitu(mtmp,rnd(6)) && tmp && /* hits with both paws */ + tmp = hitu(mtmp, rnd(6)); + if (hitu(mtmp, rnd(6)) && tmp && /* hits with both paws */ !u.ustuck && rn2(2)) { u.ustuck = mtmp; - kludge("%s has grabbed you!","The owlbear"); - u.uhp -= d(2,8); - } else if(u.ustuck == mtmp) { - u.uhp -= d(2,8); + kludge("%s has grabbed you!", "The owlbear"); + u.uhp -= d(2, 8); + } else if (u.ustuck == mtmp) { + u.uhp -= d(2, 8); pline("You are being crushed."); } break; case 'P': - if(ctmp && !rn2(4)) - justswld(mtmp,"The purple worm"); + if (ctmp && !rn2(4)) + justswld(mtmp, "The purple worm"); else - (void) hitu(mtmp,d(2,4)); + (void) hitu(mtmp, d(2, 4)); break; case 'Q': - (void) hitu(mtmp,rnd(2)); - (void) hitu(mtmp,rnd(2)); + (void) hitu(mtmp, rnd(2)); + (void) hitu(mtmp, rnd(2)); break; case 'R': - if(tmp && uarmh && !uarmh->rustfree && + if (tmp && uarmh && !uarmh->rustfree && (int) uarmh->spe >= -1) { pline("Your helmet rusts!"); uarmh->spe--; - } else - if(ctmp && uarm && !uarm->rustfree && /* Mike Newton */ - uarm->otyp < STUDDED_LEATHER_ARMOR && - (int) uarm->spe >= -1) { + } else if (ctmp && uarm && !uarm->rustfree && /* Mike Newton */ + uarm->otyp < STUDDED_LEATHER_ARMOR && + (int) uarm->spe >= -1) { pline("Your armor rusts!"); uarm->spe--; } break; case 'S': - if(ctmp && !rn2(8)) { - poisoned("snake's bite",mdat->mname); + if (ctmp && !rn2(8)) { + poisoned("snake's bite", mdat->mname); } break; case 's': - if(tmp && !rn2(8)) { - poisoned("scorpion's sting",mdat->mname); + if (tmp && !rn2(8)) { + poisoned("scorpion's sting", mdat->mname); } - (void) hitu(mtmp,rnd(8)); - (void) hitu(mtmp,rnd(8)); + (void) hitu(mtmp, rnd(8)); + (void) hitu(mtmp, rnd(8)); break; case 'T': - (void) hitu(mtmp,rnd(6)); - (void) hitu(mtmp,rnd(6)); + (void) hitu(mtmp, rnd(6)); + (void) hitu(mtmp, rnd(6)); break; case 't': - if(!rn2(5)) rloc(mtmp); + if (!rn2(5)) + rloc(mtmp); break; case 'u': mtmp->mflee = 1; break; case 'U': - (void) hitu(mtmp,d(3,4)); - (void) hitu(mtmp,d(3,4)); + (void) hitu(mtmp, d(3, 4)); + (void) hitu(mtmp, d(3, 4)); break; case 'v': - if(ctmp && !u.ustuck) u.ustuck = mtmp; + if (ctmp && !u.ustuck) + u.ustuck = mtmp; break; case 'V': - if(tmp) u.uhp -= 4; - if(ctmp) losexp(); + if (tmp) + u.uhp -= 4; + if (ctmp) + losexp(); break; case 'W': - if(ctmp) losexp(); + if (ctmp) + losexp(); break; #ifndef NOWORM case 'w': - if(tmp) wormhit(mtmp); -#endif NOWORM + if (tmp) + wormhit(mtmp); +#endif /* NOWORM */ break; case 'X': - (void) hitu(mtmp,rnd(5)); - (void) hitu(mtmp,rnd(5)); - (void) hitu(mtmp,rnd(5)); + (void) hitu(mtmp, rnd(5)); + (void) hitu(mtmp, rnd(5)); + (void) hitu(mtmp, rnd(5)); break; case 'x': - { register long side = rn2(2) ? RIGHT_SIDE : LEFT_SIDE; - pline("%s pricks in your %s leg!", - Monnam(mtmp), (side == RIGHT_SIDE) ? "right" : "left"); - set_wounded_legs(side, rnd(50)); - losehp_m(2, mtmp); - break; + { + long side = rn2(2) ? RIGHT_SIDE : LEFT_SIDE; + pline("%s pricks in your %s leg!", + Monnam(mtmp), (side == RIGHT_SIDE) ? "right" : "left"); + set_wounded_legs(side, rnd(50)); + losehp_m(2, mtmp); + break; } case 'y': - if(mtmp->mcan) break; + if (mtmp->mcan) + break; mondead(mtmp); - if(!Blind) { + if (!Blind) { pline("You are blinded by a blast of light!"); - Blind = d(4,12); + Blind = d(4, 12); seeoff(0); } - return(1); + return (1); case 'Y': - (void) hitu(mtmp,rnd(6)); + (void) hitu(mtmp, rnd(6)); break; } - if(u.uhp < 1) done_in_by(mtmp); - return(0); + if (u.uhp < 1) + done_in_by(mtmp); + return (0); } -hitu(mtmp,dam) -register struct monst *mtmp; -register dam; +int +hitu(mtmp, dam) + struct monst *mtmp; + int dam; { - register tmp, res; + int tmp, res; nomul(0); - if(u.uswallow) return(0); + if (u.uswallow) + return (0); - if(mtmp->mhide && mtmp->mundetected) { + if (mtmp->mhide && mtmp->mundetected) { mtmp->mundetected = 0; - if(!Blind) { - register struct obj *obj; - extern char * Xmonnam(); - if(obj = o_at(mtmp->mx,mtmp->my)) + if (!Blind) { + struct obj *obj; + if ((obj = o_at(mtmp->mx, mtmp->my)) != NULL) pline("%s was hidden under %s!", - Xmonnam(mtmp), doname(obj)); + Xmonnam(mtmp), doname(obj)); } } - tmp = u.uac; /* give people with Ac = -10 at least some vulnerability */ - if(tmp < 0) { - dam += tmp; /* decrease damage */ - if(dam <= 0) dam = 1; + if (tmp < 0) { + dam += tmp; /* decrease damage */ + if (dam <= 0) + dam = 1; tmp = -rn2(-tmp); } tmp += mtmp->data->mlevel; - if(multi < 0) tmp += 4; - if((Invis && mtmp->data->mlet != 'I') || !mtmp->mcansee) tmp -= 2; - if(mtmp->mtrapped) tmp -= 2; - if(tmp <= rnd(20)) { - if(Blind) pline("It misses."); - else pline("%s misses.",Monnam(mtmp)); + if (multi < 0) + tmp += 4; + if ((Invis && mtmp->data->mlet != 'I') || !mtmp->mcansee) + tmp -= 2; + if (mtmp->mtrapped) + tmp -= 2; + if (tmp <= rnd(20)) { + if (Blind) + pline("It misses."); + else + pline("%s misses.", Monnam(mtmp)); res = 0; } else { - if(Blind) pline("It hits!"); - else pline("%s hits!",Monnam(mtmp)); + if (Blind) + pline("It hits!"); + else + pline("%s hits!", Monnam(mtmp)); losehp_m(dam, mtmp); res = 1; } stop_occupation(); - return(res); + return (res); } diff --git a/hack/hack.mklev.c b/hack/hack.mklev.c index 5e8c7b51..49020024 100644 --- a/hack/hack.mklev.c +++ b/hack/hack.mklev.c @@ -1,64 +1,68 @@ +/* $NetBSD: hack.mklev.c,v 1.4 1997/10/19 16:58:24 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.mklev.c,v 1.3 1995/03/23 08:30:43 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.mklev.c,v 1.4 1997/10/19 16:58:24 christos Exp $"); +#endif /* not lint */ +#include <unistd.h> +#include <stdlib.h> #include "hack.h" - -extern char *getlogin(), *getenv(); -extern struct monst *makemon(); -extern struct obj *mkobj_at(); -extern struct trap *maketrap(); +#include "extern.h" #define somex() ((random()%(croom->hx-croom->lx+1))+croom->lx) #define somey() ((random()%(croom->hy-croom->ly+1))+croom->ly) #include "def.mkroom.h" -#define XLIM 4 /* define minimum required space around a room */ +#define XLIM 4 /* define minimum required space around a + * room */ #define YLIM 3 -boolean secret; /* TRUE while making a vault: increase [XY]LIM */ -struct mkroom rooms[MAXNROFROOMS+1]; -int smeq[MAXNROFROOMS+1]; -coord doors[DOORMAX]; -int doorindex; -struct rm zerorm; -int comp(); -schar nxcor; -boolean goldseen; -int nroom; -xchar xdnstair,xupstair,ydnstair,yupstair; +boolean secret; /* TRUE while making a vault: increase + * [XY]LIM */ +struct mkroom rooms[MAXNROFROOMS + 1]; +int smeq[MAXNROFROOMS + 1]; +coord doors[DOORMAX]; +int doorindex; +struct rm zerorm; +schar nxcor; +boolean goldseen; +int nroom; +xchar xdnstair, xupstair, ydnstair, yupstair; /* Definitions used by makerooms() and addrs() */ -#define MAXRS 50 /* max lth of temp rectangle table - arbitrary */ +#define MAXRS 50 /* max lth of temp rectangle table - + * arbitrary */ struct rectangle { - xchar rlx,rly,rhx,rhy; -} rs[MAXRS+1]; -int rscnt,rsmax; /* 0..rscnt-1: currently under consideration */ - /* rscnt..rsmax: discarded */ + xchar rlx, rly, rhx, rhy; +} rs[MAXRS + 1]; +int rscnt, rsmax; /* 0..rscnt-1: currently under consideration */ +/* rscnt..rsmax: discarded */ +void makelevel() { - register struct mkroom *croom, *troom; - register unsigned tryct; - register x,y; + struct mkroom *croom, *troom; + unsigned tryct; + int x, y; nroom = 0; doorindex = 0; rooms[0].hx = -1; /* in case we are in a maze */ - for(x=0; x<COLNO; x++) for(y=0; y<ROWNO; y++) - levl[x][y] = zerorm; + for (x = 0; x < COLNO; x++) + for (y = 0; y < ROWNO; y++) + levl[x][y] = zerorm; - oinit(); /* assign level dependent obj probabilities */ + oinit(); /* assign level dependent obj probabilities */ - if(dlevel >= rn1(3, 26)) { /* there might be several mazes */ + if (dlevel >= rn1(3, 26)) { /* there might be several mazes */ makemaz(); return; } - /* construct the rooms */ nroom = 0; secret = FALSE; @@ -68,38 +72,44 @@ makelevel() croom = &rooms[rn2(nroom)]; xdnstair = somex(); ydnstair = somey(); - levl[xdnstair][ydnstair].scrsym ='>'; + levl[xdnstair][ydnstair].scrsym = '>'; levl[xdnstair][ydnstair].typ = STAIRS; - if(nroom > 1) { + if (nroom > 1) { troom = croom; - croom = &rooms[rn2(nroom-1)]; - if(croom >= troom) croom++; + croom = &rooms[rn2(nroom - 1)]; + if (croom >= troom) + croom++; } xupstair = somex(); /* %% < and > might be in the same place */ yupstair = somey(); - levl[xupstair][yupstair].scrsym ='<'; + levl[xupstair][yupstair].scrsym = '<'; levl[xupstair][yupstair].typ = STAIRS; /* for each room: put things inside */ - for(croom = rooms; croom->hx > 0; croom++) { + for (croom = rooms; croom->hx > 0; croom++) { /* put a sleeping monster inside */ - /* Note: monster may be on the stairs. This cannot be - avoided: maybe the player fell through a trapdoor - while a monster was on the stairs. Conclusion: - we have to check for monsters on the stairs anyway. */ - if(!rn2(3)) (void) - makemon((struct permonst *) 0, somex(), somey()); + /* + * Note: monster may be on the stairs. This cannot be + * avoided: maybe the player fell through a trapdoor while a + * monster was on the stairs. Conclusion: we have to check + * for monsters on the stairs anyway. + */ + if (!rn2(3)) + (void) + makemon((struct permonst *) 0, somex(), somey()); /* put traps and mimics inside */ goldseen = FALSE; - while(!rn2(8-(dlevel/6))) mktrap(0,0,croom); - if(!goldseen && !rn2(3)) mkgold(0L,somex(),somey()); - if(!rn2(3)) { + while (!rn2(8 - (dlevel / 6))) + mktrap(0, 0, croom); + if (!goldseen && !rn2(3)) + mkgold(0L, somex(), somey()); + if (!rn2(3)) { (void) mkobj_at(0, somex(), somey()); tryct = 0; - while(!rn2(5)) { - if(++tryct > 100){ + while (!rn2(5)) { + if (++tryct > 100) { printf("tryct overflow4\n"); break; } @@ -113,57 +123,62 @@ makelevel() make_niches(); /* make a secret treasure vault, not connected to the rest */ - if(nroom <= (2*MAXNROFROOMS/3)) if(rn2(3)) { - troom = &rooms[nroom]; - secret = TRUE; - if(makerooms()) { - troom->rtype = VAULT; /* treasure vault */ - for(x = troom->lx; x <= troom->hx; x++) - for(y = troom->ly; y <= troom->hy; y++) - mkgold((long)(rnd(dlevel*100) + 50), x, y); - if(!rn2(3)) - makevtele(); + if (nroom <= (2 * MAXNROFROOMS / 3)) + if (rn2(3)) { + troom = &rooms[nroom]; + secret = TRUE; + if (makerooms()) { + troom->rtype = VAULT; /* treasure vault */ + for (x = troom->lx; x <= troom->hx; x++) + for (y = troom->ly; y <= troom->hy; y++) + mkgold((long) (rnd(dlevel * 100) + 50), x, y); + if (!rn2(3)) + makevtele(); + } } - } - #ifndef QUEST #ifdef WIZARD - if(wizard && getenv("SHOPTYPE")) mkshop(); else -#endif WIZARD - if(dlevel > 1 && dlevel < 20 && rn2(dlevel) < 3) mkshop(); - else - if(dlevel > 6 && !rn2(7)) mkzoo(ZOO); - else - if(dlevel > 9 && !rn2(5)) mkzoo(BEEHIVE); + if (wizard && getenv("SHOPTYPE")) + mkshop(); else - if(dlevel > 11 && !rn2(6)) mkzoo(MORGUE); - else - if(dlevel > 18 && !rn2(6)) mkswamp(); -#endif QUEST +#endif /* WIZARD */ + if (dlevel > 1 && dlevel < 20 && rn2(dlevel) < 3) + mkshop(); + else if (dlevel > 6 && !rn2(7)) + mkzoo(ZOO); + else if (dlevel > 9 && !rn2(5)) + mkzoo(BEEHIVE); + else if (dlevel > 11 && !rn2(6)) + mkzoo(MORGUE); + else if (dlevel > 18 && !rn2(6)) + mkswamp(); +#endif /* QUEST */ } -makerooms() { -register struct rectangle *rsp; -register int lx, ly, hx, hy, lowx, lowy, hix, hiy, dx, dy; -int tryct = 0, xlim, ylim; +int +makerooms() +{ + struct rectangle *rsp; + int lx, ly, hx, hy, lowx, lowy, hix, hiy, dx, dy; + int tryct = 0, xlim, ylim; /* init */ xlim = XLIM + secret; ylim = YLIM + secret; - if(nroom == 0) { + if (nroom == 0) { rsp = rs; rsp->rlx = rsp->rly = 0; - rsp->rhx = COLNO-1; - rsp->rhy = ROWNO-1; + rsp->rhx = COLNO - 1; + rsp->rhy = ROWNO - 1; rsmax = 1; } rscnt = rsmax; /* make rooms until satisfied */ - while(rscnt > 0 && nroom < MAXNROFROOMS-1) { - if(!secret && nroom > (MAXNROFROOMS/3) && - !rn2((MAXNROFROOMS-nroom)*(MAXNROFROOMS-nroom))) - return(0); + while (rscnt > 0 && nroom < MAXNROFROOMS - 1) { + if (!secret && nroom > (MAXNROFROOMS / 3) && + !rn2((MAXNROFROOMS - nroom) * (MAXNROFROOMS - nroom))) + return (0); /* pick a rectangle */ rsp = &rs[rn2(rscnt)]; @@ -173,20 +188,20 @@ int tryct = 0, xlim, ylim; ly = rsp->rly; /* find size of room */ - if(secret) + if (secret) dx = dy = 1; else { - dx = 2 + rn2((hx-lx-8 > 20) ? 12 : 8); + dx = 2 + rn2((hx - lx - 8 > 20) ? 12 : 8); dy = 2 + rn2(4); - if(dx*dy > 50) - dy = 50/dx; + if (dx * dy > 50) + dy = 50 / dx; } /* look whether our room will fit */ - if(hx-lx < dx + dx/2 + 2*xlim || hy-ly < dy + dy/3 + 2*ylim) { - /* no, too small */ - /* maybe we throw this area out */ - if(secret || !rn2(MAXNROFROOMS+1-nroom-tryct)) { + if (hx - lx < dx + dx / 2 + 2 * xlim || hy - ly < dy + dy / 3 + 2 * ylim) { + /* no, too small */ + /* maybe we throw this area out */ + if (secret || !rn2(MAXNROFROOMS + 1 - nroom - tryct)) { rscnt--; rs[rsmax] = *rsp; *rsp = rs[rscnt]; @@ -196,82 +211,83 @@ int tryct = 0, xlim, ylim; tryct++; continue; } - - lowx = lx + xlim + rn2(hx - lx - dx - 2*xlim + 1); - lowy = ly + ylim + rn2(hy - ly - dy - 2*ylim + 1); + lowx = lx + xlim + rn2(hx - lx - dx - 2 * xlim + 1); + lowy = ly + ylim + rn2(hy - ly - dy - 2 * ylim + 1); hix = lowx + dx; hiy = lowy + dy; - if(maker(lowx, dx, lowy, dy)) { - if(secret) - return(1); - addrs(lowx-1, lowy-1, hix+1, hiy+1); + if (maker(lowx, dx, lowy, dy)) { + if (secret) + return (1); + addrs(lowx - 1, lowy - 1, hix + 1, hiy + 1); tryct = 0; - } else - if(tryct++ > 100) - break; + } else if (tryct++ > 100) + break; } - return(0); /* failed to make vault - very strange */ + return (0); /* failed to make vault - very strange */ } -addrs(lowx,lowy,hix,hiy) -register int lowx,lowy,hix,hiy; +void +addrs(lowx, lowy, hix, hiy) + int lowx, lowy, hix, hiy; { - register struct rectangle *rsp; - register int lx,ly,hx,hy,xlim,ylim; - boolean discarded; + struct rectangle *rsp; + int lx, ly, hx, hy, xlim, ylim; + boolean discarded; xlim = XLIM + secret; ylim = YLIM + secret; /* walk down since rscnt and rsmax change */ - for(rsp = &rs[rsmax-1]; rsp >= rs; rsp--) { - - if((lx = rsp->rlx) > hix || (ly = rsp->rly) > hiy || - (hx = rsp->rhx) < lowx || (hy = rsp->rhy) < lowy) + for (rsp = &rs[rsmax - 1]; rsp >= rs; rsp--) { + + if ((lx = rsp->rlx) > hix || (ly = rsp->rly) > hiy || + (hx = rsp->rhx) < lowx || (hy = rsp->rhy) < lowy) continue; - if((discarded = (rsp >= &rs[rscnt]))) { + if ((discarded = (rsp >= &rs[rscnt]))) { *rsp = rs[--rsmax]; } else { rsmax--; rscnt--; *rsp = rs[rscnt]; - if(rscnt != rsmax) + if (rscnt != rsmax) rs[rscnt] = rs[rsmax]; } - if(lowy - ly > 2*ylim + 4) - addrsx(lx,ly,hx,lowy-2,discarded); - if(lowx - lx > 2*xlim + 4) - addrsx(lx,ly,lowx-2,hy,discarded); - if(hy - hiy > 2*ylim + 4) - addrsx(lx,hiy+2,hx,hy,discarded); - if(hx - hix > 2*xlim + 4) - addrsx(hix+2,ly,hx,hy,discarded); + if (lowy - ly > 2 * ylim + 4) + addrsx(lx, ly, hx, lowy - 2, discarded); + if (lowx - lx > 2 * xlim + 4) + addrsx(lx, ly, lowx - 2, hy, discarded); + if (hy - hiy > 2 * ylim + 4) + addrsx(lx, hiy + 2, hx, hy, discarded); + if (hx - hix > 2 * xlim + 4) + addrsx(hix + 2, ly, hx, hy, discarded); } } -addrsx(lx,ly,hx,hy,discarded) -register int lx,ly,hx,hy; -boolean discarded; /* piece of a discarded area */ +void +addrsx(lx, ly, hx, hy, discarded) + int lx, ly, hx, hy; + boolean discarded; /* piece of a discarded area */ { - register struct rectangle *rsp; + struct rectangle *rsp; /* check inclusions */ - for(rsp = rs; rsp < &rs[rsmax]; rsp++) { - if(lx >= rsp->rlx && hx <= rsp->rhx && - ly >= rsp->rly && hy <= rsp->rhy) + for (rsp = rs; rsp < &rs[rsmax]; rsp++) { + if (lx >= rsp->rlx && hx <= rsp->rhx && + ly >= rsp->rly && hy <= rsp->rhy) return; } /* make a new entry */ - if(rsmax >= MAXRS) { + if (rsmax >= MAXRS) { #ifdef WIZARD - if(wizard) pline("MAXRS may be too small."); -#endif WIZARD + if (wizard) + pline("MAXRS may be too small."); +#endif /* WIZARD */ return; } rsmax++; - if(!discarded) { + if (!discarded) { *rsp = rs[rscnt]; rsp = &rs[rscnt]; rscnt++; @@ -282,123 +298,143 @@ boolean discarded; /* piece of a discarded area */ rsp->rhy = hy; } -comp(x,y) -register struct mkroom *x,*y; +int +comp(vx, vy) + const void *vx, *vy; { - if(x->lx < y->lx) return(-1); - return(x->lx > y->lx); + const struct mkroom *x = vx, *y = vy; + if (x->lx < y->lx) + return (-1); + return (x->lx > y->lx); } coord -finddpos(xl,yl,xh,yh) { - coord ff; - register x,y; +finddpos(xl, yl, xh, yh) +{ + coord ff; + int x, y; - x = (xl == xh) ? xl : (xl + rn2(xh-xl+1)); - y = (yl == yh) ? yl : (yl + rn2(yh-yl+1)); - if(okdoor(x, y)) + x = (xl == xh) ? xl : (xl + rn2(xh - xl + 1)); + y = (yl == yh) ? yl : (yl + rn2(yh - yl + 1)); + if (okdoor(x, y)) goto gotit; - for(x = xl; x <= xh; x++) for(y = yl; y <= yh; y++) - if(okdoor(x, y)) - goto gotit; + for (x = xl; x <= xh; x++) + for (y = yl; y <= yh; y++) + if (okdoor(x, y)) + goto gotit; - for(x = xl; x <= xh; x++) for(y = yl; y <= yh; y++) - if(levl[x][y].typ == DOOR || levl[x][y].typ == SDOOR) - goto gotit; + for (x = xl; x <= xh; x++) + for (y = yl; y <= yh; y++) + if (levl[x][y].typ == DOOR || levl[x][y].typ == SDOOR) + goto gotit; /* cannot find something reasonable -- strange */ x = xl; y = yh; gotit: ff.x = x; ff.y = y; - return(ff); + return (ff); } /* see whether it is allowable to create a door at [x,y] */ -okdoor(x,y) -register x,y; +int +okdoor(x, y) + int x, y; { - if(levl[x-1][y].typ == DOOR || levl[x+1][y].typ == DOOR || - levl[x][y+1].typ == DOOR || levl[x][y-1].typ == DOOR || - levl[x-1][y].typ == SDOOR || levl[x+1][y].typ == SDOOR || - levl[x][y-1].typ == SDOOR || levl[x][y+1].typ == SDOOR || - (levl[x][y].typ != HWALL && levl[x][y].typ != VWALL) || - doorindex >= DOORMAX) - return(0); - return(1); + if (levl[x - 1][y].typ == DOOR || levl[x + 1][y].typ == DOOR || + levl[x][y + 1].typ == DOOR || levl[x][y - 1].typ == DOOR || + levl[x - 1][y].typ == SDOOR || levl[x + 1][y].typ == SDOOR || + levl[x][y - 1].typ == SDOOR || levl[x][y + 1].typ == SDOOR || + (levl[x][y].typ != HWALL && levl[x][y].typ != VWALL) || + doorindex >= DOORMAX) + return (0); + return (1); } -dodoor(x,y,aroom) -register x,y; -register struct mkroom *aroom; +void +dodoor(x, y, aroom) + int x, y; + struct mkroom *aroom; { - if(doorindex >= DOORMAX) { + if (doorindex >= DOORMAX) { impossible("DOORMAX exceeded?"); return; } - if(!okdoor(x,y) && nxcor) + if (!okdoor(x, y) && nxcor) return; - dosdoor(x,y,aroom,rn2(8) ? DOOR : SDOOR); + dosdoor(x, y, aroom, rn2(8) ? DOOR : SDOOR); } -dosdoor(x,y,aroom,type) -register x,y; -register struct mkroom *aroom; -register type; +void +dosdoor(x, y, aroom, type) + int x, y; + struct mkroom *aroom; + int type; { - register struct mkroom *broom; - register tmp; + struct mkroom *broom; + int tmp; - if(!IS_WALL(levl[x][y].typ)) /* avoid SDOORs with '+' as scrsym */ + if (!IS_WALL(levl[x][y].typ)) /* avoid SDOORs with '+' as scrsym */ type = DOOR; levl[x][y].typ = type; - if(type == DOOR) + if (type == DOOR) levl[x][y].scrsym = '+'; aroom->doorct++; - broom = aroom+1; - if(broom->hx < 0) tmp = doorindex; else - for(tmp = doorindex; tmp > broom->fdoor; tmp--) - doors[tmp] = doors[tmp-1]; + broom = aroom + 1; + if (broom->hx < 0) + tmp = doorindex; + else + for (tmp = doorindex; tmp > broom->fdoor; tmp--) + doors[tmp] = doors[tmp - 1]; doorindex++; doors[tmp].x = x; doors[tmp].y = y; - for( ; broom->hx >= 0; broom++) broom->fdoor++; + for (; broom->hx >= 0; broom++) + broom->fdoor++; } /* Only called from makerooms() */ -maker(lowx,ddx,lowy,ddy) -schar lowx,ddx,lowy,ddy; +int +maker(lowx, ddx, lowy, ddy) + schar lowx, ddx, lowy, ddy; { - register struct mkroom *croom; - register x, y, hix = lowx+ddx, hiy = lowy+ddy; - register xlim = XLIM + secret, ylim = YLIM + secret; - - if(nroom >= MAXNROFROOMS) return(0); - if(lowx < XLIM) lowx = XLIM; - if(lowy < YLIM) lowy = YLIM; - if(hix > COLNO-XLIM-1) hix = COLNO-XLIM-1; - if(hiy > ROWNO-YLIM-1) hiy = ROWNO-YLIM-1; + struct mkroom *croom; + int x, y, hix = lowx + ddx, hiy = lowy + ddy; + int xlim = XLIM + secret, ylim = YLIM + secret; + + if (nroom >= MAXNROFROOMS) + return (0); + if (lowx < XLIM) + lowx = XLIM; + if (lowy < YLIM) + lowy = YLIM; + if (hix > COLNO - XLIM - 1) + hix = COLNO - XLIM - 1; + if (hiy > ROWNO - YLIM - 1) + hiy = ROWNO - YLIM - 1; chk: - if(hix <= lowx || hiy <= lowy) return(0); + if (hix <= lowx || hiy <= lowy) + return (0); /* check area around room (and make room smaller if necessary) */ - for(x = lowx - xlim; x <= hix + xlim; x++) { - for(y = lowy - ylim; y <= hiy + ylim; y++) { - if(levl[x][y].typ) { + for (x = lowx - xlim; x <= hix + xlim; x++) { + for (y = lowy - ylim; y <= hiy + ylim; y++) { + if (levl[x][y].typ) { #ifdef WIZARD - if(wizard && !secret) - pline("Strange area [%d,%d] in maker().",x,y); -#endif WIZARD - if(!rn2(3)) return(0); - if(x < lowx) - lowx = x+xlim+1; + if (wizard && !secret) + pline("Strange area [%d,%d] in maker().", x, y); +#endif /* WIZARD */ + if (!rn2(3)) + return (0); + if (x < lowx) + lowx = x + xlim + 1; else - hix = x-xlim-1; - if(y < lowy) - lowy = y+ylim+1; + hix = x - xlim - 1; + if (y < lowy) + lowy = y + ylim + 1; else - hiy = y-ylim-1; + hiy = y - ylim - 1; goto chk; } } @@ -408,9 +444,9 @@ chk: /* on low levels the room is lit (usually) */ /* secret vaults are always lit */ - if((rnd(dlevel) < 10 && rn2(77)) || (ddx == 1 && ddy == 1)) { - for(x = lowx-1; x <= hix+1; x++) - for(y = lowy-1; y <= hiy+1; y++) + if ((rnd(dlevel) < 10 && rn2(77)) || (ddx == 1 && ddy == 1)) { + for (x = lowx - 1; x <= hix + 1; x++) + for (y = lowy - 1; y <= hiy + 1; y++) levl[x][y].lit = 1; croom->rlit = 1; } else @@ -421,293 +457,310 @@ chk: croom->hy = hiy; croom->rtype = croom->doorct = croom->fdoor = 0; - for(x = lowx-1; x <= hix+1; x++) - for(y = lowy-1; y <= hiy+1; y += (hiy-lowy+2)) { - levl[x][y].scrsym = '-'; - levl[x][y].typ = HWALL; - } - for(x = lowx-1; x <= hix+1; x += (hix-lowx+2)) - for(y = lowy; y <= hiy; y++) { - levl[x][y].scrsym = '|'; - levl[x][y].typ = VWALL; - } - for(x = lowx; x <= hix; x++) - for(y = lowy; y <= hiy; y++) { - levl[x][y].scrsym = '.'; - levl[x][y].typ = ROOM; - } + for (x = lowx - 1; x <= hix + 1; x++) + for (y = lowy - 1; y <= hiy + 1; y += (hiy - lowy + 2)) { + levl[x][y].scrsym = '-'; + levl[x][y].typ = HWALL; + } + for (x = lowx - 1; x <= hix + 1; x += (hix - lowx + 2)) + for (y = lowy; y <= hiy; y++) { + levl[x][y].scrsym = '|'; + levl[x][y].typ = VWALL; + } + for (x = lowx; x <= hix; x++) + for (y = lowy; y <= hiy; y++) { + levl[x][y].scrsym = '.'; + levl[x][y].typ = ROOM; + } smeq[nroom] = nroom; croom++; croom->hx = -1; nroom++; - return(1); + return (1); } -makecorridors() { - register a,b; +void +makecorridors() +{ + int a, b; nxcor = 0; - for(a = 0; a < nroom-1; a++) - join(a, a+1); - for(a = 0; a < nroom-2; a++) - if(smeq[a] != smeq[a+2]) - join(a, a+2); - for(a = 0; a < nroom; a++) - for(b = 0; b < nroom; b++) - if(smeq[a] != smeq[b]) - join(a, b); - if(nroom > 2) - for(nxcor = rn2(nroom) + 4; nxcor; nxcor--) { - a = rn2(nroom); - b = rn2(nroom-2); - if(b >= a) b += 2; - join(a, b); - } + for (a = 0; a < nroom - 1; a++) + join(a, a + 1); + for (a = 0; a < nroom - 2; a++) + if (smeq[a] != smeq[a + 2]) + join(a, a + 2); + for (a = 0; a < nroom; a++) + for (b = 0; b < nroom; b++) + if (smeq[a] != smeq[b]) + join(a, b); + if (nroom > 2) + for (nxcor = rn2(nroom) + 4; nxcor; nxcor--) { + a = rn2(nroom); + b = rn2(nroom - 2); + if (b >= a) + b += 2; + join(a, b); + } } -join(a,b) -register a,b; +void +join(a, b) + int a, b; { - coord cc,tt; - register tx, ty, xx, yy; - register struct rm *crm; - register struct mkroom *croom, *troom; - register dx, dy, dix, diy, cct; + coord cc, tt; + int tx, ty, xx, yy; + struct rm *crm; + struct mkroom *croom, *troom; + int dx, dy, dix, diy, cct; croom = &rooms[a]; troom = &rooms[b]; - /* find positions cc and tt for doors in croom and troom - and direction for a corridor between them */ + /* + * find positions cc and tt for doors in croom and troom and + * direction for a corridor between them + */ - if(troom->hx < 0 || croom->hx < 0 || doorindex >= DOORMAX) return; - if(troom->lx > croom->hx) { + if (troom->hx < 0 || croom->hx < 0 || doorindex >= DOORMAX) + return; + if (troom->lx > croom->hx) { dx = 1; dy = 0; - xx = croom->hx+1; - tx = troom->lx-1; - cc = finddpos(xx,croom->ly,xx,croom->hy); - tt = finddpos(tx,troom->ly,tx,troom->hy); - } else if(troom->hy < croom->ly) { + xx = croom->hx + 1; + tx = troom->lx - 1; + cc = finddpos(xx, croom->ly, xx, croom->hy); + tt = finddpos(tx, troom->ly, tx, troom->hy); + } else if (troom->hy < croom->ly) { dy = -1; dx = 0; - yy = croom->ly-1; - cc = finddpos(croom->lx,yy,croom->hx,yy); - ty = troom->hy+1; - tt = finddpos(troom->lx,ty,troom->hx,ty); - } else if(troom->hx < croom->lx) { + yy = croom->ly - 1; + cc = finddpos(croom->lx, yy, croom->hx, yy); + ty = troom->hy + 1; + tt = finddpos(troom->lx, ty, troom->hx, ty); + } else if (troom->hx < croom->lx) { dx = -1; dy = 0; - xx = croom->lx-1; - tx = troom->hx+1; - cc = finddpos(xx,croom->ly,xx,croom->hy); - tt = finddpos(tx,troom->ly,tx,troom->hy); + xx = croom->lx - 1; + tx = troom->hx + 1; + cc = finddpos(xx, croom->ly, xx, croom->hy); + tt = finddpos(tx, troom->ly, tx, troom->hy); } else { dy = 1; dx = 0; - yy = croom->hy+1; - ty = troom->ly-1; - cc = finddpos(croom->lx,yy,croom->hx,yy); - tt = finddpos(troom->lx,ty,troom->hx,ty); + yy = croom->hy + 1; + ty = troom->ly - 1; + cc = finddpos(croom->lx, yy, croom->hx, yy); + tt = finddpos(troom->lx, ty, troom->hx, ty); } xx = cc.x; yy = cc.y; tx = tt.x - dx; ty = tt.y - dy; - if(nxcor && levl[xx+dx][yy+dy].typ) + if (nxcor && levl[xx + dx][yy + dy].typ) return; - dodoor(xx,yy,croom); + dodoor(xx, yy, croom); cct = 0; - while(xx != tx || yy != ty) { - xx += dx; - yy += dy; - - /* loop: dig corridor at [xx,yy] and find new [xx,yy] */ - if(cct++ > 500 || (nxcor && !rn2(35))) - return; - - if(xx == COLNO-1 || xx == 0 || yy == 0 || yy == ROWNO-1) - return; /* impossible */ - - crm = &levl[xx][yy]; - if(!(crm->typ)) { - if(rn2(100)) { - crm->typ = CORR; - crm->scrsym = CORR_SYM; - if(nxcor && !rn2(50)) - (void) mkobj_at(ROCK_SYM, xx, yy); - } else { - crm->typ = SCORR; - crm->scrsym = ' '; - } - } else - if(crm->typ != CORR && crm->typ != SCORR) { - /* strange ... */ - return; - } + while (xx != tx || yy != ty) { + xx += dx; + yy += dy; - /* find next corridor position */ - dix = abs(xx-tx); - diy = abs(yy-ty); + /* loop: dig corridor at [xx,yy] and find new [xx,yy] */ + if (cct++ > 500 || (nxcor && !rn2(35))) + return; - /* do we have to change direction ? */ - if(dy && dix > diy) { - register ddx = (xx > tx) ? -1 : 1; + if (xx == COLNO - 1 || xx == 0 || yy == 0 || yy == ROWNO - 1) + return; /* impossible */ - crm = &levl[xx+ddx][yy]; - if(!crm->typ || crm->typ == CORR || crm->typ == SCORR) { - dx = ddx; - dy = 0; - continue; + crm = &levl[xx][yy]; + if (!(crm->typ)) { + if (rn2(100)) { + crm->typ = CORR; + crm->scrsym = CORR_SYM; + if (nxcor && !rn2(50)) + (void) mkobj_at(ROCK_SYM, xx, yy); + } else { + crm->typ = SCORR; + crm->scrsym = ' '; + } + } else if (crm->typ != CORR && crm->typ != SCORR) { + /* strange ... */ + return; } - } else if(dx && diy > dix) { - register ddy = (yy > ty) ? -1 : 1; - - crm = &levl[xx][yy+ddy]; - if(!crm->typ || crm->typ == CORR || crm->typ == SCORR) { - dy = ddy; - dx = 0; - continue; + /* find next corridor position */ + dix = abs(xx - tx); + diy = abs(yy - ty); + + /* do we have to change direction ? */ + if (dy && dix > diy) { + int ddx = (xx > tx) ? -1 : 1; + + crm = &levl[xx + ddx][yy]; + if (!crm->typ || crm->typ == CORR || crm->typ == SCORR) { + dx = ddx; + dy = 0; + continue; + } + } else if (dx && diy > dix) { + int ddy = (yy > ty) ? -1 : 1; + + crm = &levl[xx][yy + ddy]; + if (!crm->typ || crm->typ == CORR || crm->typ == SCORR) { + dy = ddy; + dx = 0; + continue; + } } - } - - /* continue straight on? */ - crm = &levl[xx+dx][yy+dy]; - if(!crm->typ || crm->typ == CORR || crm->typ == SCORR) - continue; + /* continue straight on? */ + crm = &levl[xx + dx][yy + dy]; + if (!crm->typ || crm->typ == CORR || crm->typ == SCORR) + continue; - /* no, what must we do now?? */ - if(dx) { - dx = 0; - dy = (ty < yy) ? -1 : 1; - crm = &levl[xx+dx][yy+dy]; - if(!crm->typ || crm->typ == CORR || crm->typ == SCORR) - continue; - dy = -dy; - continue; - } else { - dy = 0; - dx = (tx < xx) ? -1 : 1; - crm = &levl[xx+dx][yy+dy]; - if(!crm->typ || crm->typ == CORR || crm->typ == SCORR) - continue; - dx = -dx; - continue; - } + /* no, what must we do now?? */ + if (dx) { + dx = 0; + dy = (ty < yy) ? -1 : 1; + crm = &levl[xx + dx][yy + dy]; + if (!crm->typ || crm->typ == CORR || crm->typ == SCORR) + continue; + dy = -dy; + continue; + } else { + dy = 0; + dx = (tx < xx) ? -1 : 1; + crm = &levl[xx + dx][yy + dy]; + if (!crm->typ || crm->typ == CORR || crm->typ == SCORR) + continue; + dx = -dx; + continue; + } } /* we succeeded in digging the corridor */ dodoor(tt.x, tt.y, troom); - if(smeq[a] < smeq[b]) + if (smeq[a] < smeq[b]) smeq[b] = smeq[a]; else smeq[a] = smeq[b]; } +void make_niches() { - register int ct = rnd(nroom/2 + 1); - while(ct--) makeniche(FALSE); + int ct = rnd(nroom / 2 + 1); + while (ct--) + makeniche(FALSE); } +void makevtele() { makeniche(TRUE); } +void makeniche(with_trap) -boolean with_trap; + boolean with_trap; { - register struct mkroom *aroom; - register struct rm *rm; - register int vct = 8; - coord dd; - register dy,xx,yy; - register struct trap *ttmp; - - if(doorindex < DOORMAX) - while(vct--) { - aroom = &rooms[rn2(nroom-1)]; - if(aroom->rtype != 0) continue; /* not an ordinary room */ - if(aroom->doorct == 1 && rn2(5)) continue; - if(rn2(2)) { - dy = 1; - dd = finddpos(aroom->lx,aroom->hy+1,aroom->hx,aroom->hy+1); - } else { - dy = -1; - dd = finddpos(aroom->lx,aroom->ly-1,aroom->hx,aroom->ly-1); - } - xx = dd.x; - yy = dd.y; - if((rm = &levl[xx][yy+dy])->typ) continue; - if(with_trap || !rn2(4)) { - rm->typ = SCORR; - rm->scrsym = ' '; - if(with_trap) { - ttmp = maketrap(xx, yy+dy, TELEP_TRAP); - ttmp->once = 1; - make_engr_at(xx, yy-dy, "ad ae?ar um"); - } - dosdoor(xx, yy, aroom, SDOOR); - } else { - rm->typ = CORR; - rm->scrsym = CORR_SYM; - if(rn2(7)) - dosdoor(xx, yy, aroom, rn2(5) ? SDOOR : DOOR); - else { - mksobj_at(SCR_TELEPORTATION, xx, yy+dy); - if(!rn2(3)) (void) mkobj_at(0, xx, yy+dy); + struct mkroom *aroom; + struct rm *rm; + int vct = 8; + coord dd; + int dy, xx, yy; + struct trap *ttmp; + + if (doorindex < DOORMAX) + while (vct--) { + aroom = &rooms[rn2(nroom - 1)]; + if (aroom->rtype != 0) + continue; /* not an ordinary room */ + if (aroom->doorct == 1 && rn2(5)) + continue; + if (rn2(2)) { + dy = 1; + dd = finddpos(aroom->lx, aroom->hy + 1, aroom->hx, aroom->hy + 1); + } else { + dy = -1; + dd = finddpos(aroom->lx, aroom->ly - 1, aroom->hx, aroom->ly - 1); + } + xx = dd.x; + yy = dd.y; + if ((rm = &levl[xx][yy + dy])->typ) + continue; + if (with_trap || !rn2(4)) { + rm->typ = SCORR; + rm->scrsym = ' '; + if (with_trap) { + ttmp = maketrap(xx, yy + dy, TELEP_TRAP); + ttmp->once = 1; + make_engr_at(xx, yy - dy, "ad ae?ar um"); + } + dosdoor(xx, yy, aroom, SDOOR); + } else { + rm->typ = CORR; + rm->scrsym = CORR_SYM; + if (rn2(7)) + dosdoor(xx, yy, aroom, rn2(5) ? SDOOR : DOOR); + else { + mksobj_at(SCR_TELEPORTATION, xx, yy + dy); + if (!rn2(3)) + (void) mkobj_at(0, xx, yy + dy); + } + } + return; } - } - return; - } } /* make a trap somewhere (in croom if mazeflag = 0) */ -mktrap(num,mazeflag,croom) -register num,mazeflag; -register struct mkroom *croom; +void +mktrap(num, mazeflag, croom) + int num, mazeflag; + struct mkroom *croom; { - register struct trap *ttmp; - register int kind,nopierc,nomimic,fakedoor,fakegold,tryct = 0; - register xchar mx,my; - extern char fut_geno[]; + struct trap *ttmp; + int kind, nopierc, nomimic, fakedoor, fakegold, tryct = 0; + xchar mx, my; - if(!num || num >= TRAPNUM) { + if (!num || num >= TRAPNUM) { nopierc = (dlevel < 4) ? 1 : 0; - nomimic = (dlevel < 9 || goldseen ) ? 1 : 0; - if(index(fut_geno, 'M')) nomimic = 1; + nomimic = (dlevel < 9 || goldseen) ? 1 : 0; + if (strchr(fut_geno, 'M')) + nomimic = 1; kind = rn2(TRAPNUM - nopierc - nomimic); /* note: PIERC = 7, MIMIC = 8, TRAPNUM = 9 */ - } else kind = num; + } else + kind = num; - if(kind == MIMIC) { - register struct monst *mtmp; + if (kind == MIMIC) { + struct monst *mtmp; fakedoor = (!rn2(3) && !mazeflag); fakegold = (!fakedoor && !rn2(2)); - if(fakegold) goldseen = TRUE; + if (fakegold) + goldseen = TRUE; do { - if(++tryct > 200) return; - if(fakedoor) { + if (++tryct > 200) + return; + if (fakedoor) { /* note: fakedoor maybe on actual door */ - if(rn2(2)){ - if(rn2(2)) - mx = croom->hx+1; - else mx = croom->lx-1; + if (rn2(2)) { + if (rn2(2)) + mx = croom->hx + 1; + else + mx = croom->lx - 1; my = somey(); } else { - if(rn2(2)) - my = croom->hy+1; - else my = croom->ly-1; + if (rn2(2)) + my = croom->hy + 1; + else + my = croom->ly - 1; mx = somex(); } - } else if(mazeflag) { - extern coord mazexy(); - coord mm; + } else if (mazeflag) { + coord mm; mm = mazexy(); mx = mm.x; my = mm.y; @@ -715,23 +768,21 @@ register struct mkroom *croom; mx = somex(); my = somey(); } - } while(m_at(mx,my) || levl[mx][my].typ == STAIRS); - if(mtmp = makemon(PM_MIMIC,mx,my)) { - mtmp->mimic = 1; - mtmp->mappearance = - fakegold ? '$' : fakedoor ? '+' : - (mazeflag && rn2(2)) ? AMULET_SYM : - "=/)%?![<>" [ rn2(9) ]; + } while (m_at(mx, my) || levl[mx][my].typ == STAIRS); + if ((mtmp = makemon(PM_MIMIC, mx, my)) != NULL) { + mtmp->mimic = 1; + mtmp->mappearance = + fakegold ? '$' : fakedoor ? '+' : + (mazeflag && rn2(2)) ? AMULET_SYM : + "=/)%?![<>"[rn2(9)]; } return; } - do { - if(++tryct > 200) + if (++tryct > 200) return; - if(mazeflag){ - extern coord mazexy(); - coord mm; + if (mazeflag) { + coord mm; mm = mazexy(); mx = mm.x; my = mm.y; @@ -739,8 +790,8 @@ register struct mkroom *croom; mx = somex(); my = somey(); } - } while(t_at(mx, my) || levl[mx][my].typ == STAIRS); + } while (t_at(mx, my) || levl[mx][my].typ == STAIRS); ttmp = maketrap(mx, my, kind); - if(mazeflag && !rn2(10) && ttmp->ttyp < PIERC) + if (mazeflag && !rn2(10) && ttmp->ttyp < PIERC) ttmp->tseen = 1; } diff --git a/hack/hack.mkmaze.c b/hack/hack.mkmaze.c index f69fe864..bb894202 100644 --- a/hack/hack.mkmaze.c +++ b/hack/hack.mkmaze.c @@ -1,62 +1,65 @@ +/* $NetBSD: hack.mkmaze.c,v 1.4 1997/10/19 16:58:27 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.mkmaze.c,v 1.3 1995/03/23 08:30:46 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.mkmaze.c,v 1.4 1997/10/19 16:58:27 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" #include "def.mkroom.h" /* not really used */ -extern struct monst *makemon(); -extern struct permonst pm_wizard; -extern struct obj *mkobj_at(); -extern coord mazexy(); struct permonst hell_hound = - { "hell hound", 'd', 12, 14, 2, 3, 6, 0 }; +{"hell hound", 'd', 12, 14, 2, 3, 6, 0}; +void makemaz() { - int x,y; - register zx,zy; - coord mm; - boolean al = (dlevel >= 30 && !flags.made_amulet); + int x, y; + int zx, zy; + coord mm; + boolean al = (dlevel >= 30 && !flags.made_amulet); - for(x = 2; x < COLNO-1; x++) - for(y = 2; y < ROWNO-1; y++) - levl[x][y].typ = (x%2 && y%2) ? 0 : HWALL; - if(al) { - register struct monst *mtmp; + for (x = 2; x < COLNO - 1; x++) + for (y = 2; y < ROWNO - 1; y++) + levl[x][y].typ = (x % 2 && y % 2) ? 0 : HWALL; + if (al) { + struct monst *mtmp; - zx = 2*(COLNO/4) - 1; - zy = 2*(ROWNO/4) - 1; - for(x = zx-2; x < zx+4; x++) for(y = zy-2; y <= zy+2; y++) { - levl[x][y].typ = - (y == zy-2 || y == zy+2 || x == zx-2 || x == zx+3) ? POOL : - (y == zy-1 || y == zy+1 || x == zx-1 || x == zx+2) ? HWALL: - ROOM; - } - (void) mkobj_at(AMULET_SYM, zx, zy); - flags.made_amulet = 1; - walkfrom(zx+4, zy); - if(mtmp = makemon(&hell_hound, zx, zy)) - mtmp->msleep = 1; - if(mtmp = makemon(PM_WIZARD, zx+1, zy)) { - mtmp->msleep = 1; - flags.no_of_wizards = 1; - } + zx = 2 * (COLNO / 4) - 1; + zy = 2 * (ROWNO / 4) - 1; + for (x = zx - 2; x < zx + 4; x++) + for (y = zy - 2; y <= zy + 2; y++) { + levl[x][y].typ = + (y == zy - 2 || y == zy + 2 || x == zx - 2 || x == zx + 3) ? POOL : + (y == zy - 1 || y == zy + 1 || x == zx - 1 || x == zx + 2) ? HWALL : + ROOM; + } + (void) mkobj_at(AMULET_SYM, zx, zy); + flags.made_amulet = 1; + walkfrom(zx + 4, zy); + if ((mtmp = makemon(&hell_hound, zx, zy)) != NULL) + mtmp->msleep = 1; + if ((mtmp = makemon(PM_WIZARD, zx + 1, zy)) != NULL) { + mtmp->msleep = 1; + flags.no_of_wizards = 1; + } } else { - mm = mazexy(); - zx = mm.x; - zy = mm.y; - walkfrom(zx,zy); - (void) mksobj_at(WAN_WISHING, zx, zy); - (void) mkobj_at(ROCK_SYM, zx, zy); /* put a rock on top of it */ + mm = mazexy(); + zx = mm.x; + zy = mm.y; + walkfrom(zx, zy); + (void) mksobj_at(WAN_WISHING, zx, zy); + (void) mkobj_at(ROCK_SYM, zx, zy); /* put a rock on top of + * it */ } - for(x = 2; x < COLNO-1; x++) - for(y = 2; y < ROWNO-1; y++) { - switch(levl[x][y].typ) { + for (x = 2; x < COLNO - 1; x++) + for (y = 2; y < ROWNO - 1; y++) { + switch (levl[x][y].typ) { case HWALL: levl[x][y].scrsym = '-'; break; @@ -65,77 +68,93 @@ makemaz() break; } } - for(x = rn1(8,11); x; x--) { + for (x = rn1(8, 11); x; x--) { mm = mazexy(); (void) mkobj_at(rn2(2) ? GEM_SYM : 0, mm.x, mm.y); } - for(x = rn1(10,2); x; x--) { + for (x = rn1(10, 2); x; x--) { mm = mazexy(); (void) mkobj_at(ROCK_SYM, mm.x, mm.y); } mm = mazexy(); (void) makemon(PM_MINOTAUR, mm.x, mm.y); - for(x = rn1(5,7); x; x--) { + for (x = rn1(5, 7); x; x--) { mm = mazexy(); (void) makemon((struct permonst *) 0, mm.x, mm.y); } - for(x = rn1(6,7); x; x--) { + for (x = rn1(6, 7); x; x--) { mm = mazexy(); - mkgold(0L,mm.x,mm.y); + mkgold(0L, mm.x, mm.y); } - for(x = rn1(6,7); x; x--) - mktrap(0,1,(struct mkroom *) 0); + for (x = rn1(6, 7); x; x--) + mktrap(0, 1, (struct mkroom *) 0); mm = mazexy(); levl[(xupstair = mm.x)][(yupstair = mm.y)].scrsym = '<'; levl[xupstair][yupstair].typ = STAIRS; xdnstair = ydnstair = 0; } -walkfrom(x,y) int x,y; { -register int q,a,dir; -int dirs[4]; +void +walkfrom(x, y) + int x, y; +{ + int q, a, dir; + int dirs[4]; levl[x][y].typ = ROOM; - while(1) { + while (1) { q = 0; - for(a = 0; a < 4; a++) - if(okay(x,y,a)) dirs[q++]= a; - if(!q) return; + for (a = 0; a < 4; a++) + if (okay(x, y, a)) + dirs[q++] = a; + if (!q) + return; dir = dirs[rn2(q)]; - move(&x,&y,dir); + move(&x, &y, dir); levl[x][y].typ = ROOM; - move(&x,&y,dir); - walkfrom(x,y); + move(&x, &y, dir); + walkfrom(x, y); } } -move(x,y,dir) -register int *x, *y; -register int dir; +void +move(x, y, dir) + int *x, *y; + int dir; { - switch(dir){ - case 0: --(*y); break; - case 1: (*x)++; break; - case 2: (*y)++; break; - case 3: --(*x); break; + switch (dir) { + case 0: + --(*y); + break; + case 1: + (*x)++; + break; + case 2: + (*y)++; + break; + case 3: + --(*x); + break; } } -okay(x,y,dir) -int x,y; -register int dir; +int +okay(x, y, dir) + int x, y; + int dir; { - move(&x,&y,dir); - move(&x,&y,dir); - if(x<3 || y<3 || x>COLNO-3 || y>ROWNO-3 || levl[x][y].typ != 0) - return(0); + move(&x, &y, dir); + move(&x, &y, dir); + if (x < 3 || y < 3 || x > COLNO - 3 || y > ROWNO - 3 || levl[x][y].typ != 0) + return (0); else - return(1); + return (1); } coord -mazexy(){ - coord mm; - mm.x = 3 + 2*rn2(COLNO/2 - 2); - mm.y = 3 + 2*rn2(ROWNO/2 - 2); +mazexy() +{ + coord mm; + mm.x = 3 + 2 * rn2(COLNO / 2 - 2); + mm.y = 3 + 2 * rn2(ROWNO / 2 - 2); return mm; } diff --git a/hack/hack.mkobj.c b/hack/hack.mkobj.c index d4e37fd7..39d4804f 100644 --- a/hack/hack.mkobj.c +++ b/hack/hack.mkobj.c @@ -1,60 +1,66 @@ +/* $NetBSD: hack.mkobj.c,v 1.4 1997/10/19 16:58:29 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.mkobj.c,v 1.3 1995/03/23 08:30:47 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.mkobj.c,v 1.4 1997/10/19 16:58:29 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" -char mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%"; -struct obj *mkobj(), *mksobj(); +char mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%"; -struct obj * -mkobj_at(let,x,y) -register let,x,y; +struct obj * +mkobj_at(let, x, y) + int let, x, y; { - register struct obj *otmp = mkobj(let); + struct obj *otmp = mkobj(let); otmp->ox = x; otmp->oy = y; otmp->nobj = fobj; fobj = otmp; - return(otmp); + return (otmp); } -mksobj_at(otyp,x,y) -register otyp,x,y; +void +mksobj_at(otyp, x, y) + int otyp, x, y; { - register struct obj *otmp = mksobj(otyp); + struct obj *otmp = mksobj(otyp); otmp->ox = x; otmp->oy = y; otmp->nobj = fobj; fobj = otmp; } -struct obj * -mkobj(let) { - if(!let) +struct obj * +mkobj(let) + int let; +{ + if (!let) let = mkobjstr[rn2(sizeof(mkobjstr) - 1)]; - return( - mksobj( - letter(let) ? - CORPSE + ((let > 'Z') ? (let-'a'+'Z'-'@'+1) : (let-'@')) - : probtype(let) - ) - ); + return ( + mksobj( + letter(let) ? + CORPSE + ((let > 'Z') ? (let - 'a' + 'Z' - '@' + 1) : (let - '@')) + : probtype(let) + ) + ); } - -struct obj zeroobj; -struct obj * +struct obj zeroobj; + +struct obj * mksobj(otyp) -register otyp; + int otyp; { - register struct obj *otmp; - char let = objects[otyp].oc_olet; + struct obj *otmp; + char let = objects[otyp].oc_olet; otmp = newobj(0); *otmp = zeroobj; @@ -63,23 +69,25 @@ register otyp; otmp->quan = 1; otmp->olet = let; otmp->otyp = otyp; - otmp->dknown = index("/=!?*", let) ? 0 : 1; - switch(let) { + otmp->dknown = strchr("/=!?*", let) ? 0 : 1; + switch (let) { case WEAPON_SYM: - otmp->quan = (otmp->otyp <= ROCK) ? rn1(6,6) : 1; - if(!rn2(11)) otmp->spe = rnd(3); - else if(!rn2(10)) { + otmp->quan = (otmp->otyp <= ROCK) ? rn1(6, 6) : 1; + if (!rn2(11)) + otmp->spe = rnd(3); + else if (!rn2(10)) { otmp->cursed = 1; otmp->spe = -rnd(3); } break; case FOOD_SYM: - if(otmp->otyp >= CORPSE) break; + if (otmp->otyp >= CORPSE) + break; #ifdef NOT_YET_IMPLEMENTED /* if tins are to be identified, need to adapt doname() etc */ - if(otmp->otyp == TIN) + if (otmp->otyp == TIN) otmp->spe = rnd(...); -#endif NOT_YET_IMPLEMENTED +#endif /* NOT_YET_IMPLEMENTED */ /* fall into next case */ case GEM_SYM: otmp->quan = rn2(6) ? 1 : 2; @@ -92,54 +100,64 @@ register otyp; case AMULET_SYM: break; case ARMOR_SYM: - if(!rn2(8)) otmp->cursed = 1; - if(!rn2(10)) otmp->spe = rnd(3); - else if(!rn2(9)) { + if (!rn2(8)) + otmp->cursed = 1; + if (!rn2(10)) + otmp->spe = rnd(3); + else if (!rn2(9)) { otmp->spe = -rnd(3); otmp->cursed = 1; } break; case WAND_SYM: - if(otmp->otyp == WAN_WISHING) otmp->spe = 3; else - otmp->spe = rn1(5, - (objects[otmp->otyp].bits & NODIR) ? 11 : 4); + if (otmp->otyp == WAN_WISHING) + otmp->spe = 3; + else + otmp->spe = rn1(5, + (objects[otmp->otyp].bits & NODIR) ? 11 : 4); break; case RING_SYM: - if(objects[otmp->otyp].bits & SPEC) { - if(!rn2(3)) { + if (objects[otmp->otyp].bits & SPEC) { + if (!rn2(3)) { otmp->cursed = 1; otmp->spe = -rnd(2); - } else otmp->spe = rnd(2); - } else if(otmp->otyp == RIN_TELEPORTATION || - otmp->otyp == RIN_AGGRAVATE_MONSTER || - otmp->otyp == RIN_HUNGER || !rn2(9)) + } else + otmp->spe = rnd(2); + } else if (otmp->otyp == RIN_TELEPORTATION || + otmp->otyp == RIN_AGGRAVATE_MONSTER || + otmp->otyp == RIN_HUNGER || !rn2(9)) otmp->cursed = 1; break; default: panic("impossible mkobj"); } otmp->owt = weight(otmp); - return(otmp); + return (otmp); } -letter(c) { - return(('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z')); +int +letter(c) + int c; +{ + return (('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z')); } +int weight(obj) -register struct obj *obj; + struct obj *obj; { -register int wt = objects[obj->otyp].oc_weight; - return(wt ? wt*obj->quan : (obj->quan + 1)/2); + int wt = objects[obj->otyp].oc_weight; + return (wt ? wt * obj->quan : (obj->quan + 1) / 2); } -mkgold(num,x,y) -register long num; +void +mkgold(num, x, y) + long num; { - register struct gold *gold; - register long amount = (num ? num : 1 + (rnd(dlevel+2) * rnd(30))); + struct gold *gold; + long amount = (num ? num : 1 + (rnd(dlevel + 2) * rnd(30))); - if(gold = g_at(x,y)) + if ((gold = g_at(x, y)) != NULL) gold->amount += amount; else { gold = newgold(); diff --git a/hack/hack.mkshop.c b/hack/hack.mkshop.c index 4ecc92af..c6d8eb61 100644 --- a/hack/hack.mkshop.c +++ b/hack/hack.mkshop.c @@ -1,111 +1,123 @@ +/* $NetBSD: hack.mkshop.c,v 1.5 1997/10/19 16:58:31 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.mkshop.c,v 1.4 1995/03/23 08:30:50 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.mkshop.c,v 1.5 1997/10/19 16:58:31 christos Exp $"); +#endif /* not lint */ #include <stdlib.h> #ifndef QUEST #include "hack.h" +#include "extern.h" #include "def.mkroom.h" #include "def.eshk.h" #define ESHK ((struct eshk *)(&(shk->mextra[0]))) -extern struct monst *makemon(); -extern struct obj *mkobj_at(); -extern int nroom; -extern char shtypes[]; /* = "=/)%?!["; 8 types: 7 specialized, 1 mixed */ -schar shprobs[] = { 3,3,5,5,10,10,14,50 }; /* their probabilities */ +schar shprobs[] = {3, 3, 5, 5, 10, 10, 14, 50}; /* their probabilities */ -mkshop(){ -register struct mkroom *sroom; -register int sh,sx,sy,i = -1; -register char let; -int roomno; -register struct monst *shk; +void +mkshop() +{ + struct mkroom *sroom; + int sh, sx, sy, i = -1; + char let; + int roomno; + struct monst *shk; #ifdef WIZARD /* first determine shoptype */ - if(wizard){ - register char *ep = getenv("SHOPTYPE"); - if(ep){ - if(*ep == 'z' || *ep == 'Z'){ + if (wizard) { + char *ep = getenv("SHOPTYPE"); + if (ep) { + if (*ep == 'z' || *ep == 'Z') { mkzoo(ZOO); return; } - if(*ep == 'm' || *ep == 'M'){ + if (*ep == 'm' || *ep == 'M') { mkzoo(MORGUE); return; } - if(*ep == 'b' || *ep == 'B'){ + if (*ep == 'b' || *ep == 'B') { mkzoo(BEEHIVE); return; } - if(*ep == 's' || *ep == 'S'){ + if (*ep == 's' || *ep == 'S') { mkswamp(); return; } - for(i=0; shtypes[i]; i++) - if(*ep == shtypes[i]) break; + for (i = 0; shtypes[i]; i++) + if (*ep == shtypes[i]) + break; goto gottype; } } gottype: -#endif WIZARD - for(sroom = &rooms[0], roomno = 0; ; sroom++, roomno++){ - if(sroom->hx < 0) return; - if(sroom - rooms >= nroom) { +#endif /* WIZARD */ + for (sroom = &rooms[0], roomno = 0;; sroom++, roomno++) { + if (sroom->hx < 0) + return; + if (sroom - rooms >= nroom) { pline("rooms not closed by -1?"); return; } - if(sroom->rtype) continue; - if(!sroom->rlit || has_dnstairs(sroom) || has_upstairs(sroom)) + if (sroom->rtype) + continue; + if (!sroom->rlit || has_dnstairs(sroom) || has_upstairs(sroom)) continue; - if( + if ( #ifdef WIZARD - (wizard && getenv("SHOPTYPE") && sroom->doorct != 0) || -#endif WIZARD - sroom->doorct <= 2 && sroom->doorct > 0) break; + (wizard && getenv("SHOPTYPE") && sroom->doorct != 0) || +#endif /* WIZARD */ + (sroom->doorct <= 2 && sroom->doorct > 0)) + break; } - if(i < 0) { /* shoptype not yet determined */ - register int j; + if (i < 0) { /* shoptype not yet determined */ + int j; - for(j = rn2(100), i = 0; (j -= shprobs[i])>= 0; i++) - if(!shtypes[i]) break; /* superfluous */ - if(isbig(sroom) && i + SHOPBASE == WANDSHOP) - i = GENERAL-SHOPBASE; + for (j = rn2(100), i = 0; (j -= shprobs[i]) >= 0; i++) + if (!shtypes[i]) + break; /* superfluous */ + if (isbig(sroom) && i + SHOPBASE == WANDSHOP) + i = GENERAL - SHOPBASE; } sroom->rtype = i + SHOPBASE; let = shtypes[i]; sh = sroom->fdoor; sx = doors[sh].x; sy = doors[sh].y; - if(sx == sroom->lx-1) sx++; else - if(sx == sroom->hx+1) sx--; else - if(sy == sroom->ly-1) sy++; else - if(sy == sroom->hy+1) sy--; else { + if (sx == sroom->lx - 1) + sx++; + else if (sx == sroom->hx + 1) + sx--; + else if (sy == sroom->ly - 1) + sy++; + else if (sy == sroom->hy + 1) + sy--; + else { #ifdef WIZARD - /* This is said to happen sometimes, but I've never seen it. */ - if(wizard) { - register int j = sroom->doorct; - extern int doorindex; + /* This is said to happen sometimes, but I've never seen it. */ + if (wizard) { + int j = sroom->doorct; - pline("Where is shopdoor?"); - pline("Room at (%d,%d),(%d,%d).", sroom->lx, sroom->ly, - sroom->hx, sroom->hy); - pline("doormax=%d doorct=%d fdoor=%d", - doorindex, sroom->doorct, sh); - while(j--) { - pline("door [%d,%d]", doors[sh].x, doors[sh].y); - sh++; + pline("Where is shopdoor?"); + pline("Room at (%d,%d),(%d,%d).", sroom->lx, sroom->ly, + sroom->hx, sroom->hy); + pline("doormax=%d doorct=%d fdoor=%d", + doorindex, sroom->doorct, sh); + while (j--) { + pline("door [%d,%d]", doors[sh].x, doors[sh].y); + sh++; + } + more(); } - more(); - } -#endif WIZARD - return; +#endif /* WIZARD */ + return; } - if(!(shk = makemon(PM_SHK,sx,sy))) return; + if (!(shk = makemon(PM_SHK, sx, sy))) + return; shk->isshk = shk->mpeaceful = 1; shk->msleep = 0; shk->mtrapseen = ~0; /* we know all the traps already */ @@ -117,163 +129,183 @@ gottype: ESHK->robbed = 0; ESHK->visitct = 0; ESHK->following = 0; - shk->mgold = 1000 + 30*rnd(100); /* initial capital */ + shk->mgold = 1000 + 30 * rnd(100); /* initial capital */ ESHK->billct = 0; findname(ESHK->shknam, let); - for(sx = sroom->lx; sx <= sroom->hx; sx++) - for(sy = sroom->ly; sy <= sroom->hy; sy++){ - register struct monst *mtmp; - if((sx == sroom->lx && doors[sh].x == sx-1) || - (sx == sroom->hx && doors[sh].x == sx+1) || - (sy == sroom->ly && doors[sh].y == sy-1) || - (sy == sroom->hy && doors[sh].y == sy+1)) continue; - if(rn2(100) < dlevel && !m_at(sx,sy) && - (mtmp = makemon(PM_MIMIC, sx, sy))){ - mtmp->mimic = 1; - mtmp->mappearance = - (let && rn2(10) < dlevel) ? let : ']'; - continue; + for (sx = sroom->lx; sx <= sroom->hx; sx++) + for (sy = sroom->ly; sy <= sroom->hy; sy++) { + struct monst *mtmp; + if ((sx == sroom->lx && doors[sh].x == sx - 1) || + (sx == sroom->hx && doors[sh].x == sx + 1) || + (sy == sroom->ly && doors[sh].y == sy - 1) || + (sy == sroom->hy && doors[sh].y == sy + 1)) + continue; + if (rn2(100) < dlevel && !m_at(sx, sy) && + (mtmp = makemon(PM_MIMIC, sx, sy))) { + mtmp->mimic = 1; + mtmp->mappearance = + (let && rn2(10) < dlevel) ? let : ']'; + continue; + } + (void) mkobj_at(let, sx, sy); } - (void) mkobj_at(let, sx, sy); - } } +void mkzoo(type) -int type; + int type; { - register struct mkroom *sroom; - register struct monst *mon; - register int sh,sx,sy,i; - int goldlim = 500 * dlevel; - int moct = 0; - struct permonst *morguemon(); + struct mkroom *sroom; + struct monst *mon; + int sh, sx, sy, i; + int goldlim = 500 * dlevel; + int moct = 0; i = nroom; - for(sroom = &rooms[rn2(nroom)]; ; sroom++) { - if(sroom == &rooms[nroom]) + for (sroom = &rooms[rn2(nroom)];; sroom++) { + if (sroom == &rooms[nroom]) sroom = &rooms[0]; - if(!i-- || sroom->hx < 0) + if (!i-- || sroom->hx < 0) return; - if(sroom->rtype) + if (sroom->rtype) continue; - if(type == MORGUE && sroom->rlit) + if (type == MORGUE && sroom->rlit) continue; - if(has_upstairs(sroom) || (has_dnstairs(sroom) && rn2(3))) + if (has_upstairs(sroom) || (has_dnstairs(sroom) && rn2(3))) continue; - if(sroom->doorct == 1 || !rn2(5)) + if (sroom->doorct == 1 || !rn2(5)) break; } sroom->rtype = type; sh = sroom->fdoor; - for(sx = sroom->lx; sx <= sroom->hx; sx++) - for(sy = sroom->ly; sy <= sroom->hy; sy++){ - if((sx == sroom->lx && doors[sh].x == sx-1) || - (sx == sroom->hx && doors[sh].x == sx+1) || - (sy == sroom->ly && doors[sh].y == sy-1) || - (sy == sroom->hy && doors[sh].y == sy+1)) continue; - mon = makemon( - (type == MORGUE) ? morguemon() : - (type == BEEHIVE) ? PM_KILLER_BEE : (struct permonst *) 0, - sx, sy); - if(mon) mon->msleep = 1; - switch(type) { - case ZOO: - i = sq(dist2(sx,sy,doors[sh].x,doors[sh].y)); - if(i >= goldlim) i = 5*dlevel; - goldlim -= i; - mkgold((long)(10 + rn2(i)), sx, sy); - break; - case MORGUE: - /* Usually there is one dead body in the morgue */ - if(!moct && rn2(3)) { - mksobj_at(CORPSE, sx, sy); - moct++; - } - break; - case BEEHIVE: - if(!rn2(3)) mksobj_at(LUMP_OF_ROYAL_JELLY, sx, sy); - break; + for (sx = sroom->lx; sx <= sroom->hx; sx++) + for (sy = sroom->ly; sy <= sroom->hy; sy++) { + if ((sx == sroom->lx && doors[sh].x == sx - 1) || + (sx == sroom->hx && doors[sh].x == sx + 1) || + (sy == sroom->ly && doors[sh].y == sy - 1) || + (sy == sroom->hy && doors[sh].y == sy + 1)) + continue; + mon = makemon( + (type == MORGUE) ? morguemon() : + (type == BEEHIVE) ? PM_KILLER_BEE : (struct permonst *) 0, + sx, sy); + if (mon) + mon->msleep = 1; + switch (type) { + case ZOO: + i = sq(dist2(sx, sy, doors[sh].x, doors[sh].y)); + if (i >= goldlim) + i = 5 * dlevel; + goldlim -= i; + mkgold((long) (10 + rn2(i)), sx, sy); + break; + case MORGUE: + /* + * Usually there is one dead body in the + * morgue + */ + if (!moct && rn2(3)) { + mksobj_at(CORPSE, sx, sy); + moct++; + } + break; + case BEEHIVE: + if (!rn2(3)) + mksobj_at(LUMP_OF_ROYAL_JELLY, sx, sy); + break; + } } - } } struct permonst * morguemon() { - extern struct permonst pm_ghost; - register int i = rn2(100), hd = rn2(dlevel); + int i = rn2(100), hd = rn2(dlevel); - if(hd > 10 && i < 10) return(PM_DEMON); - if(hd > 8 && i > 85) return(PM_VAMPIRE); - return((i < 40) ? PM_GHOST : (i < 60) ? PM_WRAITH : PM_ZOMBIE); + if (hd > 10 && i < 10) + return (PM_DEMON); + if (hd > 8 && i > 85) + return (PM_VAMPIRE); + return ((i < 40) ? PM_GHOST : (i < 60) ? PM_WRAITH : PM_ZOMBIE); } -mkswamp() /* Michiel Huisjes & Fred de Wilde */ -{ - register struct mkroom *sroom; - register int sx,sy,i,eelct = 0; - extern struct permonst pm_eel; +void +mkswamp() +{ /* Michiel Huisjes & Fred de Wilde */ + struct mkroom *sroom; + int sx, sy, i, eelct = 0; - for(i=0; i<5; i++) { /* 5 tries */ + for (i = 0; i < 5; i++) { /* 5 tries */ sroom = &rooms[rn2(nroom)]; - if(sroom->hx < 0 || sroom->rtype || - has_upstairs(sroom) || has_dnstairs(sroom)) + if (sroom->hx < 0 || sroom->rtype || + has_upstairs(sroom) || has_dnstairs(sroom)) continue; /* satisfied; make a swamp */ sroom->rtype = SWAMP; - for(sx = sroom->lx; sx <= sroom->hx; sx++) - for(sy = sroom->ly; sy <= sroom->hy; sy++) - if((sx+sy)%2 && !o_at(sx,sy) && !t_at(sx,sy) - && !m_at(sx,sy) && !nexttodoor(sx,sy)){ - levl[sx][sy].typ = POOL; - levl[sx][sy].scrsym = POOL_SYM; - if(!eelct || !rn2(4)) { - (void) makemon(PM_EEL, sx, sy); - eelct++; - } - } + for (sx = sroom->lx; sx <= sroom->hx; sx++) + for (sy = sroom->ly; sy <= sroom->hy; sy++) + if ((sx + sy) % 2 && !o_at(sx, sy) && !t_at(sx, sy) + && !m_at(sx, sy) && !nexttodoor(sx, sy)) { + levl[sx][sy].typ = POOL; + levl[sx][sy].scrsym = POOL_SYM; + if (!eelct || !rn2(4)) { + (void) makemon(PM_EEL, sx, sy); + eelct++; + } + } } } -nexttodoor(sx,sy) -register sx,sy; +int +nexttodoor(sx, sy) + int sx, sy; { - register dx,dy; - register struct rm *lev; - for(dx = -1; dx <= 1; dx++) for(dy = -1; dy <= 1; dy++) - if((lev = &levl[sx+dx][sy+dy])->typ == DOOR || - lev->typ == SDOOR || lev->typ == LDOOR) - return(1); - return(0); + int dx, dy; + struct rm *lev; + for (dx = -1; dx <= 1; dx++) + for (dy = -1; dy <= 1; dy++) + if ((lev = &levl[sx + dx][sy + dy])->typ == DOOR || + lev->typ == SDOOR || lev->typ == LDOOR) + return (1); + return (0); } +int has_dnstairs(sroom) -register struct mkroom *sroom; + struct mkroom *sroom; { - return(sroom->lx <= xdnstair && xdnstair <= sroom->hx && - sroom->ly <= ydnstair && ydnstair <= sroom->hy); + return (sroom->lx <= xdnstair && xdnstair <= sroom->hx && + sroom->ly <= ydnstair && ydnstair <= sroom->hy); } +int has_upstairs(sroom) -register struct mkroom *sroom; + struct mkroom *sroom; { - return(sroom->lx <= xupstair && xupstair <= sroom->hx && - sroom->ly <= yupstair && yupstair <= sroom->hy); + return (sroom->lx <= xupstair && xupstair <= sroom->hx && + sroom->ly <= yupstair && yupstair <= sroom->hy); } +int isbig(sroom) -register struct mkroom *sroom; + struct mkroom *sroom; { - register int area = (sroom->hx - sroom->lx) * (sroom->hy - sroom->ly); - return( area > 20 ); + int area = (sroom->hx - sroom->lx) * (sroom->hy - sroom->ly); + return (area > 20); } -dist2(x0,y0,x1,y1){ - return((x0-x1)*(x0-x1) + (y0-y1)*(y0-y1)); +int +dist2(x0, y0, x1, y1) + int x0, y0, x1, y1; +{ + return ((x0 - x1) * (x0 - x1) + (y0 - y1) * (y0 - y1)); } -sq(a) int a; { - return(a*a); +int +sq(a) + int a; +{ + return (a * a); } -#endif QUEST +#endif /* QUEST */ diff --git a/hack/hack.mon.c b/hack/hack.mon.c index de3ddb3c..df37d3a9 100644 --- a/hack/hack.mon.c +++ b/hack/hack.mon.c @@ -1,122 +1,131 @@ +/* $NetBSD: hack.mon.c,v 1.4 1997/10/19 16:58:34 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.mon.c,v 1.3 1995/03/23 08:30:57 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.mon.c,v 1.4 1997/10/19 16:58:34 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" +#include "extern.h" #include "hack.mfndpos.h" #ifndef NULL #define NULL (char *) 0 #endif -extern struct monst *makemon(); -extern struct obj *mkobj_at(); - -int warnlevel; /* used by movemon and dochugw */ -long lastwarntime; -int lastwarnlev; -char *warnings[] = { +int warnlevel; /* used by movemon and dochugw */ +long lastwarntime; +int lastwarnlev; +char *warnings[] = { "white", "pink", "red", "ruby", "purple", "black" }; +void movemon() { - register struct monst *mtmp; - register int fr; + struct monst *mtmp; + int fr; warnlevel = 0; - while(1) { + while (1) { /* find a monster that we haven't treated yet */ - /* note that mtmp or mtmp->nmon might get killed - while mtmp moves, so we cannot just walk down the - chain (even new monsters might get created!) */ - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->mlstmv < moves) goto next_mon; + /* + * note that mtmp or mtmp->nmon might get killed while mtmp + * moves, so we cannot just walk down the chain (even new + * monsters might get created!) + */ + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->mlstmv < moves) + goto next_mon; /* treated all monsters */ break; - next_mon: +next_mon: mtmp->mlstmv = moves; /* most monsters drown in pools */ - { boolean inpool, iseel; - - inpool = (levl[mtmp->mx][mtmp->my].typ == POOL); - iseel = (mtmp->data->mlet == ';'); - if(inpool && !iseel) { - if(cansee(mtmp->mx,mtmp->my)) - pline("%s drowns.", Monnam(mtmp)); - mondead(mtmp); - continue; - } - /* but eels have a difficult time outside */ - if(iseel && !inpool) { - if(mtmp->mhp > 1) mtmp->mhp--; - mtmp->mflee = 1; - mtmp->mfleetim += 2; - } + { + boolean inpool, iseel; + + inpool = (levl[mtmp->mx][mtmp->my].typ == POOL); + iseel = (mtmp->data->mlet == ';'); + if (inpool && !iseel) { + if (cansee(mtmp->mx, mtmp->my)) + pline("%s drowns.", Monnam(mtmp)); + mondead(mtmp); + continue; + } + /* but eels have a difficult time outside */ + if (iseel && !inpool) { + if (mtmp->mhp > 1) + mtmp->mhp--; + mtmp->mflee = 1; + mtmp->mfleetim += 2; + } } - if(mtmp->mblinded && !--mtmp->mblinded) + if (mtmp->mblinded && !--mtmp->mblinded) mtmp->mcansee = 1; - if(mtmp->mfleetim && !--mtmp->mfleetim) + if (mtmp->mfleetim && !--mtmp->mfleetim) mtmp->mflee = 0; - if(mtmp->mimic) continue; - if(mtmp->mspeed != MSLOW || !(moves%2)){ + if (mtmp->mimic) + continue; + if (mtmp->mspeed != MSLOW || !(moves % 2)) { /* continue if the monster died fighting */ fr = -1; - if(Conflict && cansee(mtmp->mx,mtmp->my) - && (fr = fightm(mtmp)) == 2) + if (Conflict && cansee(mtmp->mx, mtmp->my) + && (fr = fightm(mtmp)) == 2) continue; - if(fr<0 && dochugw(mtmp)) + if (fr < 0 && dochugw(mtmp)) continue; } - if(mtmp->mspeed == MFAST && dochugw(mtmp)) + if (mtmp->mspeed == MFAST && dochugw(mtmp)) continue; } warnlevel -= u.ulevel; - if(warnlevel >= SIZE(warnings)) - warnlevel = SIZE(warnings)-1; - if(warnlevel >= 0) - if(warnlevel > lastwarnlev || moves > lastwarntime + 5){ - register char *rr; - switch(Warning & (LEFT_RING | RIGHT_RING)){ - case LEFT_RING: - rr = "Your left ring glows"; - break; - case RIGHT_RING: - rr = "Your right ring glows"; - break; - case LEFT_RING | RIGHT_RING: - rr = "Both your rings glow"; - break; - default: - rr = "Your fingertips glow"; - break; - } - pline("%s %s!", rr, warnings[warnlevel]); - lastwarntime = moves; - lastwarnlev = warnlevel; - } - - dmonsfree(); /* remove all dead monsters */ + if (warnlevel >= SIZE(warnings)) + warnlevel = SIZE(warnings) - 1; + if (warnlevel >= 0) + if (warnlevel > lastwarnlev || moves > lastwarntime + 5) { + char *rr; + switch (Warning & (LEFT_RING | RIGHT_RING)) { + case LEFT_RING: + rr = "Your left ring glows"; + break; + case RIGHT_RING: + rr = "Your right ring glows"; + break; + case LEFT_RING | RIGHT_RING: + rr = "Both your rings glow"; + break; + default: + rr = "Your fingertips glow"; + break; + } + pline("%s %s!", rr, warnings[warnlevel]); + lastwarntime = moves; + lastwarnlev = warnlevel; + } + dmonsfree(); /* remove all dead monsters */ } -justswld(mtmp,name) -register struct monst *mtmp; -char *name; +void +justswld(mtmp, name) + struct monst *mtmp; + char *name; { mtmp->mx = u.ux; mtmp->my = u.uy; u.ustuck = mtmp; pmon(mtmp); - kludge("%s swallows you!",name); + kludge("%s swallows you!", name); more(); seeoff(1); u.uswallow = 1; @@ -124,529 +133,604 @@ char *name; swallowed(); } -youswld(mtmp,dam,die,name) -register struct monst *mtmp; -register dam,die; -char *name; +void +youswld(mtmp, dam, die, name) + struct monst *mtmp; + int dam, die; + char *name; { - if(mtmp != u.ustuck) return; - kludge("%s digests you!",name); + if (mtmp != u.ustuck) + return; + kludge("%s digests you!", name); u.uhp -= dam; - if(u.uswldtim++ >= die){ /* a3 */ + if (u.uswldtim++ >= die) { /* a3 */ pline("It totally digests you!"); u.uhp = -1; } - if(u.uhp < 1) done_in_by(mtmp); - /* flags.botlx = 1; /* should we show status line ? */ + if (u.uhp < 1) + done_in_by(mtmp); +#if 0 + flags.botlx = 1; /* should we show status line ? */ +#endif } -dochugw(mtmp) register struct monst *mtmp; { -register x = mtmp->mx; -register y = mtmp->my; -register d = dochug(mtmp); -register dd; - if(!d) /* monster still alive */ - if(Warning) - if(!mtmp->mpeaceful) - if(mtmp->data->mlevel > warnlevel) - if((dd = dist(mtmp->mx,mtmp->my)) < dist(x,y)) - if(dd < 100) - if(!canseemon(mtmp)) - warnlevel = mtmp->data->mlevel; - return(d); +int +dochugw(mtmp) + struct monst *mtmp; +{ + int x = mtmp->mx; + int y = mtmp->my; + int d = dochug(mtmp); + int dd; + if (!d) /* monster still alive */ + if (Warning) + if (!mtmp->mpeaceful) + if (mtmp->data->mlevel > warnlevel) + if ((dd = dist(mtmp->mx, mtmp->my)) < dist(x, y)) + if (dd < 100) + if (!canseemon(mtmp)) + warnlevel = mtmp->data->mlevel; + return (d); } /* returns 1 if monster died moving, 0 otherwise */ +int dochug(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - register struct permonst *mdat; - register tmp, nearby, scared; + struct permonst *mdat; + int tmp = 0, nearby, scared; - if(mtmp->cham && !rn2(6)) - (void) newcham(mtmp, &mons[dlevel+14+rn2(CMNUM-14-dlevel)]); + if (mtmp->cham && !rn2(6)) + (void) newcham(mtmp, &mons[dlevel + 14 + rn2(CMNUM - 14 - dlevel)]); mdat = mtmp->data; - if(mdat->mlevel < 0) - panic("bad monster %c (%d)",mdat->mlet,mdat->mlevel); + if (mdat->mlevel < 0) + panic("bad monster %c (%d)", mdat->mlet, mdat->mlevel); /* regenerate monsters */ - if((!(moves%20) || index(MREGEN, mdat->mlet)) && + if ((!(moves % 20) || strchr(MREGEN, mdat->mlet)) && mtmp->mhp < mtmp->mhpmax) mtmp->mhp++; - if(mtmp->mfroz) return(0); /* frozen monsters don't do anything */ + if (mtmp->mfroz) + return (0); /* frozen monsters don't do anything */ - if(mtmp->msleep) { + if (mtmp->msleep) { /* wake up, or get out of here. */ /* ettins are hard to surprise */ /* Nymphs and Leprechauns do not easily wake up */ - if(cansee(mtmp->mx,mtmp->my) && - (!Stealth || (mdat->mlet == 'e' && rn2(10))) && - (!index("NL",mdat->mlet) || !rn2(50)) && - (Aggravate_monster || index("d1", mdat->mlet) - || (!rn2(7) && !mtmp->mimic))) + if (cansee(mtmp->mx, mtmp->my) && + (!Stealth || (mdat->mlet == 'e' && rn2(10))) && + (!strchr("NL", mdat->mlet) || !rn2(50)) && + (Aggravate_monster || strchr("d1", mdat->mlet) + || (!rn2(7) && !mtmp->mimic))) mtmp->msleep = 0; - else return(0); + else + return (0); } - /* not frozen or sleeping: wipe out texts written in the dust */ wipe_engr_at(mtmp->mx, mtmp->my, 1); /* confused monsters get unconfused with small probability */ - if(mtmp->mconf && !rn2(50)) mtmp->mconf = 0; + if (mtmp->mconf && !rn2(50)) + mtmp->mconf = 0; /* some monsters teleport */ - if(mtmp->mflee && index("tNL", mdat->mlet) && !rn2(40)){ + if (mtmp->mflee && strchr("tNL", mdat->mlet) && !rn2(40)) { rloc(mtmp); - return(0); + return (0); } - if(mdat->mmove < rnd(6)) return(0); + if (mdat->mmove < rnd(6)) + return (0); /* fleeing monsters might regain courage */ - if(mtmp->mflee && !mtmp->mfleetim + if (mtmp->mflee && !mtmp->mfleetim && mtmp->mhp == mtmp->mhpmax && !rn2(25)) mtmp->mflee = 0; nearby = (dist(mtmp->mx, mtmp->my) < 3); scared = (nearby && (sengr_at("Elbereth", u.ux, u.uy) || - sobj_at(SCR_SCARE_MONSTER, u.ux, u.uy))); - if(scared && !mtmp->mflee) { + sobj_at(SCR_SCARE_MONSTER, u.ux, u.uy))); + if (scared && !mtmp->mflee) { mtmp->mflee = 1; mtmp->mfleetim = (rn2(7) ? rnd(10) : rnd(100)); } - - if(!nearby || - mtmp->mflee || - mtmp->mconf || - (mtmp->minvis && !rn2(3)) || - (index("BIuy", mdat->mlet) && !rn2(4)) || - (mdat->mlet == 'L' && !u.ugold && (mtmp->mgold || rn2(2))) || - (!mtmp->mcansee && !rn2(4)) || - mtmp->mpeaceful - ) { - tmp = m_move(mtmp,0); /* 2: monster died moving */ - if(tmp == 2 || (tmp && mdat->mmove <= 12)) - return(tmp == 2); - } - - if(!index("Ea", mdat->mlet) && nearby && - !mtmp->mpeaceful && u.uhp > 0 && !scared) { - if(mhitu(mtmp)) - return(1); /* monster died (e.g. 'y' or 'F') */ + if (!nearby || + mtmp->mflee || + mtmp->mconf || + (mtmp->minvis && !rn2(3)) || + (strchr("BIuy", mdat->mlet) && !rn2(4)) || + (mdat->mlet == 'L' && !u.ugold && (mtmp->mgold || rn2(2))) || + (!mtmp->mcansee && !rn2(4)) || + mtmp->mpeaceful + ) { + tmp = m_move(mtmp, 0); /* 2: monster died moving */ + if (tmp == 2 || (tmp && mdat->mmove <= 12)) + return (tmp == 2); + } + if (!strchr("Ea", mdat->mlet) && nearby && + !mtmp->mpeaceful && u.uhp > 0 && !scared) { + if (mhitu(mtmp)) + return (1); /* monster died (e.g. 'y' or 'F') */ } /* extra movement for fast monsters */ - if(mdat->mmove-12 > rnd(12)) tmp = m_move(mtmp,1); - return(tmp == 2); + if (mdat->mmove - 12 > rnd(12)) + tmp = m_move(mtmp, 1); + return (tmp == 2); } -m_move(mtmp,after) -register struct monst *mtmp; +int +m_move(mtmp, after) + struct monst *mtmp; { - register struct monst *mtmp2; - register nx,ny,omx,omy,appr,nearer,cnt,i,j; - xchar gx,gy,nix,niy,chcnt; - schar chi; - boolean likegold, likegems, likeobjs; - char msym = mtmp->data->mlet; - schar mmoved = 0; /* not strictly nec.: chi >= 0 will do */ - coord poss[9]; - int info[9]; - - if(mtmp->mfroz || mtmp->msleep) - return(0); - if(mtmp->mtrapped) { + struct monst *mtmp2; + int nx, ny, omx, omy, appr, nearer, cnt, i, j; + xchar gx, gy, nix, niy, chcnt; + schar chi; + boolean likegold = 0, likegems = 0, likeobjs = 0; + char msym = mtmp->data->mlet; + schar mmoved = 0; /* not strictly nec.: chi >= 0 will + * do */ + coord poss[9]; + int info[9]; + + if (mtmp->mfroz || mtmp->msleep) + return (0); + if (mtmp->mtrapped) { i = mintrap(mtmp); - if(i == 2) return(2); /* he died */ - if(i == 1) return(0); /* still in trap, so didnt move */ + if (i == 2) + return (2); /* he died */ + if (i == 1) + return (0); /* still in trap, so didnt move */ } - if(mtmp->mhide && o_at(mtmp->mx,mtmp->my) && rn2(10)) - return(0); /* do not leave hiding place */ + if (mtmp->mhide && o_at(mtmp->mx, mtmp->my) && rn2(10)) + return (0); /* do not leave hiding place */ #ifndef NOWORM - if(mtmp->wormno) + if (mtmp->wormno) goto not_special; -#endif NOWORM +#endif /* NOWORM */ /* my dog gets a special treatment */ - if(mtmp->mtame) { - return( dog_move(mtmp, after) ); + if (mtmp->mtame) { + return (dog_move(mtmp, after)); } - /* likewise for shopkeeper */ - if(mtmp->isshk) { + if (mtmp->isshk) { mmoved = shk_move(mtmp); - if(mmoved >= 0) + if (mmoved >= 0) goto postmov; - mmoved = 0; /* follow player outside shop */ + mmoved = 0; /* follow player outside shop */ } - /* and for the guard */ - if(mtmp->isgd) { + if (mtmp->isgd) { mmoved = gd_move(); goto postmov; } - -/* teleport if that lies in our nature ('t') or when badly wounded ('1') */ - if((msym == 't' && !rn2(5)) - || (msym == '1' && (mtmp->mhp < 7 || (!xdnstair && !rn2(5)) - || levl[u.ux][u.uy].typ == STAIRS))) { - if(mtmp->mhp < 7 || (msym == 't' && rn2(2))) + /* + * teleport if that lies in our nature ('t') or when badly wounded + * ('1') + */ + if ((msym == 't' && !rn2(5)) + || (msym == '1' && (mtmp->mhp < 7 || (!xdnstair && !rn2(5)) + || levl[u.ux][u.uy].typ == STAIRS))) { + if (mtmp->mhp < 7 || (msym == 't' && rn2(2))) rloc(mtmp); else mnexto(mtmp); mmoved = 1; goto postmov; } - /* spit fire ('D') or use a wand ('1') when appropriate */ - if(index("D1", msym)) + if (strchr("D1", msym)) inrange(mtmp); - if(msym == 'U' && !mtmp->mcan && canseemon(mtmp) && + if (msym == 'U' && !mtmp->mcan && canseemon(mtmp) && mtmp->mcansee && rn2(5)) { - if(!Confusion) + if (!Confusion) pline("%s's gaze has confused you!", Monnam(mtmp)); else pline("You are getting more and more confused."); - if(rn2(3)) mtmp->mcan = 1; - Confusion += d(3,4); /* timeout */ + if (rn2(3)) + mtmp->mcan = 1; + Confusion += d(3, 4); /* timeout */ } not_special: - if(!mtmp->mflee && u.uswallow && u.ustuck != mtmp) return(1); + if (!mtmp->mflee && u.uswallow && u.ustuck != mtmp) + return (1); appr = 1; - if(mtmp->mflee) appr = -1; - if(mtmp->mconf || Invis || !mtmp->mcansee || - (index("BIy", msym) && !rn2(3))) + if (mtmp->mflee) + appr = -1; + if (mtmp->mconf || Invis || !mtmp->mcansee || + (strchr("BIy", msym) && !rn2(3))) appr = 0; omx = mtmp->mx; omy = mtmp->my; gx = u.ux; gy = u.uy; - if(msym == 'L' && appr == 1 && mtmp->mgold > u.ugold) + if (msym == 'L' && appr == 1 && mtmp->mgold > u.ugold) appr = -1; - /* random criterion for 'smell' or track finding ability - should use mtmp->msmell or sth + /* + * random criterion for 'smell' or track finding ability should use + * mtmp->msmell or sth */ - if(msym == '@' || - ('a' <= msym && msym <= 'z')) { - extern coord *gettrack(); - register coord *cp; - schar mroom; - mroom = inroom(omx,omy); - if(mroom < 0 || mroom != inroom(u.ux,u.uy)){ - cp = gettrack(omx,omy); - if(cp){ - gx = cp->x; - gy = cp->y; - } + if (msym == '@' || + ('a' <= msym && msym <= 'z')) { + coord *cp; + schar mroom; + mroom = inroom(omx, omy); + if (mroom < 0 || mroom != inroom(u.ux, u.uy)) { + cp = gettrack(omx, omy); + if (cp) { + gx = cp->x; + gy = cp->y; + } } } - /* look for gold or jewels nearby */ - likegold = (index("LOD", msym) != NULL); - likegems = (index("ODu", msym) != NULL); + likegold = (strchr("LOD", msym) != NULL); + likegems = (strchr("ODu", msym) != NULL); likeobjs = mtmp->mhide; #define SRCHRADIUS 25 - { xchar mind = SRCHRADIUS; /* not too far away */ - register int dd; - if(likegold){ - register struct gold *gold; - for(gold = fgold; gold; gold = gold->ngold) - if((dd = DIST(omx,omy,gold->gx,gold->gy)) < mind){ - mind = dd; - gx = gold->gx; - gy = gold->gy; + { + xchar mind = SRCHRADIUS; /* not too far away */ + int dd; + if (likegold) { + struct gold *gold; + for (gold = fgold; gold; gold = gold->ngold) + if ((dd = DIST(omx, omy, gold->gx, gold->gy)) < mind) { + mind = dd; + gx = gold->gx; + gy = gold->gy; + } + } + if (likegems || likeobjs) { + struct obj *otmp; + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (likeobjs || otmp->olet == GEM_SYM) + if (msym != 'u' || + objects[otmp->otyp].g_val != 0) + if ((dd = DIST(omx, omy, otmp->ox, otmp->oy)) < mind) { + mind = dd; + gx = otmp->ox; + gy = otmp->oy; + } } - } - if(likegems || likeobjs){ - register struct obj *otmp; - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(likeobjs || otmp->olet == GEM_SYM) - if(msym != 'u' || - objects[otmp->otyp].g_val != 0) - if((dd = DIST(omx,omy,otmp->ox,otmp->oy)) < mind){ - mind = dd; - gx = otmp->ox; - gy = otmp->oy; + if (mind < SRCHRADIUS && appr == -1) { + if (dist(omx, omy) < 10) { + gx = u.ux; + gy = u.uy; + } else + appr = 1; } - } - if(mind < SRCHRADIUS && appr == -1) { - if(dist(omx,omy) < 10) { - gx = u.ux; - gy = u.uy; - } else - appr = 1; - } } nix = omx; niy = omy; - cnt = mfndpos(mtmp,poss,info, - msym == 'u' ? NOTONL : - (msym == '@' || msym == '1') ? (ALLOW_SSM | ALLOW_TRAPS) : - index(UNDEAD, msym) ? NOGARLIC : ALLOW_TRAPS); - /* ALLOW_ROCK for some monsters ? */ + cnt = mfndpos(mtmp, poss, info, + msym == 'u' ? NOTONL : + (msym == '@' || msym == '1') ? (ALLOW_SSM | ALLOW_TRAPS) : + strchr(UNDEAD, msym) ? NOGARLIC : ALLOW_TRAPS); + /* ALLOW_ROCK for some monsters ? */ chcnt = 0; chi = -1; - for(i=0; i<cnt; i++) { + for (i = 0; i < cnt; i++) { nx = poss[i].x; ny = poss[i].y; - for(j=0; j<MTSZ && j<cnt-1; j++) - if(nx == mtmp->mtrack[j].x && ny == mtmp->mtrack[j].y) - if(rn2(4*(cnt-j))) goto nxti; + for (j = 0; j < MTSZ && j < cnt - 1; j++) + if (nx == mtmp->mtrack[j].x && ny == mtmp->mtrack[j].y) + if (rn2(4 * (cnt - j))) + goto nxti; #ifdef STUPID /* some stupid compilers think that this is too complicated */ - { int d1 = DIST(nx,ny,gx,gy); - int d2 = DIST(nix,niy,gx,gy); - nearer = (d1 < d2); + { + int d1 = DIST(nx, ny, gx, gy); + int d2 = DIST(nix, niy, gx, gy); + nearer = (d1 < d2); } #else - nearer = (DIST(nx,ny,gx,gy) < DIST(nix,niy,gx,gy)); -#endif STUPID - if((appr == 1 && nearer) || (appr == -1 && !nearer) || - !mmoved || - (!appr && !rn2(++chcnt))){ + nearer = (DIST(nx, ny, gx, gy) < DIST(nix, niy, gx, gy)); +#endif /* STUPID */ + if ((appr == 1 && nearer) || (appr == -1 && !nearer) || + !mmoved || + (!appr && !rn2(++chcnt))) { nix = nx; niy = ny; chi = i; mmoved = 1; } - nxti: ; - } - if(mmoved){ - if(info[chi] & ALLOW_M){ - mtmp2 = m_at(nix,niy); - if(hitmm(mtmp,mtmp2) == 1 && rn2(4) && - hitmm(mtmp2,mtmp) == 2) return(2); - return(0); +nxti: ; + } + if (mmoved) { + if (info[chi] & ALLOW_M) { + mtmp2 = m_at(nix, niy); + if (hitmm(mtmp, mtmp2) == 1 && rn2(4) && + hitmm(mtmp2, mtmp) == 2) + return (2); + return (0); } - if(info[chi] & ALLOW_U){ - (void) hitu(mtmp, d(mtmp->data->damn, mtmp->data->damd)+1); - return(0); + if (info[chi] & ALLOW_U) { + (void) hitu(mtmp, d(mtmp->data->damn, mtmp->data->damd) + 1); + return (0); } mtmp->mx = nix; mtmp->my = niy; - for(j=MTSZ-1; j>0; j--) mtmp->mtrack[j] = mtmp->mtrack[j-1]; + for (j = MTSZ - 1; j > 0; j--) + mtmp->mtrack[j] = mtmp->mtrack[j - 1]; mtmp->mtrack[0].x = omx; mtmp->mtrack[0].y = omy; #ifndef NOWORM - if(mtmp->wormno) worm_move(mtmp); -#endif NOWORM + if (mtmp->wormno) + worm_move(mtmp); +#endif /* NOWORM */ } else { - if(msym == 'u' && rn2(2)){ + if (msym == 'u' && rn2(2)) { rloc(mtmp); - return(0); + return (0); } #ifndef NOWORM - if(mtmp->wormno) worm_nomove(mtmp); -#endif NOWORM + if (mtmp->wormno) + worm_nomove(mtmp); +#endif /* NOWORM */ } postmov: - if(mmoved == 1) { - if(mintrap(mtmp) == 2) /* he died */ - return(2); - if(likegold) mpickgold(mtmp); - if(likegems) mpickgems(mtmp); - if(mtmp->mhide) mtmp->mundetected = 1; + if (mmoved == 1) { + if (mintrap(mtmp) == 2) /* he died */ + return (2); + if (likegold) + mpickgold(mtmp); + if (likegems) + mpickgems(mtmp); + if (mtmp->mhide) + mtmp->mundetected = 1; } pmon(mtmp); - return(mmoved); + return (mmoved); } -mpickgold(mtmp) register struct monst *mtmp; { -register struct gold *gold; - while(gold = g_at(mtmp->mx, mtmp->my)){ +void +mpickgold(mtmp) + struct monst *mtmp; +{ + struct gold *gold; + while ((gold = g_at(mtmp->mx, mtmp->my)) != NULL) { mtmp->mgold += gold->amount; freegold(gold); - if(levl[mtmp->mx][mtmp->my].scrsym == '$') + if (levl[mtmp->mx][mtmp->my].scrsym == '$') newsym(mtmp->mx, mtmp->my); } } -mpickgems(mtmp) register struct monst *mtmp; { -register struct obj *otmp; - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(otmp->olet == GEM_SYM) - if(otmp->ox == mtmp->mx && otmp->oy == mtmp->my) - if(mtmp->data->mlet != 'u' || objects[otmp->otyp].g_val != 0){ - freeobj(otmp); - mpickobj(mtmp, otmp); - if(levl[mtmp->mx][mtmp->my].scrsym == GEM_SYM) - newsym(mtmp->mx, mtmp->my); /* %% */ - return; /* pick only one object */ - } +void +mpickgems(mtmp) + struct monst *mtmp; +{ + struct obj *otmp; + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp->olet == GEM_SYM) + if (otmp->ox == mtmp->mx && otmp->oy == mtmp->my) + if (mtmp->data->mlet != 'u' || objects[otmp->otyp].g_val != 0) { + freeobj(otmp); + mpickobj(mtmp, otmp); + if (levl[mtmp->mx][mtmp->my].scrsym == GEM_SYM) + newsym(mtmp->mx, mtmp->my); /* %% */ + return; /* pick only one object */ + } } /* return number of acceptable neighbour positions */ -mfndpos(mon,poss,info,flag) -register struct monst *mon; -coord poss[9]; -int info[9], flag; +int +mfndpos(mon, poss, info, flag) + struct monst *mon; + coord poss[9]; + int info[9], flag; { - register int x,y,nx,ny,cnt = 0,ntyp; - register struct monst *mtmp; - int nowtyp; - boolean pool; + int x, y, nx, ny, cnt = 0, ntyp; + struct monst *mtmp; + int nowtyp; + boolean pool; x = mon->mx; y = mon->my; nowtyp = levl[x][y].typ; pool = (mon->data->mlet == ';'); -nexttry: /* eels prefer the water, but if there is no water nearby, - they will crawl over land */ - if(mon->mconf) { +nexttry: /* eels prefer the water, but if there is no + * water nearby, they will crawl over land */ + if (mon->mconf) { flag |= ALLOW_ALL; flag &= ~NOTONL; } - for(nx = x-1; nx <= x+1; nx++) for(ny = y-1; ny <= y+1; ny++) - if(nx != x || ny != y) if(isok(nx,ny)) - if(!IS_ROCK(ntyp = levl[nx][ny].typ)) - if(!(nx != x && ny != y && (nowtyp == DOOR || ntyp == DOOR))) - if((ntyp == POOL) == pool) { - info[cnt] = 0; - if(nx == u.ux && ny == u.uy){ - if(!(flag & ALLOW_U)) continue; - info[cnt] = ALLOW_U; - } else if(mtmp = m_at(nx,ny)){ - if(!(flag & ALLOW_M)) continue; - info[cnt] = ALLOW_M; - if(mtmp->mtame){ - if(!(flag & ALLOW_TM)) continue; - info[cnt] |= ALLOW_TM; - } - } - if(sobj_at(CLOVE_OF_GARLIC, nx, ny)) { - if(flag & NOGARLIC) continue; - info[cnt] |= NOGARLIC; - } - if(sobj_at(SCR_SCARE_MONSTER, nx, ny) || - (!mon->mpeaceful && sengr_at("Elbereth", nx, ny))) { - if(!(flag & ALLOW_SSM)) continue; - info[cnt] |= ALLOW_SSM; - } - if(sobj_at(ENORMOUS_ROCK, nx, ny)) { - if(!(flag & ALLOW_ROCK)) continue; - info[cnt] |= ALLOW_ROCK; - } - if(!Invis && online(nx,ny)){ - if(flag & NOTONL) continue; - info[cnt] |= NOTONL; - } - /* we cannot avoid traps of an unknown kind */ - { register struct trap *ttmp = t_at(nx, ny); - register int tt; - if(ttmp) { - tt = 1 << ttmp->ttyp; - if(mon->mtrapseen & tt){ - if(!(flag & tt)) continue; - info[cnt] |= tt; - } - } - } - poss[cnt].x = nx; - poss[cnt].y = ny; - cnt++; - } - if(!cnt && pool && nowtyp != POOL) { + for (nx = x - 1; nx <= x + 1; nx++) + for (ny = y - 1; ny <= y + 1; ny++) + if (nx != x || ny != y) + if (isok(nx, ny)) + if (!IS_ROCK(ntyp = levl[nx][ny].typ)) + if (!(nx != x && ny != y && (nowtyp == DOOR || ntyp == DOOR))) + if ((ntyp == POOL) == pool) { + info[cnt] = 0; + if (nx == u.ux && ny == u.uy) { + if (!(flag & ALLOW_U)) + continue; + info[cnt] = ALLOW_U; + } else if ((mtmp = m_at(nx, ny)) != NULL) { + if (!(flag & ALLOW_M)) + continue; + info[cnt] = ALLOW_M; + if (mtmp->mtame) { + if (!(flag & ALLOW_TM)) + continue; + info[cnt] |= ALLOW_TM; + } + } + if (sobj_at(CLOVE_OF_GARLIC, nx, ny)) { + if (flag & NOGARLIC) + continue; + info[cnt] |= NOGARLIC; + } + if (sobj_at(SCR_SCARE_MONSTER, nx, ny) || + (!mon->mpeaceful && sengr_at("Elbereth", nx, ny))) { + if (!(flag & ALLOW_SSM)) + continue; + info[cnt] |= ALLOW_SSM; + } + if (sobj_at(ENORMOUS_ROCK, nx, ny)) { + if (!(flag & ALLOW_ROCK)) + continue; + info[cnt] |= ALLOW_ROCK; + } + if (!Invis && online(nx, ny)) { + if (flag & NOTONL) + continue; + info[cnt] |= NOTONL; + } + /* + * we cannot + * avoid + * traps of + * an unknown + * kind + */ + { + struct trap *ttmp = t_at(nx, ny); + int tt; + if (ttmp) { + tt = 1 << ttmp->ttyp; + if (mon->mtrapseen & tt) { + if (!(flag & tt)) + continue; + info[cnt] |= tt; + } + } + } + poss[cnt].x = nx; + poss[cnt].y = ny; + cnt++; + } + if (!cnt && pool && nowtyp != POOL) { pool = FALSE; goto nexttry; } - return(cnt); + return (cnt); } -dist(x,y) int x,y; { - return((x-u.ux)*(x-u.ux) + (y-u.uy)*(y-u.uy)); +int +dist(x, y) + int x, y; +{ + return ((x - u.ux) * (x - u.ux) + (y - u.uy) * (y - u.uy)); } +void poisoned(string, pname) -register char *string, *pname; + char *string, *pname; { - register int i; + int i; - if(Blind) pline("It was poisoned."); - else pline("The %s was poisoned!",string); - if(Poison_resistance) { + if (Blind) + pline("It was poisoned."); + else + pline("The %s was poisoned!", string); + if (Poison_resistance) { pline("The poison doesn't seem to affect you."); return; } i = rn2(10); - if(i == 0) { + if (i == 0) { u.uhp = -1; pline("I am afraid the poison was deadly ..."); - } else if(i <= 5) { - losestr(rn1(3,3)); + } else if (i <= 5) { + losestr(rn1(3, 3)); } else { - losehp(rn1(10,6), pname); + losehp(rn1(10, 6), pname); } - if(u.uhp < 1) { + if (u.uhp < 1) { killer = pname; done("died"); } } +void mondead(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - relobj(mtmp,1); + relobj(mtmp, 1); unpmon(mtmp); relmon(mtmp); unstuck(mtmp); - if(mtmp->isshk) shkdead(mtmp); - if(mtmp->isgd) gddead(); + if (mtmp->isshk) + shkdead(mtmp); + if (mtmp->isgd) + gddead(); #ifndef NOWORM - if(mtmp->wormno) wormdead(mtmp); -#endif NOWORM + if (mtmp->wormno) + wormdead(mtmp); +#endif /* NOWORM */ monfree(mtmp); } /* called when monster is moved to larger structure */ -replmon(mtmp,mtmp2) -register struct monst *mtmp, *mtmp2; +void +replmon(mtmp, mtmp2) + struct monst *mtmp, *mtmp2; { relmon(mtmp); monfree(mtmp); mtmp2->nmon = fmon; fmon = mtmp2; - if(u.ustuck == mtmp) u.ustuck = mtmp2; - if(mtmp2->isshk) replshk(mtmp,mtmp2); - if(mtmp2->isgd) replgd(mtmp,mtmp2); + if (u.ustuck == mtmp) + u.ustuck = mtmp2; + if (mtmp2->isshk) + replshk(mtmp, mtmp2); + if (mtmp2->isgd) + replgd(mtmp, mtmp2); } +void relmon(mon) -register struct monst *mon; + struct monst *mon; { - register struct monst *mtmp; + struct monst *mtmp; - if(mon == fmon) fmon = fmon->nmon; + if (mon == fmon) + fmon = fmon->nmon; else { - for(mtmp = fmon; mtmp->nmon != mon; mtmp = mtmp->nmon) ; + for (mtmp = fmon; mtmp->nmon != mon; mtmp = mtmp->nmon); mtmp->nmon = mon->nmon; } } -/* we do not free monsters immediately, in order to have their name - available shortly after their demise */ -struct monst *fdmon; /* chain of dead monsters, need not to be saved */ +/* + * we do not free monsters immediately, in order to have their name available + * shortly after their demise + */ +struct monst *fdmon; /* chain of dead monsters, need not to be + * saved */ -monfree(mtmp) register struct monst *mtmp; { +void +monfree(mtmp) + struct monst *mtmp; +{ mtmp->nmon = fdmon; fdmon = mtmp; } -dmonsfree(){ -register struct monst *mtmp; - while(mtmp = fdmon){ +void +dmonsfree() +{ + struct monst *mtmp; + while ((mtmp = fdmon) != NULL) { fdmon = mtmp->nmon; free((char *) mtmp); } } +void unstuck(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - if(u.ustuck == mtmp) { - if(u.uswallow){ + if (u.ustuck == mtmp) { + if (u.uswallow) { u.ux = mtmp->mx; u.uy = mtmp->my; u.uswallow = 0; @@ -657,202 +741,244 @@ register struct monst *mtmp; } } +void killed(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { #ifdef lint #define NEW_SCORING -#endif lint - register int tmp,tmp2,nk,x,y; - register struct permonst *mdat; - extern long newuexp(); +#endif /* lint */ + int tmp, nk, x, y; + struct permonst *mdat; - if(mtmp->cham) mtmp->data = PM_CHAMELEON; + if (mtmp->cham) + mtmp->data = PM_CHAMELEON; mdat = mtmp->data; - if(Blind) pline("You destroy it!"); + if (Blind) + pline("You destroy it!"); else { pline("You destroy %s!", - mtmp->mtame ? amonnam(mtmp, "poor") : monnam(mtmp)); + mtmp->mtame ? amonnam(mtmp, "poor") : monnam(mtmp)); } - if(u.umconf) { - if(!Blind) pline("Your hands stop glowing blue."); + if (u.umconf) { + if (!Blind) + pline("Your hands stop glowing blue."); u.umconf = 0; } - /* count killed monsters */ #define MAXMONNO 100 - nk = 1; /* in case we cannot find it in mons */ - tmp = mdat - mons; /* index in mons array (if not 'd', '@', ...) */ - if(tmp >= 0 && tmp < CMNUM+2) { - extern char fut_geno[]; - u.nr_killed[tmp]++; - if((nk = u.nr_killed[tmp]) > MAXMONNO && - !index(fut_geno, mdat->mlet)) - charcat(fut_geno, mdat->mlet); + nk = 1; /* in case we cannot find it in mons */ + tmp = mdat - mons; /* strchr in mons array (if not 'd', '@', ...) */ + if (tmp >= 0 && tmp < CMNUM + 2) { + u.nr_killed[tmp]++; + if ((nk = u.nr_killed[tmp]) > MAXMONNO && + !strchr(fut_geno, mdat->mlet)) + charcat(fut_geno, mdat->mlet); } - /* punish bad behaviour */ - if(mdat->mlet == '@') Telepat = 0, u.uluck -= 2; - if(mtmp->mpeaceful || mtmp->mtame) u.uluck--; - if(mdat->mlet == 'u') u.uluck -= 5; - if((int)u.uluck < LUCKMIN) u.uluck = LUCKMIN; + if (mdat->mlet == '@') + Telepat = 0, u.uluck -= 2; + if (mtmp->mpeaceful || mtmp->mtame) + u.uluck--; + if (mdat->mlet == 'u') + u.uluck -= 5; + if ((int) u.uluck < LUCKMIN) + u.uluck = LUCKMIN; /* give experience points */ tmp = 1 + mdat->mlevel * mdat->mlevel; - if(mdat->ac < 3) tmp += 2*(7 - mdat->ac); - if(index("AcsSDXaeRTVWU&In:P", mdat->mlet)) - tmp += 2*mdat->mlevel; - if(index("DeV&P",mdat->mlet)) tmp += (7*mdat->mlevel); - if(mdat->mlevel > 6) tmp += 50; - if(mdat->mlet == ';') tmp += 1000; + if (mdat->ac < 3) + tmp += 2 * (7 - mdat->ac); + if (strchr("AcsSDXaeRTVWU&In:P", mdat->mlet)) + tmp += 2 * mdat->mlevel; + if (strchr("DeV&P", mdat->mlet)) + tmp += (7 * mdat->mlevel); + if (mdat->mlevel > 6) + tmp += 50; + if (mdat->mlet == ';') + tmp += 1000; #ifdef NEW_SCORING - /* ------- recent addition: make nr of points decrease - when this is not the first of this kind */ - { int ul = u.ulevel; - int ml = mdat->mlevel; - - if(ul < 14) /* points are given based on present and future level */ - for(tmp2 = 0; !tmp2 || ul + tmp2 <= ml; tmp2++) - if(u.uexp + 1 + (tmp + ((tmp2 <= 0) ? 0 : 4<<(tmp2-1)))/nk - >= 10*pow((unsigned)(ul-1))) - if(++ul == 14) break; - - tmp2 = ml - ul -1; - tmp = (tmp + ((tmp2 < 0) ? 0 : 4<<tmp2))/nk; - if(!tmp) tmp = 1; + /* + * ------- recent addition: make nr of points decrease when this is + * not the first of this kind + */ + { + int ul = u.ulevel; + int ml = mdat->mlevel; + + if (ul < 14) /* points are given based on present and + * future level */ + for (tmp2 = 0; !tmp2 || ul + tmp2 <= ml; tmp2++) + if (u.uexp + 1 + (tmp + ((tmp2 <= 0) ? 0 : 4 << (tmp2 - 1))) / nk + >= 10 * pow((unsigned) (ul - 1))) + if (++ul == 14) + break; + + tmp2 = ml - ul - 1; + tmp = (tmp + ((tmp2 < 0) ? 0 : 4 << tmp2)) / nk; + if (!tmp) + tmp = 1; } /* note: ul is not necessarily the future value of u.ulevel */ /* ------- end of recent valuation change ------- */ -#endif NEW_SCORING +#endif /* NEW_SCORING */ - more_experienced(tmp,0); + more_experienced(tmp, 0); flags.botl = 1; - while(u.ulevel < 14 && u.uexp >= newuexp()){ + while (u.ulevel < 14 && u.uexp >= newuexp()) { pline("Welcome to experience level %u.", ++u.ulevel); tmp = rnd(10); - if(tmp < 3) tmp = rnd(10); + if (tmp < 3) + tmp = rnd(10); u.uhpmax += tmp; u.uhp += tmp; flags.botl = 1; } /* dispose of monster and make cadaver */ - x = mtmp->mx; y = mtmp->my; + x = mtmp->mx; + y = mtmp->my; mondead(mtmp); tmp = mdat->mlet; - if(tmp == 'm') { /* he killed a minotaur, give him a wand of digging */ - /* note: the dead minotaur will be on top of it! */ + if (tmp == 'm') { /* he killed a minotaur, give him a wand of + * digging */ + /* note: the dead minotaur will be on top of it! */ mksobj_at(WAN_DIGGING, x, y); /* if(cansee(x,y)) atl(x,y,fobj->olet); */ stackobj(fobj); } else #ifndef NOWORM - if(tmp == 'w') { + if (tmp == 'w') { mksobj_at(WORM_TOOTH, x, y); stackobj(fobj); } else -#endif NOWORM - if(!letter(tmp) || (!index("mw", tmp) && !rn2(3))) tmp = 0; - - if(ACCESSIBLE(levl[x][y].typ)) /* might be mimic in wall or dead eel*/ - if(x != u.ux || y != u.uy) /* might be here after swallowed */ - if(index("NTVm&",mdat->mlet) || rn2(5)) { - register struct obj *obj2 = mkobj_at(tmp,x,y); - if(cansee(x,y)) - atl(x,y,obj2->olet); - stackobj(obj2); - } +#endif /* NOWORM */ + if (!letter(tmp) || (!strchr("mw", tmp) && !rn2(3))) + tmp = 0; + + if (ACCESSIBLE(levl[x][y].typ)) /* might be mimic in wall or dead eel */ + if (x != u.ux || y != u.uy) /* might be here after + * swallowed */ + if (strchr("NTVm&", mdat->mlet) || rn2(5)) { + struct obj *obj2 = mkobj_at(tmp, x, y); + if (cansee(x, y)) + atl(x, y, obj2->olet); + stackobj(obj2); + } } -kludge(str,arg) -register char *str,*arg; +void +kludge(str, arg) + char *str, *arg; { - if(Blind) { - if(*str == '%') pline(str,"It"); - else pline(str,"it"); - } else pline(str,arg); + if (Blind) { + if (*str == '%') + pline(str, "It"); + else + pline(str, "it"); + } else + pline(str, arg); } -rescham() /* force all chameleons to become normal */ -{ - register struct monst *mtmp; +void +rescham() +{ /* force all chameleons to become normal */ + struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->cham) { + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->cham) { mtmp->cham = 0; (void) newcham(mtmp, PM_CHAMELEON); } } -newcham(mtmp,mdat) /* make a chameleon look like a new monster */ - /* returns 1 if the monster actually changed */ -register struct monst *mtmp; -register struct permonst *mdat; +int +newcham(mtmp, mdat) /* make a chameleon look like a new monster */ +/* returns 1 if the monster actually changed */ + struct monst *mtmp; + struct permonst *mdat; { - register mhp, hpn, hpd; + int mhp, hpn, hpd; - if(mdat == mtmp->data) return(0); /* still the same monster */ + if (mdat == mtmp->data) + return (0); /* still the same monster */ #ifndef NOWORM - if(mtmp->wormno) wormdead(mtmp); /* throw tail away */ -#endif NOWORM + if (mtmp->wormno) + wormdead(mtmp); /* throw tail away */ +#endif /* NOWORM */ if (u.ustuck == mtmp) { if (u.uswallow) { u.uswallow = 0; u.uswldtim = 0; - mnexto (mtmp); - docrt (); - prme (); + mnexto(mtmp); + docrt(); + prme(); } u.ustuck = 0; } hpn = mtmp->mhp; - hpd = (mtmp->data->mlevel)*8; - if(!hpd) hpd = 4; + hpd = (mtmp->data->mlevel) * 8; + if (!hpd) + hpd = 4; mtmp->data = mdat; - mhp = (mdat->mlevel)*8; + mhp = (mdat->mlevel) * 8; /* new hp: same fraction of max as before */ - mtmp->mhp = 2 + (hpn*mhp)/hpd; + mtmp->mhp = 2 + (hpn * mhp) / hpd; hpn = mtmp->mhpmax; - mtmp->mhpmax = 2 + (hpn*mhp)/hpd; + mtmp->mhpmax = 2 + (hpn * mhp) / hpd; mtmp->minvis = (mdat->mlet == 'I') ? 1 : 0; #ifndef NOWORM - if(mdat->mlet == 'w' && getwn(mtmp)) initworm(mtmp); - /* perhaps we should clear mtmp->mtame here? */ -#endif NOWORM - unpmon(mtmp); /* necessary for 'I' and to force pmon */ + if (mdat->mlet == 'w' && getwn(mtmp)) + initworm(mtmp); + /* perhaps we should clear mtmp->mtame here? */ +#endif /* NOWORM */ + unpmon(mtmp); /* necessary for 'I' and to force pmon */ pmon(mtmp); - return(1); + return (1); } -mnexto(mtmp) /* Make monster mtmp next to you (if possible) */ -struct monst *mtmp; +void +mnexto(mtmp) /* Make monster mtmp next to you (if + * possible) */ + struct monst *mtmp; { - extern coord enexto(); - coord mm; + coord mm; mm = enexto(u.ux, u.uy); mtmp->mx = mm.x; mtmp->my = mm.y; pmon(mtmp); } -ishuman(mtmp) register struct monst *mtmp; { - return(mtmp->data->mlet == '@'); +int +ishuman(mtmp) + struct monst *mtmp; +{ + return (mtmp->data->mlet == '@'); } -setmangry(mtmp) register struct monst *mtmp; { - if(!mtmp->mpeaceful) return; - if(mtmp->mtame) return; +void +setmangry(mtmp) + struct monst *mtmp; +{ + if (!mtmp->mpeaceful) + return; + if (mtmp->mtame) + return; mtmp->mpeaceful = 0; - if(ishuman(mtmp)) pline("%s gets angry!", Monnam(mtmp)); + if (ishuman(mtmp)) + pline("%s gets angry!", Monnam(mtmp)); } -/* not one hundred procent correct: now a snake may hide under an - invisible object */ +/* + * not one hundred procent correct: now a snake may hide under an invisible + * object + */ +int canseemon(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - return((!mtmp->minvis || See_invisible) - && (!mtmp->mhide || !o_at(mtmp->mx,mtmp->my)) + return ((!mtmp->minvis || See_invisible) + && (!mtmp->mhide || !o_at(mtmp->mx, mtmp->my)) && cansee(mtmp->mx, mtmp->my)); } diff --git a/hack/hack.monst.c b/hack/hack.monst.c index 5cd23382..bf2c11b0 100644 --- a/hack/hack.monst.c +++ b/hack/hack.monst.c @@ -1,84 +1,87 @@ +/* $NetBSD: hack.monst.c,v 1.4 1997/10/19 16:58:36 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.monst.c,v 1.3 1995/03/23 08:31:03 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.monst.c,v 1.4 1997/10/19 16:58:36 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" #include "def.eshk.h" -extern char plname[PL_NSIZ]; -struct permonst mons[CMNUM+2] = { - { "bat", 'B',1,22,8,1,4,0 }, - { "gnome", 'G',1,6,5,1,6,0 }, - { "hobgoblin", 'H',1,9,5,1,8,0 }, - { "jackal", 'J',0,12,7,1,2,0 }, - { "kobold", 'K',1,6,7,1,4,0 }, - { "leprechaun", 'L',5,15,8,1,2,0 }, - { "giant rat", 'r',0,12,7,1,3,0 }, - { "acid blob", 'a',2,3,8,0,0,0 }, - { "floating eye", 'E',2,1,9,0,0,0 }, - { "homunculus", 'h',2,6,6,1,3,0 }, - { "imp", 'i',2,6,2,1,4,0 }, - { "orc", 'O',2,9,6,1,8,0 }, - { "yellow light", 'y',3,15,0,0,0,0 }, - { "zombie", 'Z',2,6,8,1,8,0 }, - { "giant ant", 'A',3,18,3,1,6,0 }, - { "fog cloud", 'f',3,1,0,1,6,0 }, - { "nymph", 'N',6,12,9,1,2,0 }, - { "piercer", 'p',3,1,3,2,6,0 }, - { "quasit", 'Q',3,15,3,1,4,0 }, - { "quivering blob", 'q',3,1,8,1,8,0 }, - { "violet fungi", 'v',3,1,7,1,4,0 }, - { "giant beetle", 'b',4,6,4,3,4,0 }, - { "centaur", 'C',4,18,4,1,6,0 }, - { "cockatrice", 'c',4,6,6,1,3,0 }, - { "gelatinous cube", 'g',4,6,8,2,4,0 }, - { "jaguar", 'j',4,15,6,1,8,0 }, - { "killer bee", 'k',4,14,4,2,4,0 }, - { "snake", 'S',4,15,3,1,6,0 }, - { "freezing sphere", 'F',2,13,4,0,0,0 }, - { "owlbear", 'o',5,12,5,2,6,0 }, - { "rust monster", 'R',10,18,3,0,0,0 }, - { "scorpion", 's',5,15,3,1,4,0 }, - { "tengu", 't',5,13,5,1,7,0 }, - { "wraith", 'W',5,12,5,1,6,0 }, +struct permonst mons[CMNUM + 2] = { + {"bat", 'B', 1, 22, 8, 1, 4, 0}, + {"gnome", 'G', 1, 6, 5, 1, 6, 0}, + {"hobgoblin", 'H', 1, 9, 5, 1, 8, 0}, + {"jackal", 'J', 0, 12, 7, 1, 2, 0}, + {"kobold", 'K', 1, 6, 7, 1, 4, 0}, + {"leprechaun", 'L', 5, 15, 8, 1, 2, 0}, + {"giant rat", 'r', 0, 12, 7, 1, 3, 0}, + {"acid blob", 'a', 2, 3, 8, 0, 0, 0}, + {"floating eye", 'E', 2, 1, 9, 0, 0, 0}, + {"homunculus", 'h', 2, 6, 6, 1, 3, 0}, + {"imp", 'i', 2, 6, 2, 1, 4, 0}, + {"orc", 'O', 2, 9, 6, 1, 8, 0}, + {"yellow light", 'y', 3, 15, 0, 0, 0, 0}, + {"zombie", 'Z', 2, 6, 8, 1, 8, 0}, + {"giant ant", 'A', 3, 18, 3, 1, 6, 0}, + {"fog cloud", 'f', 3, 1, 0, 1, 6, 0}, + {"nymph", 'N', 6, 12, 9, 1, 2, 0}, + {"piercer", 'p', 3, 1, 3, 2, 6, 0}, + {"quasit", 'Q', 3, 15, 3, 1, 4, 0}, + {"quivering blob", 'q', 3, 1, 8, 1, 8, 0}, + {"violet fungi", 'v', 3, 1, 7, 1, 4, 0}, + {"giant beetle", 'b', 4, 6, 4, 3, 4, 0}, + {"centaur", 'C', 4, 18, 4, 1, 6, 0}, + {"cockatrice", 'c', 4, 6, 6, 1, 3, 0}, + {"gelatinous cube", 'g', 4, 6, 8, 2, 4, 0}, + {"jaguar", 'j', 4, 15, 6, 1, 8, 0}, + {"killer bee", 'k', 4, 14, 4, 2, 4, 0}, + {"snake", 'S', 4, 15, 3, 1, 6, 0}, + {"freezing sphere", 'F', 2, 13, 4, 0, 0, 0}, + {"owlbear", 'o', 5, 12, 5, 2, 6, 0}, + {"rust monster", 'R', 10, 18, 3, 0, 0, 0}, + {"scorpion", 's', 5, 15, 3, 1, 4, 0}, + {"tengu", 't', 5, 13, 5, 1, 7, 0}, + {"wraith", 'W', 5, 12, 5, 1, 6, 0}, #ifdef NOWORM - { "wumpus", 'w',8,3,2,3,6,0 }, + {"wumpus", 'w', 8, 3, 2, 3, 6, 0}, #else - { "long worm", 'w',8,3,5,1,4,0 }, -#endif NOWORM - { "large dog", 'd',6,15,4,2,4,0 }, - { "leocrotta", 'l',6,18,4,3,6,0 }, - { "mimic", 'M',7,3,7,3,4,0 }, - { "troll", 'T',7,12,4,2,7,0 }, - { "unicorn", 'u',8,24,5,1,10,0 }, - { "yeti", 'Y',5,15,6,1,6,0 }, - { "stalker", 'I',8,12,3,4,4,0 }, - { "umber hulk", 'U',9,6,2,2,10,0 }, - { "vampire", 'V',8,12,1,1,6,0 }, - { "xorn", 'X',8,9,-2,4,6,0 }, - { "xan", 'x',7,18,-2,2,4,0 }, - { "zruty", 'z',9,8,3,3,6,0 }, - { "chameleon", ':',6,5,6,4,2,0 }, - { "dragon", 'D',10,9,-1,3,8,0 }, - { "ettin", 'e',10,12,3,2,8,0 }, - { "lurker above", '\'',10,3,3,0,0,0 }, - { "nurse", 'n',11,6,0,1,3,0 }, - { "trapper", ',',12,3,3,0,0,0 }, - { "purple worm", 'P',15,9,6,2,8,0 }, - { "demon", '&',10,12,-4,1,4,0 }, - { "minotaur", 'm',15,15,6,4,10,0 }, - { "shopkeeper", '@', 12, 18, 0, 4, 8, sizeof(struct eshk) } + {"long worm", 'w', 8, 3, 5, 1, 4, 0}, +#endif /* NOWORM */ + {"large dog", 'd', 6, 15, 4, 2, 4, 0}, + {"leocrotta", 'l', 6, 18, 4, 3, 6, 0}, + {"mimic", 'M', 7, 3, 7, 3, 4, 0}, + {"troll", 'T', 7, 12, 4, 2, 7, 0}, + {"unicorn", 'u', 8, 24, 5, 1, 10, 0}, + {"yeti", 'Y', 5, 15, 6, 1, 6, 0}, + {"stalker", 'I', 8, 12, 3, 4, 4, 0}, + {"umber hulk", 'U', 9, 6, 2, 2, 10, 0}, + {"vampire", 'V', 8, 12, 1, 1, 6, 0}, + {"xorn", 'X', 8, 9, -2, 4, 6, 0}, + {"xan", 'x', 7, 18, -2, 2, 4, 0}, + {"zruty", 'z', 9, 8, 3, 3, 6, 0}, + {"chameleon", ':', 6, 5, 6, 4, 2, 0}, + {"dragon", 'D', 10, 9, -1, 3, 8, 0}, + {"ettin", 'e', 10, 12, 3, 2, 8, 0}, + {"lurker above", '\'', 10, 3, 3, 0, 0, 0}, + {"nurse", 'n', 11, 6, 0, 1, 3, 0}, + {"trapper", ',', 12, 3, 3, 0, 0, 0}, + {"purple worm", 'P', 15, 9, 6, 2, 8, 0}, + {"demon", '&', 10, 12, -4, 1, 4, 0}, + {"minotaur", 'm', 15, 15, 6, 4, 10, 0}, + {"shopkeeper", '@', 12, 18, 0, 4, 8, sizeof(struct eshk)} }; -struct permonst pm_ghost = { "ghost", ' ', 10, 3, -5, 1, 1, sizeof(plname) }; +struct permonst pm_ghost = {"ghost", ' ', 10, 3, -5, 1, 1, sizeof(plname)}; struct permonst pm_wizard = { "wizard of Yendor", '1', 15, 12, -2, 1, 12, 0 }; #ifdef MAIL -struct permonst pm_mail_daemon = { "mail daemon", '2', 100, 1, 10, 0, 0, 0 }; -#endif MAIL -struct permonst pm_eel = { "giant eel", ';', 15, 6, -3, 3, 6, 0 }; +struct permonst pm_mail_daemon = {"mail daemon", '2', 100, 1, 10, 0, 0, 0}; +#endif /* MAIL */ +struct permonst pm_eel = {"giant eel", ';', 15, 6, -3, 3, 6, 0}; diff --git a/hack/hack.o_init.c b/hack/hack.o_init.c index a9480b7b..cea820e5 100644 --- a/hack/hack.o_init.c +++ b/hack/hack.o_init.c @@ -1,63 +1,75 @@ +/* $NetBSD: hack.o_init.c,v 1.5 1997/10/19 16:58:37 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.o_init.c,v 1.4 1995/04/24 12:23:27 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.o_init.c,v 1.5 1997/10/19 16:58:37 christos Exp $"); +#endif /* not lint */ -#include "config.h" /* for typedefs */ -#include "def.objects.h" -#include "hack.onames.h" /* for LAST_GEM */ -#include <string.h> +#include <string.h> +#include "hack.h" +#include "extern.h" +#include "def.objects.h" +#include "hack.onames.h" /* for LAST_GEM */ int -letindex(let) register char let; { -register int i = 0; -register char ch; - while((ch = obj_symbols[i++]) != 0) - if(ch == let) return(i); - return(0); +letindex(let) + char let; +{ + int i = 0; + char ch; + while ((ch = obj_symbols[i++]) != 0) + if (ch == let) + return (i); + return (0); } -init_objects(){ -register int i, j, first, last, sum, end; -register char let, *tmp; - /* init base; if probs given check that they add up to 100, - otherwise compute probs; shuffle descriptions */ +void +init_objects() +{ + int i, j, first, last, sum, end; + char let, *tmp; + /* + * init base; if probs given check that they add up to 100, otherwise + * compute probs; shuffle descriptions + */ end = SIZE(objects); first = 0; - while( first < end ) { + while (first < end) { let = objects[first].oc_olet; - last = first+1; - while(last < end && objects[last].oc_olet == let - && objects[last].oc_name != NULL) + last = first + 1; + while (last < end && objects[last].oc_olet == let + && objects[last].oc_name != NULL) last++; i = letindex(let); - if((!i && let != ILLOBJ_SYM) || bases[i] != 0) + if ((!i && let != ILLOBJ_SYM) || bases[i] != 0) error("initialization error"); bases[i] = first; - if(let == GEM_SYM) + if (let == GEM_SYM) setgemprobs(); - check: +check: sum = 0; - for(j = first; j < last; j++) sum += objects[j].oc_prob; - if(sum == 0) { - for(j = first; j < last; j++) - objects[j].oc_prob = (100+j-first)/(last-first); + for (j = first; j < last; j++) + sum += objects[j].oc_prob; + if (sum == 0) { + for (j = first; j < last; j++) + objects[j].oc_prob = (100 + j - first) / (last - first); goto check; } - if(sum != 100) + if (sum != 100) error("init-prob error for %c", let); - if(objects[first].oc_descr != NULL && let != TOOL_SYM){ + if (objects[first].oc_descr != NULL && let != TOOL_SYM) { /* shuffle, also some additional descriptions */ - while(last < end && objects[last].oc_olet == let) + while (last < end && objects[last].oc_olet == let) last++; j = last; - while(--j > first) { - i = first + rn2(j+1-first); + while (--j > first) { + i = first + rn2(j + 1 - first); tmp = objects[j].oc_descr; objects[j].oc_descr = objects[i].oc_descr; objects[i].oc_descr = tmp; @@ -67,99 +79,111 @@ register char let, *tmp; } } -probtype(let) register char let; { -register int i = bases[letindex(let)]; -register int prob = rn2(100); - while((prob -= objects[i].oc_prob) >= 0) i++; - if(objects[i].oc_olet != let || !objects[i].oc_name) +int +probtype(let) + char let; +{ + int i = bases[letindex(let)]; + int prob = rn2(100); + while ((prob -= objects[i].oc_prob) >= 0) + i++; + if (objects[i].oc_olet != let || !objects[i].oc_name) panic("probtype(%c) error, i=%d", let, i); - return(i); + return (i); } +void setgemprobs() { - register int j,first; - extern xchar dlevel; + int j, first; first = bases[letindex(GEM_SYM)]; - for(j = 0; j < 9-dlevel/3; j++) - objects[first+j].oc_prob = 0; + for (j = 0; j < 9 - dlevel / 3; j++) + objects[first + j].oc_prob = 0; first += j; - if(first >= LAST_GEM || first >= SIZE(objects) || + if (first >= LAST_GEM || first >= SIZE(objects) || objects[first].oc_olet != GEM_SYM || objects[first].oc_name == NULL) printf("Not enough gems? - first=%d j=%d LAST_GEM=%d\n", - first, j, LAST_GEM); - for(j = first; j < LAST_GEM; j++) - objects[j].oc_prob = (20+j-first)/(LAST_GEM-first); + first, j, LAST_GEM); + for (j = first; j < LAST_GEM; j++) + objects[j].oc_prob = (20 + j - first) / (LAST_GEM - first); } -oinit() /* level dependent initialization */ -{ +void +oinit() +{ /* level dependent initialization */ setgemprobs(); } -extern long *alloc(); - -savenames(fd) register fd; { -register int i; -unsigned len; +void +savenames(fd) + int fd; +{ + int i; + unsigned len; bwrite(fd, (char *) bases, sizeof bases); bwrite(fd, (char *) objects, sizeof objects); - /* as long as we use only one version of Hack/Quest we - need not save oc_name and oc_descr, but we must save - oc_uname for all objects */ - for(i=0; i < SIZE(objects); i++) { - if(objects[i].oc_uname) { - len = strlen(objects[i].oc_uname)+1; + /* + * as long as we use only one version of Hack/Quest we need not save + * oc_name and oc_descr, but we must save oc_uname for all objects + */ + for (i = 0; i < SIZE(objects); i++) { + if (objects[i].oc_uname) { + len = strlen(objects[i].oc_uname) + 1; bwrite(fd, (char *) &len, sizeof len); bwrite(fd, objects[i].oc_uname, len); } } } -restnames(fd) register fd; { -register int i; -unsigned len; +void +restnames(fd) + int fd; +{ + int i; + unsigned len; mread(fd, (char *) bases, sizeof bases); mread(fd, (char *) objects, sizeof objects); - for(i=0; i < SIZE(objects); i++) if(objects[i].oc_uname) { - mread(fd, (char *) &len, sizeof len); - objects[i].oc_uname = (char *) alloc(len); - mread(fd, objects[i].oc_uname, len); - } + for (i = 0; i < SIZE(objects); i++) + if (objects[i].oc_uname) { + mread(fd, (char *) &len, sizeof len); + objects[i].oc_uname = (char *) alloc(len); + mread(fd, objects[i].oc_uname, len); + } } -dodiscovered() /* free after Robert Viduya */ -{ - extern char *typename(); - register int i, end; - int ct = 0; +int +dodiscovered() +{ /* free after Robert Viduya */ + int i, end; + int ct = 0; - cornline(0, "Discoveries"); + cornline(0, "Discoveries"); - end = SIZE(objects); - for (i = 0; i < end; i++) { - if (interesting_to_discover (i)) { - ct++; - cornline(1, typename(i)); + end = SIZE(objects); + for (i = 0; i < end; i++) { + if (interesting_to_discover(i)) { + ct++; + cornline(1, typename(i)); + } } - } - if (ct == 0) { - pline ("You haven't discovered anything yet..."); - cornline(3, (char *) 0); - } else - cornline(2, (char *) 0); - - return(0); + if (ct == 0) { + pline("You haven't discovered anything yet..."); + cornline(3, (char *) 0); + } else + cornline(2, (char *) 0); + + return (0); } +int interesting_to_discover(i) -register int i; + int i; { - return( - objects[i].oc_uname != NULL || - (objects[i].oc_name_known && objects[i].oc_descr != NULL) - ); + return ( + objects[i].oc_uname != NULL || + (objects[i].oc_name_known && objects[i].oc_descr != NULL) + ); } diff --git a/hack/hack.objnam.c b/hack/hack.objnam.c index 2ab2f2ae..9a0048ee 100644 --- a/hack/hack.objnam.c +++ b/hack/hack.objnam.c @@ -1,49 +1,56 @@ +/* $NetBSD: hack.objnam.c,v 1.4 1997/10/19 16:58:39 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.objnam.c,v 1.3 1995/03/23 08:31:10 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.objnam.c,v 1.4 1997/10/19 16:58:39 christos Exp $"); +#endif /* not lint */ -#include "hack.h" +#include <stdlib.h> +#include "hack.h" +#include "extern.h" #define Sprintf (void) sprintf #define Strcat (void) strcat #define Strcpy (void) strcpy #define PREFIX 15 -extern char *eos(); -extern int bases[]; -char * -strprepend(s,pref) register char *s, *pref; { -register int i = strlen(pref); - if(i > PREFIX) { +char * +strprepend(s, pref) + char *s, *pref; +{ + int i = strlen(pref); + if (i > PREFIX) { pline("WARNING: prefix too short."); - return(s); + return (s); } s -= i; (void) strncpy(s, pref, i); /* do not copy trailing 0 */ - return(s); + return (s); } -char * -sitoa(a) int a; { -static char buf[13]; +char * +sitoa(a) + int a; +{ + static char buf[13]; Sprintf(buf, (a < 0) ? "%d" : "+%d", a); - return(buf); + return (buf); } -char * +char * typename(otyp) -register int otyp; + int otyp; { -static char buf[BUFSZ]; -register struct objclass *ocl = &objects[otyp]; -register char *an = ocl->oc_name; -register char *dn = ocl->oc_descr; -register char *un = ocl->oc_uname; -register int nn = ocl->oc_name_known; - switch(ocl->oc_olet) { + static char buf[BUFSZ]; + struct objclass *ocl = &objects[otyp]; + char *an = ocl->oc_name; + char *dn = ocl->oc_descr; + char *un = ocl->oc_uname; + int nn = ocl->oc_name_known; + switch (ocl->oc_olet) { case POTION_SYM: Strcpy(buf, "potion"); break; @@ -57,60 +64,61 @@ register int nn = ocl->oc_name_known; Strcpy(buf, "ring"); break; default: - if(nn) { + if (nn) { Strcpy(buf, an); - if(otyp >= TURQUOISE && otyp <= JADE) + if (otyp >= TURQUOISE && otyp <= JADE) Strcat(buf, " stone"); - if(un) + if (un) Sprintf(eos(buf), " called %s", un); - if(dn) + if (dn) Sprintf(eos(buf), " (%s)", dn); } else { Strcpy(buf, dn ? dn : an); - if(ocl->oc_olet == GEM_SYM) + if (ocl->oc_olet == GEM_SYM) Strcat(buf, " gem"); - if(un) + if (un) Sprintf(eos(buf), " called %s", un); } - return(buf); + return (buf); } /* here for ring/scroll/potion/wand */ - if(nn) + if (nn) Sprintf(eos(buf), " of %s", an); - if(un) + if (un) Sprintf(eos(buf), " called %s", un); - if(dn) + if (dn) Sprintf(eos(buf), " (%s)", dn); - return(buf); + return (buf); } -char * +char * xname(obj) -register struct obj *obj; + struct obj *obj; { -static char bufr[BUFSZ]; -register char *buf = &(bufr[PREFIX]); /* leave room for "17 -3 " */ -register int nn = objects[obj->otyp].oc_name_known; -register char *an = objects[obj->otyp].oc_name; -register char *dn = objects[obj->otyp].oc_descr; -register char *un = objects[obj->otyp].oc_uname; -register int pl = (obj->quan != 1); - if(!obj->dknown && !Blind) obj->dknown = 1; /* %% doesnt belong here */ - switch(obj->olet) { + static char bufr[BUFSZ]; + char *buf = &(bufr[PREFIX]); /* leave room for "17 -3 " */ + int nn = objects[obj->otyp].oc_name_known; + char *an = objects[obj->otyp].oc_name; + char *dn = objects[obj->otyp].oc_descr; + char *un = objects[obj->otyp].oc_uname; + int pl = (obj->quan != 1); + if (!obj->dknown && !Blind) + obj->dknown = 1;/* %% doesnt belong here */ + switch (obj->olet) { case AMULET_SYM: Strcpy(buf, (obj->spe < 0 && obj->known) - ? "cheap plastic imitation of the " : ""); - Strcat(buf,"Amulet of Yendor"); + ? "cheap plastic imitation of the " : ""); + Strcat(buf, "Amulet of Yendor"); break; case TOOL_SYM: - if(!nn) { + if (!nn) { Strcpy(buf, dn); break; } - Strcpy(buf,an); + Strcpy(buf, an); break; case FOOD_SYM: - if(obj->otyp == DEAD_HOMUNCULUS && pl) { + if (obj->otyp == DEAD_HOMUNCULUS && pl) { pl = 0; Strcpy(buf, "dead homunculi"); break; @@ -118,12 +126,12 @@ register int pl = (obj->quan != 1); /* fungis ? */ /* fall into next case */ case WEAPON_SYM: - if(obj->otyp == WORM_TOOTH && pl) { + if (obj->otyp == WORM_TOOTH && pl) { pl = 0; Strcpy(buf, "worm teeth"); break; } - if(obj->otyp == CRYSKNIFE && pl) { + if (obj->otyp == CRYSKNIFE && pl) { pl = 0; Strcpy(buf, "crysknives"); break; @@ -132,21 +140,22 @@ register int pl = (obj->quan != 1); case ARMOR_SYM: case CHAIN_SYM: case ROCK_SYM: - Strcpy(buf,an); + Strcpy(buf, an); break; case BALL_SYM: Sprintf(buf, "%sheavy iron ball", (obj->owt > objects[obj->otyp].oc_weight) ? "very " : ""); break; case POTION_SYM: - if(nn || un || !obj->dknown) { + if (nn || un || !obj->dknown) { Strcpy(buf, "potion"); - if(pl) { + if (pl) { pl = 0; Strcat(buf, "s"); } - if(!obj->dknown) break; - if(un) { + if (!obj->dknown) + break; + if (un) { Strcat(buf, " called "); Strcat(buf, un); } else { @@ -160,15 +169,16 @@ register int pl = (obj->quan != 1); break; case SCROLL_SYM: Strcpy(buf, "scroll"); - if(pl) { + if (pl) { pl = 0; Strcat(buf, "s"); } - if(!obj->dknown) break; - if(nn) { + if (!obj->dknown) + break; + if (nn) { Strcat(buf, " of "); Strcat(buf, an); - } else if(un) { + } else if (un) { Strcat(buf, " called "); Strcat(buf, un); } else { @@ -177,376 +187,401 @@ register int pl = (obj->quan != 1); } break; case WAND_SYM: - if(!obj->dknown) + if (!obj->dknown) Sprintf(buf, "wand"); - else if(nn) + else if (nn) Sprintf(buf, "wand of %s", an); - else if(un) + else if (un) Sprintf(buf, "wand called %s", un); else Sprintf(buf, "%s wand", dn); break; case RING_SYM: - if(!obj->dknown) + if (!obj->dknown) Sprintf(buf, "ring"); - else if(nn) + else if (nn) Sprintf(buf, "ring of %s", an); - else if(un) + else if (un) Sprintf(buf, "ring called %s", un); else Sprintf(buf, "%s ring", dn); break; case GEM_SYM: - if(!obj->dknown) { + if (!obj->dknown) { Strcpy(buf, "gem"); break; } - if(!nn) { + if (!nn) { Sprintf(buf, "%s gem", dn); break; } Strcpy(buf, an); - if(obj->otyp >= TURQUOISE && obj->otyp <= JADE) + if (obj->otyp >= TURQUOISE && obj->otyp <= JADE) Strcat(buf, " stone"); break; default: - Sprintf(buf,"glorkum %c (0%o) %u %d", - obj->olet,obj->olet,obj->otyp,obj->spe); + Sprintf(buf, "glorkum %c (0%o) %u %d", + obj->olet, obj->olet, obj->otyp, obj->spe); } - if(pl) { - register char *p; + if (pl) { + char *p; - for(p = buf; *p; p++) { - if(!strncmp(" of ", p, 4)) { + for (p = buf; *p; p++) { + if (!strncmp(" of ", p, 4)) { /* pieces of, cloves of, lumps of */ - register int c1, c2 = 's'; + int c1, c2 = 's'; do { - c1 = c2; c2 = *p; *p++ = c1; - } while(c1); + c1 = c2; + c2 = *p; + *p++ = c1; + } while (c1); goto nopl; } } - p = eos(buf)-1; - if(*p == 's' || *p == 'z' || *p == 'x' || + p = eos(buf) - 1; + if (*p == 's' || *p == 'z' || *p == 'x' || (*p == 'h' && p[-1] == 's')) Strcat(buf, "es"); /* boxes */ - else if(*p == 'y' && !index(vowels, p[-1])) + else if (*p == 'y' && !strchr(vowels, p[-1])) Strcpy(p, "ies"); /* rubies, zruties */ else Strcat(buf, "s"); } nopl: - if(obj->onamelth) { + if (obj->onamelth) { Strcat(buf, " named "); Strcat(buf, ONAME(obj)); } - return(buf); + return (buf); } -char * +char * doname(obj) -register struct obj *obj; + struct obj *obj; { -char prefix[PREFIX]; -register char *bp = xname(obj); - if(obj->quan != 1) + char prefix[PREFIX]; + char *bp = xname(obj); + if (obj->quan != 1) Sprintf(prefix, "%u ", obj->quan); else Strcpy(prefix, "a "); - switch(obj->olet) { + switch (obj->olet) { case AMULET_SYM: - if(strncmp(bp, "cheap ", 6)) + if (strncmp(bp, "cheap ", 6)) Strcpy(prefix, "the "); break; case ARMOR_SYM: - if(obj->owornmask & W_ARMOR) + if (obj->owornmask & W_ARMOR) Strcat(bp, " (being worn)"); /* fall into next case */ case WEAPON_SYM: - if(obj->known) { + if (obj->known) { Strcat(prefix, sitoa(obj->spe)); Strcat(prefix, " "); } break; case WAND_SYM: - if(obj->known) + if (obj->known) Sprintf(eos(bp), " (%d)", obj->spe); break; case RING_SYM: - if(obj->owornmask & W_RINGR) Strcat(bp, " (on right hand)"); - if(obj->owornmask & W_RINGL) Strcat(bp, " (on left hand)"); - if(obj->known && (objects[obj->otyp].bits & SPEC)) { + if (obj->owornmask & W_RINGR) + Strcat(bp, " (on right hand)"); + if (obj->owornmask & W_RINGL) + Strcat(bp, " (on left hand)"); + if (obj->known && (objects[obj->otyp].bits & SPEC)) { Strcat(prefix, sitoa(obj->spe)); Strcat(prefix, " "); } break; } - if(obj->owornmask & W_WEP) + if (obj->owornmask & W_WEP) Strcat(bp, " (weapon in hand)"); - if(obj->unpaid) + if (obj->unpaid) Strcat(bp, " (unpaid)"); - if(!strcmp(prefix, "a ") && index(vowels, *bp)) + if (!strcmp(prefix, "a ") && strchr(vowels, *bp)) Strcpy(prefix, "an "); bp = strprepend(bp, prefix); - return(bp); + return (bp); } /* used only in hack.fight.c (thitu) */ -setan(str,buf) -register char *str,*buf; +void +setan(str, buf) + char *str, *buf; { - if(index(vowels,*str)) + if (strchr(vowels, *str)) Sprintf(buf, "an %s", str); else Sprintf(buf, "a %s", str); } -char * -aobjnam(otmp,verb) register struct obj *otmp; register char *verb; { -register char *bp = xname(otmp); -char prefix[PREFIX]; - if(otmp->quan != 1) { +char * +aobjnam(otmp, verb) + struct obj *otmp; + char *verb; +{ + char *bp = xname(otmp); + char prefix[PREFIX]; + if (otmp->quan != 1) { Sprintf(prefix, "%u ", otmp->quan); bp = strprepend(bp, prefix); } - - if(verb) { + if (verb) { /* verb is given in plural (i.e., without trailing s) */ Strcat(bp, " "); - if(otmp->quan != 1) + if (otmp->quan != 1) Strcat(bp, verb); - else if(!strcmp(verb, "are")) + else if (!strcmp(verb, "are")) Strcat(bp, "is"); else { Strcat(bp, verb); Strcat(bp, "s"); } } - return(bp); + return (bp); } -char * +char * Doname(obj) -register struct obj *obj; + struct obj *obj; { - register char *s = doname(obj); + char *s = doname(obj); - if('a' <= *s && *s <= 'z') *s -= ('a' - 'A'); - return(s); + if ('a' <= *s && *s <= 'z') + *s -= ('a' - 'A'); + return (s); } -char *wrp[] = { "wand", "ring", "potion", "scroll", "gem" }; -char wrpsym[] = { WAND_SYM, RING_SYM, POTION_SYM, SCROLL_SYM, GEM_SYM }; +char *wrp[] = {"wand", "ring", "potion", "scroll", "gem"}; +char wrpsym[] = {WAND_SYM, RING_SYM, POTION_SYM, SCROLL_SYM, GEM_SYM}; -struct obj * -readobjnam(bp) register char *bp; { -register char *p; -register int i; -int cnt, spe, spesgn, typ, heavy; -char let; -char *un, *dn, *an; -/* int the = 0; char *oname = 0; */ +struct obj * +readobjnam(bp) + char *bp; +{ + char *p; + int i; + int cnt, spe, spesgn, typ, heavy; + char let; + char *un, *dn, *an; + /* int the = 0; char *oname = 0; */ cnt = spe = spesgn = typ = heavy = 0; let = 0; an = dn = un = 0; - for(p = bp; *p; p++) - if('A' <= *p && *p <= 'Z') *p += 'a'-'A'; - if(!strncmp(bp, "the ", 4)){ -/* the = 1; */ + for (p = bp; *p; p++) + if ('A' <= *p && *p <= 'Z') + *p += 'a' - 'A'; + if (!strncmp(bp, "the ", 4)) { + /* the = 1; */ bp += 4; - } else if(!strncmp(bp, "an ", 3)){ + } else if (!strncmp(bp, "an ", 3)) { cnt = 1; bp += 3; - } else if(!strncmp(bp, "a ", 2)){ + } else if (!strncmp(bp, "a ", 2)) { cnt = 1; bp += 2; } - if(!cnt && digit(*bp)){ + if (!cnt && digit(*bp)) { cnt = atoi(bp); - while(digit(*bp)) bp++; - while(*bp == ' ') bp++; + while (digit(*bp)) + bp++; + while (*bp == ' ') + bp++; } - if(!cnt) cnt = 1; /* %% what with "gems" etc. ? */ + if (!cnt) + cnt = 1; /* %% what with "gems" etc. ? */ - if(*bp == '+' || *bp == '-'){ + if (*bp == '+' || *bp == '-') { spesgn = (*bp++ == '+') ? 1 : -1; spe = atoi(bp); - while(digit(*bp)) bp++; - while(*bp == ' ') bp++; + while (digit(*bp)) + bp++; + while (*bp == ' ') + bp++; } else { - p = rindex(bp, '('); - if(p) { - if(p > bp && p[-1] == ' ') p[-1] = 0; - else *p = 0; + p = strrchr(bp, '('); + if (p) { + if (p > bp && p[-1] == ' ') + p[-1] = 0; + else + *p = 0; p++; spe = atoi(p); - while(digit(*p)) p++; - if(strcmp(p, ")")) spe = 0; - else spesgn = 1; + while (digit(*p)) + p++; + if (strcmp(p, ")")) + spe = 0; + else + spesgn = 1; } } - /* now we have the actual name, as delivered by xname, say - green potions called whisky - scrolls labeled "QWERTY" - egg - dead zruties - fortune cookies - very heavy iron ball named hoei - wand of wishing - elven cloak - */ - for(p = bp; *p; p++) if(!strncmp(p, " named ", 7)) { - *p = 0; -/* oname = p+7; */ - } - for(p = bp; *p; p++) if(!strncmp(p, " called ", 8)) { - *p = 0; - un = p+8; - } - for(p = bp; *p; p++) if(!strncmp(p, " labeled ", 9)) { - *p = 0; - dn = p+9; - } - + /* + * now we have the actual name, as delivered by xname, say green + * potions called whisky scrolls labeled "QWERTY" egg dead zruties + * fortune cookies very heavy iron ball named hoei wand of wishing + * elven cloak + */ + for (p = bp; *p; p++) + if (!strncmp(p, " named ", 7)) { + *p = 0; + /* oname = p+7; */ + } + for (p = bp; *p; p++) + if (!strncmp(p, " called ", 8)) { + *p = 0; + un = p + 8; + } + for (p = bp; *p; p++) + if (!strncmp(p, " labeled ", 9)) { + *p = 0; + dn = p + 9; + } /* first change to singular if necessary */ - if(cnt != 1) { + if (cnt != 1) { /* find "cloves of garlic", "worthless pieces of blue glass" */ - for(p = bp; *p; p++) if(!strncmp(p, "s of ", 5)){ - while(*p = p[1]) p++; - goto sing; - } + for (p = bp; *p; p++) + if (!strncmp(p, "s of ", 5)) { + while ((*p = p[1]) != '\0') + p++; + goto sing; + } /* remove -s or -es (boxes) or -ies (rubies, zruties) */ p = eos(bp); - if(p[-1] == 's') { - if(p[-2] == 'e') { - if(p[-3] == 'i') { - if(!strcmp(p-7, "cookies")) + if (p[-1] == 's') { + if (p[-2] == 'e') { + if (p[-3] == 'i') { + if (!strcmp(p - 7, "cookies")) goto mins; - Strcpy(p-3, "y"); + Strcpy(p - 3, "y"); goto sing; } - /* note: cloves / knives from clove / knife */ - if(!strcmp(p-6, "knives")) { - Strcpy(p-3, "fe"); + if (!strcmp(p - 6, "knives")) { + Strcpy(p - 3, "fe"); goto sing; } - /* note: nurses, axes but boxes */ - if(!strcmp(p-5, "boxes")) { + if (!strcmp(p - 5, "boxes")) { p[-2] = 0; goto sing; } } - mins: + mins: p[-1] = 0; } else { - if(!strcmp(p-9, "homunculi")) { - Strcpy(p-1, "us"); /* !! makes string longer */ + if (!strcmp(p - 9, "homunculi")) { + Strcpy(p - 1, "us"); /* !! makes string + * longer */ goto sing; } - if(!strcmp(p-5, "teeth")) { - Strcpy(p-5, "tooth"); + if (!strcmp(p - 5, "teeth")) { + Strcpy(p - 5, "tooth"); goto sing; } /* here we cannot find the plural suffix */ } } sing: - if(!strcmp(bp, "amulet of yendor")) { + if (!strcmp(bp, "amulet of yendor")) { typ = AMULET_OF_YENDOR; goto typfnd; } p = eos(bp); - if(!strcmp(p-5, " mail")){ /* Note: ring mail is not a ring ! */ + if (!strcmp(p - 5, " mail")) { /* Note: ring mail is not a ring ! */ let = ARMOR_SYM; an = bp; goto srch; } - for(i = 0; i < sizeof(wrpsym); i++) { - register int j = strlen(wrp[i]); - if(!strncmp(bp, wrp[i], j)){ + for (i = 0; i < sizeof(wrpsym); i++) { + int j = strlen(wrp[i]); + if (!strncmp(bp, wrp[i], j)) { let = wrpsym[i]; bp += j; - if(!strncmp(bp, " of ", 4)) an = bp+4; + if (!strncmp(bp, " of ", 4)) + an = bp + 4; /* else if(*bp) ?? */ goto srch; } - if(!strcmp(p-j, wrp[i])){ + if (!strcmp(p - j, wrp[i])) { let = wrpsym[i]; p -= j; *p = 0; - if(p[-1] == ' ') p[-1] = 0; + if (p[-1] == ' ') + p[-1] = 0; dn = bp; goto srch; } } - if(!strcmp(p-6, " stone")){ + if (!strcmp(p - 6, " stone")) { p[-6] = 0; let = GEM_SYM; an = bp; goto srch; } - if(!strcmp(bp, "very heavy iron ball")){ + if (!strcmp(bp, "very heavy iron ball")) { heavy = 1; typ = HEAVY_IRON_BALL; goto typfnd; } an = bp; srch: - if(!an && !dn && !un) + if (!an && !dn && !un) goto any; i = 1; - if(let) i = bases[letindex(let)]; - while(i <= NROFOBJECTS && (!let || objects[i].oc_olet == let)){ - register char *zn = objects[i].oc_name; + if (let) + i = bases[letindex(let)]; + while (i <= NROFOBJECTS && (!let || objects[i].oc_olet == let)) { + char *zn = objects[i].oc_name; - if(!zn) goto nxti; - if(an && strcmp(an, zn)) + if (!zn) + goto nxti; + if (an && strcmp(an, zn)) goto nxti; - if(dn && (!(zn = objects[i].oc_descr) || strcmp(dn, zn))) + if (dn && (!(zn = objects[i].oc_descr) || strcmp(dn, zn))) goto nxti; - if(un && (!(zn = objects[i].oc_uname) || strcmp(un, zn))) + if (un && (!(zn = objects[i].oc_uname) || strcmp(un, zn))) goto nxti; typ = i; goto typfnd; - nxti: +nxti: i++; } any: - if(!let) let = wrpsym[rn2(sizeof(wrpsym))]; + if (!let) + let = wrpsym[rn2(sizeof(wrpsym))]; typ = probtype(let); typfnd: - { register struct obj *otmp; - extern struct obj *mksobj(); - let = objects[typ].oc_olet; - otmp = mksobj(typ); - if(heavy) - otmp->owt += 15; - if(cnt > 0 && index("%?!*)", let) && + { + struct obj *otmp; + let = objects[typ].oc_olet; + otmp = mksobj(typ); + if (heavy) + otmp->owt += 15; + if (cnt > 0 && strchr("%?!*)", let) && (cnt < 4 || (let == WEAPON_SYM && typ <= ROCK && cnt < 20))) - otmp->quan = cnt; + otmp->quan = cnt; - if(spe > 3 && spe > otmp->spe) - spe = 0; - else if(let == WAND_SYM) - spe = otmp->spe; - if(spe == 3 && u.uluck < 0) - spesgn = -1; - if(let != WAND_SYM && spesgn == -1) - spe = -spe; - if(let == BALL_SYM) - spe = 0; - else if(let == AMULET_SYM) - spe = -1; - else if(typ == WAN_WISHING && rn2(10)) - spe = (rn2(10) ? -1 : 0); - otmp->spe = spe; + if (spe > 3 && spe > otmp->spe) + spe = 0; + else if (let == WAND_SYM) + spe = otmp->spe; + if (spe == 3 && u.uluck < 0) + spesgn = -1; + if (let != WAND_SYM && spesgn == -1) + spe = -spe; + if (let == BALL_SYM) + spe = 0; + else if (let == AMULET_SYM) + spe = -1; + else if (typ == WAN_WISHING && rn2(10)) + spe = (rn2(10) ? -1 : 0); + otmp->spe = spe; - if(spesgn == -1) - otmp->cursed = 1; + if (spesgn == -1) + otmp->cursed = 1; - return(otmp); - } + return (otmp); + } } diff --git a/hack/hack.options.c b/hack/hack.options.c index 078ec7f0..e9f30473 100644 --- a/hack/hack.options.c +++ b/hack/hack.options.c @@ -1,133 +1,135 @@ +/* $NetBSD: hack.options.c,v 1.4 1997/10/19 16:58:42 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.options.c,v 1.3 1995/03/23 08:31:14 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.options.c,v 1.4 1997/10/19 16:58:42 christos Exp $"); +#endif /* not lint */ -#include "config.h" +#include <stdlib.h> #include "hack.h" -extern char *eos(); +#include "extern.h" +void initoptions() { - register char *opts; - extern char *getenv(); + char *opts; flags.time = flags.nonews = flags.notombstone = flags.end_own = - flags.standout = flags.nonull = FALSE; + flags.standout = flags.nonull = FALSE; flags.no_rest_on_space = TRUE; flags.invlet_constant = TRUE; flags.end_top = 5; flags.end_around = 4; - flags.female = FALSE; /* players are usually male */ + flags.female = FALSE; /* players are usually male */ - if(opts = getenv("HACKOPTIONS")) - parseoptions(opts,TRUE); + if ((opts = getenv("HACKOPTIONS")) != NULL) + parseoptions(opts, TRUE); } +void parseoptions(opts, from_env) -register char *opts; -boolean from_env; + char *opts; + boolean from_env; { - register char *op,*op2; - unsigned num; - boolean negated; + char *op, *op2; + unsigned num; + boolean negated; - if(op = index(opts, ',')) { + if ((op = strchr(opts, ',')) != NULL) { *op++ = 0; parseoptions(op, from_env); } - if(op = index(opts, ' ')) { + if ((op = strchr(opts, ' ')) != NULL) { op2 = op; - while(*op++) - if(*op != ' ') *op2++ = *op; + while (*op++) + if (*op != ' ') + *op2++ = *op; } - if(!*opts) return; + if (!*opts) + return; negated = FALSE; - while((*opts == '!') || !strncmp(opts, "no", 2)) { - if(*opts == '!') opts++; else opts += 2; + while ((*opts == '!') || !strncmp(opts, "no", 2)) { + if (*opts == '!') + opts++; + else + opts += 2; negated = !negated; } - - if(!strncmp(opts,"standout",8)) { + + if (!strncmp(opts, "standout", 8)) { flags.standout = !negated; return; } - - if(!strncmp(opts,"null",3)) { + if (!strncmp(opts, "null", 3)) { flags.nonull = negated; return; } - - if(!strncmp(opts,"tombstone",4)) { + if (!strncmp(opts, "tombstone", 4)) { flags.notombstone = negated; return; } - - if(!strncmp(opts,"news",4)) { + if (!strncmp(opts, "news", 4)) { flags.nonews = negated; return; } - - if(!strncmp(opts,"time",4)) { + if (!strncmp(opts, "time", 4)) { flags.time = !negated; flags.botl = 1; return; } - - if(!strncmp(opts,"restonspace",4)) { + if (!strncmp(opts, "restonspace", 4)) { flags.no_rest_on_space = negated; return; } - - if(!strncmp(opts,"fixinv",4)) { - if(from_env) + if (!strncmp(opts, "fixinv", 4)) { + if (from_env) flags.invlet_constant = !negated; else pline("The fixinvlet option must be in HACKOPTIONS."); return; } - - if(!strncmp(opts,"male",4)) { + if (!strncmp(opts, "male", 4)) { flags.female = negated; return; } - if(!strncmp(opts,"female",6)) { + if (!strncmp(opts, "female", 6)) { flags.female = !negated; return; } - /* name:string */ - if(!strncmp(opts,"name",4)) { - extern char plname[PL_NSIZ]; - if(!from_env) { - pline("The playername can be set only from HACKOPTIONS."); - return; + if (!strncmp(opts, "name", 4)) { + if (!from_env) { + pline("The playername can be set only from HACKOPTIONS."); + return; } - op = index(opts,':'); - if(!op) goto bad; - (void) strncpy(plname, op+1, sizeof(plname)-1); + op = strchr(opts, ':'); + if (!op) + goto bad; + (void) strncpy(plname, op + 1, sizeof(plname) - 1); return; } - /* endgame:5t[op] 5a[round] o[wn] */ - if(!strncmp(opts,"endgame",3)) { - op = index(opts,':'); - if(!op) goto bad; + if (!strncmp(opts, "endgame", 3)) { + op = strchr(opts, ':'); + if (!op) + goto bad; op++; - while(*op) { + while (*op) { num = 1; - if(digit(*op)) { + if (digit(*op)) { +/*###124 [cc] warning: implicit declaration of function `atoi'%%%*/ num = atoi(op); - while(digit(*op)) op++; - } else - if(*op == '!') { + while (digit(*op)) + op++; + } else if (*op == '!') { negated = !negated; op++; } - switch(*op) { + switch (*op) { case 't': flags.end_top = num; break; @@ -140,28 +142,29 @@ boolean from_env; default: goto bad; } - while(letter(*++op)) ; - if(*op == '/') op++; + while (letter(*++op)); + if (*op == '/') + op++; } return; } bad: - if(!from_env) { - if(!strncmp(opts, "help", 4)) { + if (!from_env) { + if (!strncmp(opts, "help", 4)) { pline("%s%s%s", -"To set options use `HACKOPTIONS=\"<options>\"' in your environment, or ", -"give the command 'o' followed by the line `<options>' while playing. ", -"Here <options> is a list of <option>s separated by commas." ); + "To set options use `HACKOPTIONS=\"<options>\"' in your environment, or ", + "give the command 'o' followed by the line `<options>' while playing. ", + "Here <options> is a list of <option>s separated by commas."); pline("%s%s%s", -"Simple (boolean) options are rest_on_space, news, time, ", -"null, tombstone, (fe)male. ", -"These can be negated by prefixing them with '!' or \"no\"." ); + "Simple (boolean) options are rest_on_space, news, time, ", + "null, tombstone, (fe)male. ", + "These can be negated by prefixing them with '!' or \"no\"."); pline("%s", -"A string option is name, as in HACKOPTIONS=\"name:Merlin-W\"." ); + "A string option is name, as in HACKOPTIONS=\"name:Merlin-W\"."); pline("%s%s%s", -"A compound option is endgame; it is followed by a description of what ", -"parts of the scorelist you want to see. You might for example say: ", -"`endgame:own scores/5 top scores/4 around my score'." ); + "A compound option is endgame; it is followed by a description of what ", + "parts of the scorelist you want to see. You might for example say: ", + "`endgame:own scores/5 top scores/4 around my score'."); return; } pline("Bad option: %s.", opts); @@ -171,38 +174,46 @@ bad: puts("Bad syntax in HACKOPTIONS."); puts("Use for example:"); puts( -"HACKOPTIONS=\"!restonspace,notombstone,endgame:own/5 topscorers/4 around me\"" - ); + "HACKOPTIONS=\"!restonspace,notombstone,endgame:own/5 topscorers/4 around me\"" + ); getret(); } +int doset() { - char buf[BUFSZ]; + char buf[BUFSZ]; pline("What options do you want to set? "); getlin(buf); - if(!buf[0] || buf[0] == '\033') { - (void) strcpy(buf,"HACKOPTIONS="); - (void) strcat(buf, flags.female ? "female," : "male,"); - if(flags.standout) (void) strcat(buf,"standout,"); - if(flags.nonull) (void) strcat(buf,"nonull,"); - if(flags.nonews) (void) strcat(buf,"nonews,"); - if(flags.time) (void) strcat(buf,"time,"); - if(flags.notombstone) (void) strcat(buf,"notombstone,"); - if(flags.no_rest_on_space) - (void) strcat(buf,"!rest_on_space,"); - if(flags.end_top != 5 || flags.end_around != 4 || flags.end_own){ - (void) sprintf(eos(buf), "endgame: %u topscores/%u around me", - flags.end_top, flags.end_around); - if(flags.end_own) (void) strcat(buf, "/own scores"); - } else { - register char *eop = eos(buf); - if(*--eop == ',') *eop = 0; - } - pline(buf); + if (!buf[0] || buf[0] == '\033') { + (void) strcpy(buf, "HACKOPTIONS="); + (void) strcat(buf, flags.female ? "female," : "male,"); + if (flags.standout) + (void) strcat(buf, "standout,"); + if (flags.nonull) + (void) strcat(buf, "nonull,"); + if (flags.nonews) + (void) strcat(buf, "nonews,"); + if (flags.time) + (void) strcat(buf, "time,"); + if (flags.notombstone) + (void) strcat(buf, "notombstone,"); + if (flags.no_rest_on_space) + (void) strcat(buf, "!rest_on_space,"); + if (flags.end_top != 5 || flags.end_around != 4 || flags.end_own) { + (void) sprintf(eos(buf), "endgame: %u topscores/%u around me", + flags.end_top, flags.end_around); + if (flags.end_own) + (void) strcat(buf, "/own scores"); + } else { + char *eop = eos(buf); + if (*--eop == ',') + *eop = 0; + } + pline(buf); } else - parseoptions(buf, FALSE); + parseoptions(buf, FALSE); - return(0); + return (0); } diff --git a/hack/hack.pager.c b/hack/hack.pager.c index 0e3d6817..dec6504b 100644 --- a/hack/hack.pager.c +++ b/hack/hack.pager.c @@ -1,91 +1,97 @@ +/* $NetBSD: hack.pager.c,v 1.5 1997/10/19 16:58:46 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.pager.c,v 1.4 1995/03/23 08:31:16 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.pager.c,v 1.5 1997/10/19 16:58:46 christos Exp $"); +#endif /* not lint */ /* This file contains the command routine dowhatis() and a pager. */ -/* Also readmail() and doshell(), and generally the things that - contact the outside world. */ - -#include <sys/types.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> +/* + * Also readmail() and doshell(), and generally the things that contact the + * outside world. + */ + +#include <sys/types.h> +#include <signal.h> +#include <stdlib.h> +#include <unistd.h> #include "hack.h" -extern int CO, LI; /* usually COLNO and ROWNO+2 */ -extern char *CD; -extern char quitchars[]; -void done1(); +#include "extern.h" +int dowhatis() { - FILE *fp; - char bufr[BUFSZ+6]; - register char *buf = &bufr[6], *ep, q; - extern char readchar(); + FILE *fp; + char bufr[BUFSZ + 6]; + char *buf = &bufr[6], *ep, q; - if(!(fp = fopen(DATAFILE, "r"))) + if (!(fp = fopen(DATAFILE, "r"))) pline("Cannot open data file!"); else { pline("Specify what? "); q = readchar(); - if(q != '\t') - while(fgets(buf,BUFSZ,fp)) - if(*buf == q) { - ep = index(buf, '\n'); - if(ep) *ep = 0; - /* else: bad data file */ - /* Expand tab 'by hand' */ - if(buf[1] == '\t'){ - buf = bufr; - buf[0] = q; - (void) strncpy(buf+1, " ", 7); - } - pline(buf); - if(ep[-1] == ';') { - pline("More info? "); - if(readchar() == 'y') { - page_more(fp,1); /* does fclose() */ - return(0); + if (q != '\t') + while (fgets(buf, BUFSZ, fp)) + if (*buf == q) { + ep = strchr(buf, '\n'); + if (ep) + *ep = 0; + /* else: bad data file */ + /* Expand tab 'by hand' */ + if (buf[1] == '\t') { + buf = bufr; + buf[0] = q; + (void) strncpy(buf + 1, " ", 7); + } + pline(buf); + if (ep[-1] == ';') { + pline("More info? "); + if (readchar() == 'y') { + page_more(fp, 1); /* does fclose() */ + return (0); + } + } + (void) fclose(fp); /* kopper@psuvax1 */ + return (0); } - } - (void) fclose(fp); /* kopper@psuvax1 */ - return(0); - } pline("I've never heard of such things."); (void) fclose(fp); } - return(0); + return (0); } /* make the paging of a file interruptible */ -static int got_intrup; +static int got_intrup; void -intruph(){ +intruph(n) + int n; +{ got_intrup++; } /* simple pager, also used from dohelp() */ -page_more(fp,strip) -FILE *fp; -int strip; /* nr of chars to be stripped from each line (0 or 1) */ +void +page_more(fp, strip) + FILE *fp; + int strip; /* nr of chars to be stripped from each line + * (0 or 1) */ { - register char *bufr, *ep; - sig_t prevsig = signal(SIGINT, intruph); + char *bufr, *ep; + sig_t prevsig = signal(SIGINT, intruph); set_pager(0); bufr = (char *) alloc((unsigned) CO); - bufr[CO-1] = 0; - while(fgets(bufr,CO-1,fp) && (!strip || *bufr == '\t') && !got_intrup){ - ep = index(bufr, '\n'); - if(ep) + bufr[CO - 1] = 0; + while (fgets(bufr, CO - 1, fp) && (!strip || *bufr == '\t') && !got_intrup) { + ep = strchr(bufr, '\n'); + if (ep) *ep = 0; - if(page_line(bufr+strip)) { + if (page_line(bufr + strip)) { set_pager(2); goto ret; } @@ -98,79 +104,84 @@ ret: got_intrup = 0; } -static boolean whole_screen = TRUE; -#define PAGMIN 12 /* minimum # of lines for page below level map */ +static boolean whole_screen = TRUE; +#define PAGMIN 12 /* minimum # of lines for page below level + * map */ -set_whole_screen() { /* called in termcap as soon as LI is known */ - whole_screen = (LI-ROWNO-2 <= PAGMIN || !CD); +void +set_whole_screen() +{ /* called in termcap as soon as LI is known */ + whole_screen = (LI - ROWNO - 2 <= PAGMIN || !CD); } #ifdef NEWS -readnews() { - register int ret; +int +readnews() +{ + int ret; whole_screen = TRUE; /* force a docrt(), our first */ ret = page_file(NEWS, TRUE); set_whole_screen(); - return(ret); /* report whether we did docrt() */ + return (ret); /* report whether we did docrt() */ } -#endif NEWS +#endif /* NEWS */ +void set_pager(mode) -register int mode; /* 0: open 1: wait+close 2: close */ + int mode; /* 0: open 1: wait+close 2: close */ { - static boolean so; - if(mode == 0) { - if(!whole_screen) { + static boolean so; + if (mode == 0) { + if (!whole_screen) { /* clear topline */ clrlin(); /* use part of screen below level map */ - curs(1, ROWNO+4); + curs(1, ROWNO + 4); } else { cls(); } so = flags.standout; flags.standout = 1; } else { - if(mode == 1) { + if (mode == 1) { curs(1, LI); more(); } flags.standout = so; - if(whole_screen) + if (whole_screen) docrt(); else { - curs(1, ROWNO+4); + curs(1, ROWNO + 4); cl_eos(); } } } -page_line(s) /* returns 1 if we should quit */ -register char *s; +int +page_line(s) /* returns 1 if we should quit */ + char *s; { - extern char morc; - - if(cury == LI-1) { - if(!*s) - return(0); /* suppress blank lines at top */ + if (cury == LI - 1) { + if (!*s) + return (0); /* suppress blank lines at top */ putchar('\n'); cury++; cmore("q\033"); - if(morc) { + if (morc) { morc = 0; - return(1); + return (1); } - if(whole_screen) + if (whole_screen) cls(); else { - curs(1, ROWNO+4); + curs(1, ROWNO + 4); cl_eos(); } } puts(s); cury++; - return(0); + return (0); } /* @@ -184,188 +195,198 @@ register char *s; * cornline(3, 0) : cleanup */ +void cornline(mode, text) -int mode; -char *text; + int mode; + char *text; { static struct line { - struct line *next_line; - char *line_text; - } *texthead, *texttail; - static int maxlen; - static int linect; - register struct line *tl; - - if(mode == 0) { + struct line *next_line; + char *line_text; + } *texthead, *texttail; + static int maxlen; + static int linect; + struct line *tl; + + if (mode == 0) { texthead = 0; maxlen = 0; linect = 0; - if(text) { + if (text) { cornline(1, text); /* title */ cornline(1, ""); /* blank line */ } return; } - - if(mode == 1) { - register int len; - - if(!text) return; /* superfluous, just to be sure */ - linect++; - len = strlen(text); - if(len > maxlen) - maxlen = len; - tl = (struct line *) - alloc((unsigned)(len + sizeof(struct line) + 1)); - tl->next_line = 0; - tl->line_text = (char *)(tl + 1); - (void) strcpy(tl->line_text, text); - if(!texthead) - texthead = tl; - else - texttail->next_line = tl; - texttail = tl; - return; + if (mode == 1) { + int len; + + if (!text) + return; /* superfluous, just to be sure */ + linect++; + len = strlen(text); + if (len > maxlen) + maxlen = len; + tl = (struct line *) + alloc((unsigned) (len + sizeof(struct line) + 1)); + tl->next_line = 0; + tl->line_text = (char *) (tl + 1); + (void) strcpy(tl->line_text, text); + if (!texthead) + texthead = tl; + else + texttail->next_line = tl; + texttail = tl; + return; } - /* --- now we really do it --- */ - if(mode == 2 && linect == 1) /* topline only */ + if (mode == 2 && linect == 1) /* topline only */ pline(texthead->line_text); - else - if(mode == 2) { - register int curline, lth; - - if(flags.toplin == 1) more(); /* ab@unido */ - remember_topl(); - - lth = CO - maxlen - 2; /* Use full screen width */ - if (linect < LI && lth >= 10) { /* in a corner */ - home (); - cl_end (); - flags.toplin = 0; - curline = 1; - for (tl = texthead; tl; tl = tl->next_line) { - curs (lth, curline); - if(curline > 1) - cl_end (); - putsym(' '); - putstr (tl->line_text); - curline++; - } - curs (lth, curline); - cl_end (); - cmore (text); - home (); - cl_end (); - docorner (lth, curline-1); - } else { /* feed to pager */ - set_pager(0); - for (tl = texthead; tl; tl = tl->next_line) { - if (page_line (tl->line_text)) { - set_pager(2); - goto cleanup; - } + else if (mode == 2) { + int curline, lth; + + if (flags.toplin == 1) + more(); /* ab@unido */ + remember_topl(); + + lth = CO - maxlen - 2; /* Use full screen width */ + if (linect < LI && lth >= 10) { /* in a corner */ + home(); + cl_end(); + flags.toplin = 0; + curline = 1; + for (tl = texthead; tl; tl = tl->next_line) { + curs(lth, curline); + if (curline > 1) + cl_end(); + putsym(' '); + putstr(tl->line_text); + curline++; + } + curs(lth, curline); + cl_end(); + cmore(text); + home(); + cl_end(); + docorner(lth, curline - 1); + } else { /* feed to pager */ + set_pager(0); + for (tl = texthead; tl; tl = tl->next_line) { + if (page_line(tl->line_text)) { + set_pager(2); + goto cleanup; + } + } + if (text) { + cgetret(text); + set_pager(2); + } else + set_pager(1); } - if(text) { - cgetret(text); - set_pager(2); - } else - set_pager(1); - } } - cleanup: - while(tl = texthead) { + while ((tl = texthead) != NULL) { texthead = tl->next_line; free((char *) tl); } } +int dohelp() { - char c; + char c; - pline ("Long or short help? "); - while (((c = readchar ()) != 'l') && (c != 's') && !index(quitchars,c)) - bell (); - if (!index(quitchars, c)) + pline("Long or short help? "); + while (((c = readchar()) != 'l') && (c != 's') && !strchr(quitchars, c)) + bell(); + if (!strchr(quitchars, c)) (void) page_file((c == 'l') ? HELP : SHELP, FALSE); - return(0); + return (0); } -page_file(fnam, silent) /* return: 0 - cannot open fnam; 1 - otherwise */ -register char *fnam; -boolean silent; +int +page_file(fnam, silent) /* return: 0 - cannot open fnam; 1 - + * otherwise */ + char *fnam; + boolean silent; { -#ifdef DEF_PAGER /* this implies that UNIX is defined */ - { - /* use external pager; this may give security problems */ +#ifdef DEF_PAGER /* this implies that UNIX is defined */ + { + /* use external pager; this may give security problems */ - register int fd = open(fnam, 0); + int fd = open(fnam, 0); - if(fd < 0) { - if(!silent) pline("Cannot open %s.", fnam); - return(0); - } - if(child(1)){ - extern char *catmore; - - /* Now that child() does a setuid(getuid()) and a chdir(), - we may not be able to open file fnam anymore, so make - it stdin. */ - (void) close(0); - if(dup(fd)) { - if(!silent) printf("Cannot open %s as stdin.\n", fnam); - } else { - execl(catmore, "page", (char *) 0); - if(!silent) printf("Cannot exec %s.\n", catmore); + if (fd < 0) { + if (!silent) + pline("Cannot open %s.", fnam); + return (0); } - exit(1); + if (child(1)) { + + /* + * Now that child() does a setuid(getuid()) and a + * chdir(), we may not be able to open file fnam + * anymore, so make it stdin. + */ + (void) close(0); + if (dup(fd)) { + if (!silent) + printf("Cannot open %s as stdin.\n", fnam); + } else { + execl(catmore, "page", (char *) 0); + if (!silent) + printf("Cannot exec %s.\n", catmore); + } + exit(1); + } + (void) close(fd); } - (void) close(fd); - } -#else DEF_PAGER - { - FILE *f; /* free after Robert Viduya */ - - if ((f = fopen (fnam, "r")) == (FILE *) 0) { - if(!silent) { - home(); perror (fnam); flags.toplin = 1; - pline ("Cannot open %s.", fnam); +#else /* DEF_PAGER */ + { + FILE *f; /* free after Robert Viduya */ + + if ((f = fopen(fnam, "r")) == (FILE *) 0) { + if (!silent) { + home(); + perror(fnam); + flags.toplin = 1; + pline("Cannot open %s.", fnam); + } + return (0); } - return(0); + page_more(f, 0); } - page_more(f, 0); - } -#endif DEF_PAGER +#endif /* DEF_PAGER */ - return(1); + return (1); } #ifdef UNIX #ifdef SHELL -dosh(){ -register char *str; - if(child(0)) { - if(str = getenv("SHELL")) +int +dosh() +{ + char *str; + if (child(0)) { + if ((str = getenv("SHELL")) != NULL) execl(str, str, (char *) 0); else execl("/bin/sh", "sh", (char *) 0); pline("sh: cannot execute."); exit(1); } - return(0); + return (0); } -#endif SHELL +#endif /* SHELL */ #ifdef NOWAITINCLUDE -union wait { /* used only for the cast (union wait *) 0 */ - int w_status; +union wait { /* used only for the cast (union wait *) 0 */ + int w_status; struct { - unsigned short w_Termsig:7; - unsigned short w_Coredump:1; - unsigned short w_Retcode:8; - } w_T; + unsigned short w_Termsig:7; + unsigned short w_Coredump:1; + unsigned short w_Retcode:8; + } w_T; }; #else @@ -374,39 +395,43 @@ union wait { /* used only for the cast (union wait *) 0 */ #include <sys/wait.h> #else #include <wait.h> -#endif BSD -#endif NOWAITINCLUDE +#endif /* BSD */ +#endif /* NOWAITINCLUDE */ -child(wt) { - int status; - register int f; +int +child(wt) +{ + int status; + int f; f = fork(); - if(f == 0){ /* child */ - settty((char *) 0); /* also calls end_screen() */ + if (f == 0) { /* child */ + settty((char *) 0); /* also calls end_screen() */ (void) setuid(getuid()); (void) setgid(getgid()); #ifdef CHDIR (void) chdir(getenv("HOME")); -#endif CHDIR - return(1); +#endif /* CHDIR */ + return (1); } - if(f == -1) { /* cannot fork */ + if (f == -1) { /* cannot fork */ pline("Fork failed. Try again."); - return(0); + return (0); } /* fork succeeded; wait for child to exit */ - (void) signal(SIGINT,SIG_IGN); - (void) signal(SIGQUIT,SIG_IGN); + (void) signal(SIGINT, SIG_IGN); + (void) signal(SIGQUIT, SIG_IGN); (void) wait(&status); gettty(); setftty(); - (void) signal(SIGINT,done1); + (void) signal(SIGINT, done1); #ifdef WIZARD - if(wizard) (void) signal(SIGQUIT,SIG_DFL); -#endif WIZARD - if(wt) getret(); + if (wizard) + (void) signal(SIGQUIT, SIG_DFL); +#endif /* WIZARD */ + if (wt) + getret(); docrt(); - return(0); + return (0); } -#endif UNIX +#endif /* UNIX */ diff --git a/hack/hack.potion.c b/hack/hack.potion.c index ed71901d..a94df1d9 100644 --- a/hack/hack.potion.c +++ b/hack/hack.potion.c @@ -1,33 +1,36 @@ +/* $NetBSD: hack.potion.c,v 1.4 1997/10/19 16:58:48 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.potion.c,v 1.3 1995/03/23 08:31:18 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.potion.c,v 1.4 1997/10/19 16:58:48 christos Exp $"); +#endif /* not lint */ #include "hack.h" -extern int float_down(); -extern char *nomovemsg; -extern struct monst youmonst; -extern struct monst *makemon(); +#include "extern.h" -dodrink() { - register struct obj *otmp,*objs; - register struct monst *mtmp; - register int unkn = 0, nothing = 0; +int +dodrink() +{ + struct obj *otmp, *objs; + struct monst *mtmp; + int unkn = 0, nothing = 0; otmp = getobj("!", "drink"); - if(!otmp) return(0); - if(!strcmp(objects[otmp->otyp].oc_descr, "smoky") && !rn2(13)) { + if (!otmp) + return (0); + if (!strcmp(objects[otmp->otyp].oc_descr, "smoky") && !rn2(13)) { ghost_from_bottle(); goto use_it; } - switch(otmp->otyp){ + switch (otmp->otyp) { case POT_RESTORE_STRENGTH: unkn++; pline("Wow! This makes you feel great!"); - if(u.ustr < u.ustrmax) { + if (u.ustr < u.ustrmax) { u.ustr = u.ustrmax; flags.botl = 1; } @@ -35,26 +38,27 @@ dodrink() { case POT_BOOZE: unkn++; pline("Ooph! This tastes like liquid fire!"); - Confusion += d(3,8); + Confusion += d(3, 8); /* the whiskey makes us feel better */ - if(u.uhp < u.uhpmax) losehp(-1, "bottle of whiskey"); - if(!rn2(4)) { + if (u.uhp < u.uhpmax) + losehp(-1, "bottle of whiskey"); + if (!rn2(4)) { pline("You pass out."); multi = -rnd(15); nomovemsg = "You awake with a headache."; } break; case POT_INVISIBILITY: - if(Invis || See_invisible) - nothing++; + if (Invis || See_invisible) + nothing++; else { - if(!Blind) - pline("Gee! All of a sudden, you can't see yourself."); - else - pline("You feel rather airy."), unkn++; - newsym(u.ux,u.uy); + if (!Blind) + pline("Gee! All of a sudden, you can't see yourself."); + else + pline("You feel rather airy."), unkn++; + newsym(u.ux, u.uy); } - Invis += rn1(15,31); + Invis += rn1(15, 31); break; case POT_FRUIT_JUICE: pline("This tastes like fruit juice."); @@ -64,27 +68,29 @@ dodrink() { pline("You begin to feel better."); flags.botl = 1; u.uhp += rnd(10); - if(u.uhp > u.uhpmax) + if (u.uhp > u.uhpmax) u.uhp = ++u.uhpmax; - if(Blind) Blind = 1; /* see on next move */ - if(Sick) Sick = 0; + if (Blind) + Blind = 1; /* see on next move */ + if (Sick) + Sick = 0; break; case POT_PARALYSIS: - if(Levitation) + if (Levitation) pline("You are motionlessly suspended."); else pline("Your feet are frozen to the floor!"); - nomul(-(rn1(10,25))); + nomul(-(rn1(10, 25))); break; case POT_MONSTER_DETECTION: - if(!fmon) { + if (!fmon) { strange_feeling(otmp, "You feel threatened."); - return(1); + return (1); } else { cls(); - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->mx > 0) - at(mtmp->mx,mtmp->my,mtmp->data->mlet); + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->mx > 0) + at(mtmp->mx, mtmp->my, mtmp->data->mlet); prme(); pline("You sense the presence of monsters."); more(); @@ -92,19 +98,19 @@ dodrink() { } break; case POT_OBJECT_DETECTION: - if(!fobj) { + if (!fobj) { strange_feeling(otmp, "You feel a pull downward."); - return(1); + return (1); } else { - for(objs = fobj; objs; objs = objs->nobj) - if(objs->ox != u.ux || objs->oy != u.uy) - goto outobjmap; - pline("You sense the presence of objects close nearby."); - break; - outobjmap: + for (objs = fobj; objs; objs = objs->nobj) + if (objs->ox != u.ux || objs->oy != u.uy) + goto outobjmap; + pline("You sense the presence of objects close nearby."); + break; + outobjmap: cls(); - for(objs = fobj; objs; objs = objs->nobj) - at(objs->ox,objs->oy,objs->olet); + for (objs = fobj; objs; objs = objs->nobj) + at(objs->ox, objs->oy, objs->olet); prme(); pline("You sense the presence of objects."); more(); @@ -113,60 +119,66 @@ dodrink() { break; case POT_SICKNESS: pline("Yech! This stuff tastes like poison."); - if(Poison_resistance) - pline("(But in fact it was biologically contaminated orange juice.)"); - losestr(rn1(4,3)); + if (Poison_resistance) + pline("(But in fact it was biologically contaminated orange juice.)"); + losestr(rn1(4, 3)); losehp(rnd(10), "contaminated potion"); break; case POT_CONFUSION: - if(!Confusion) + if (!Confusion) pline("Huh, What? Where am I?"); else nothing++; - Confusion += rn1(7,16); + Confusion += rn1(7, 16); break; case POT_GAIN_STRENGTH: pline("Wow do you feel strong!"); - if(u.ustr >= 118) break; /* > 118 is impossible */ - if(u.ustr > 17) u.ustr += rnd(118-u.ustr); - else u.ustr++; - if(u.ustr > u.ustrmax) u.ustrmax = u.ustr; + if (u.ustr >= 118) + break; /* > 118 is impossible */ + if (u.ustr > 17) + u.ustr += rnd(118 - u.ustr); + else + u.ustr++; + if (u.ustr > u.ustrmax) + u.ustrmax = u.ustr; flags.botl = 1; break; case POT_SPEED: - if(Wounded_legs) { + if (Wounded_legs) { heal_legs(); unkn++; break; } - if(!(Fast & ~INTRINSIC)) + if (!(Fast & ~INTRINSIC)) pline("You are suddenly moving much faster."); else pline("Your legs get new energy."), unkn++; - Fast += rn1(10,100); + Fast += rn1(10, 100); break; case POT_BLINDNESS: - if(!Blind) + if (!Blind) pline("A cloud of darkness falls upon you."); else nothing++; - Blind += rn1(100,250); + Blind += rn1(100, 250); seeoff(0); break; - case POT_GAIN_LEVEL: + case POT_GAIN_LEVEL: pluslvl(); break; case POT_EXTRA_HEALING: pline("You feel much better."); flags.botl = 1; - u.uhp += d(2,20)+1; - if(u.uhp > u.uhpmax) + u.uhp += d(2, 20) + 1; + if (u.uhp > u.uhpmax) u.uhp = (u.uhpmax += 2); - if(Blind) Blind = 1; - if(Sick) Sick = 0; + if (Blind) + Blind = 1; + if (Sick) + Sick = 0; break; case POT_LEVITATION: - if(!Levitation) + if (!Levitation) float_up(); else nothing++; @@ -175,149 +187,153 @@ dodrink() { break; default: impossible("What a funny potion! (%u)", otmp->otyp); - return(0); + return (0); } - if(nothing) { - unkn++; - pline("You have a peculiar feeling for a moment, then it passes."); + if (nothing) { + unkn++; + pline("You have a peculiar feeling for a moment, then it passes."); } - if(otmp->dknown && !objects[otmp->otyp].oc_name_known) { - if(!unkn) { + if (otmp->dknown && !objects[otmp->otyp].oc_name_known) { + if (!unkn) { objects[otmp->otyp].oc_name_known = 1; - more_experienced(0,10); - } else if(!objects[otmp->otyp].oc_uname) + more_experienced(0, 10); + } else if (!objects[otmp->otyp].oc_uname) docall(otmp); } use_it: useup(otmp); - return(1); + return (1); } +void pluslvl() { - register num; + int num; pline("You feel more experienced."); num = rnd(10); u.uhpmax += num; u.uhp += num; - if(u.ulevel < 14) { - extern long newuexp(); - - u.uexp = newuexp()+1; + if (u.ulevel < 14) { + u.uexp = newuexp() + 1; pline("Welcome to experience level %u.", ++u.ulevel); } flags.botl = 1; } -strange_feeling(obj,txt) -register struct obj *obj; -register char *txt; +void +strange_feeling(obj, txt) + struct obj *obj; + char *txt; { - if(flags.beginner) - pline("You have a strange feeling for a moment, then it passes."); + if (flags.beginner) + pline("You have a strange feeling for a moment, then it passes."); else - pline(txt); - if(!objects[obj->otyp].oc_name_known && !objects[obj->otyp].oc_uname) + pline(txt); + if (!objects[obj->otyp].oc_name_known && !objects[obj->otyp].oc_uname) docall(obj); useup(obj); } -char *bottlenames[] = { +char *bottlenames[] = { "bottle", "phial", "flagon", "carafe", "flask", "jar", "vial" }; +void potionhit(mon, obj) -register struct monst *mon; -register struct obj *obj; + struct monst *mon; + struct obj *obj; { - extern char *xname(); - register char *botlnam = bottlenames[rn2(SIZE(bottlenames))]; - boolean uclose, isyou = (mon == &youmonst); + char *botlnam = bottlenames[rn2(SIZE(bottlenames))]; + boolean uclose, isyou = (mon == &youmonst); - if(isyou) { + if (isyou) { uclose = TRUE; pline("The %s crashes on your head and breaks into shivers.", - botlnam); + botlnam); losehp(rnd(2), "thrown potion"); } else { - uclose = (dist(mon->mx,mon->my) < 3); + uclose = (dist(mon->mx, mon->my) < 3); /* perhaps 'E' and 'a' have no head? */ pline("The %s crashes on %s's head and breaks into shivers.", - botlnam, monnam(mon)); - if(rn2(5) && mon->mhp > 1) + botlnam, monnam(mon)); + if (rn2(5) && mon->mhp > 1) mon->mhp--; } pline("The %s evaporates.", xname(obj)); - if(!isyou && !rn2(3)) switch(obj->otyp) { + if (!isyou && !rn2(3)) + switch (obj->otyp) { - case POT_RESTORE_STRENGTH: - case POT_GAIN_STRENGTH: - case POT_HEALING: - case POT_EXTRA_HEALING: - if(mon->mhp < mon->mhpmax) { - mon->mhp = mon->mhpmax; - pline("%s looks sound and hale again!", Monnam(mon)); + case POT_RESTORE_STRENGTH: + case POT_GAIN_STRENGTH: + case POT_HEALING: + case POT_EXTRA_HEALING: + if (mon->mhp < mon->mhpmax) { + mon->mhp = mon->mhpmax; + pline("%s looks sound and hale again!", Monnam(mon)); + } + break; + case POT_SICKNESS: + if (mon->mhpmax > 3) + mon->mhpmax /= 2; + if (mon->mhp > 2) + mon->mhp /= 2; + break; + case POT_CONFUSION: + case POT_BOOZE: + mon->mconf = 1; + break; + case POT_INVISIBILITY: + unpmon(mon); + mon->minvis = 1; + pmon(mon); + break; + case POT_PARALYSIS: + mon->mfroz = 1; + break; + case POT_SPEED: + mon->mspeed = MFAST; + break; + case POT_BLINDNESS: + mon->mblinded |= 64 + rn2(64); + break; + /* + * case POT_GAIN_LEVEL: case POT_LEVITATION: case + * POT_FRUIT_JUICE: case POT_MONSTER_DETECTION: case + * POT_OBJECT_DETECTION: break; + */ } - break; - case POT_SICKNESS: - if(mon->mhpmax > 3) - mon->mhpmax /= 2; - if(mon->mhp > 2) - mon->mhp /= 2; - break; - case POT_CONFUSION: - case POT_BOOZE: - mon->mconf = 1; - break; - case POT_INVISIBILITY: - unpmon(mon); - mon->minvis = 1; - pmon(mon); - break; - case POT_PARALYSIS: - mon->mfroz = 1; - break; - case POT_SPEED: - mon->mspeed = MFAST; - break; - case POT_BLINDNESS: - mon->mblinded |= 64 + rn2(64); - break; -/* - case POT_GAIN_LEVEL: - case POT_LEVITATION: - case POT_FRUIT_JUICE: - case POT_MONSTER_DETECTION: - case POT_OBJECT_DETECTION: - break; -*/ - } - if(uclose && rn2(5)) + if (uclose && rn2(5)) potionbreathe(obj); obfree(obj, Null(obj)); } +void potionbreathe(obj) -register struct obj *obj; + struct obj *obj; { - switch(obj->otyp) { + switch (obj->otyp) { case POT_RESTORE_STRENGTH: case POT_GAIN_STRENGTH: - if(u.ustr < u.ustrmax) u.ustr++, flags.botl = 1; + if (u.ustr < u.ustrmax) + u.ustr++, flags.botl = 1; break; case POT_HEALING: case POT_EXTRA_HEALING: - if(u.uhp < u.uhpmax) u.uhp++, flags.botl = 1; + if (u.uhp < u.uhpmax) + u.uhp++, flags.botl = 1; break; case POT_SICKNESS: - if(u.uhp <= 5) u.uhp = 1; else u.uhp -= 5; + if (u.uhp <= 5) + u.uhp = 1; + else + u.uhp -= 5; flags.botl = 1; break; case POT_CONFUSION: case POT_BOOZE: - if(!Confusion) + if (!Confusion) pline("You feel somewhat dizzy."); Confusion += rnd(5); break; @@ -333,18 +349,16 @@ register struct obj *obj; pline("Your knees seem more flexible now."); break; case POT_BLINDNESS: - if(!Blind) pline("It suddenly gets dark."); + if (!Blind) + pline("It suddenly gets dark."); Blind += rnd(5); seeoff(0); break; -/* - case POT_GAIN_LEVEL: - case POT_LEVITATION: - case POT_FRUIT_JUICE: - case POT_MONSTER_DETECTION: - case POT_OBJECT_DETECTION: - break; -*/ + /* + * case POT_GAIN_LEVEL: case POT_LEVITATION: case + * POT_FRUIT_JUICE: case POT_MONSTER_DETECTION: case + * POT_OBJECT_DETECTION: break; + */ } /* note: no obfree() */ } @@ -358,29 +372,33 @@ register struct obj *obj; * -- If the flask is small, can one dip a large object? Does it magically * -- become a jug? Etc. */ -dodip(){ - register struct obj *potion, *obj; +int +dodip() +{ + struct obj *potion, *obj; - if(!(obj = getobj("#", "dip"))) - return(0); - if(!(potion = getobj("!", "dip into"))) - return(0); + if (!(obj = getobj("#", "dip"))) + return (0); + if (!(potion = getobj("!", "dip into"))) + return (0); pline("Interesting..."); - if(obj->otyp == ARROW || obj->otyp == DART || - obj->otyp == CROSSBOW_BOLT) { - if(potion->otyp == POT_SICKNESS) { + if (obj->otyp == ARROW || obj->otyp == DART || + obj->otyp == CROSSBOW_BOLT) { + if (potion->otyp == POT_SICKNESS) { useup(potion); - if(obj->spe < 7) obj->spe++; /* %% */ + if (obj->spe < 7) + obj->spe++; /* %% */ } } - return(1); + return (1); } -ghost_from_bottle(){ - extern struct permonst pm_ghost; - register struct monst *mtmp; +void +ghost_from_bottle() +{ + struct monst *mtmp; - if(!(mtmp = makemon(PM_GHOST,u.ux,u.uy))){ + if (!(mtmp = makemon(PM_GHOST, u.ux, u.uy))) { pline("This bottle turns out to be empty."); return; } diff --git a/hack/hack.pri.c b/hack/hack.pri.c index 0a8606ac..8e8c5bd4 100644 --- a/hack/hack.pri.c +++ b/hack/hack.pri.c @@ -1,132 +1,161 @@ +/* $NetBSD: hack.pri.c,v 1.5 1997/10/19 16:58:50 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.pri.c,v 1.4 1995/03/23 08:31:20 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.pri.c,v 1.5 1997/10/19 16:58:50 christos Exp $"); +#endif /* not lint */ #include "hack.h" -#include <stdio.h> -xchar scrlx, scrhx, scrly, scrhy; /* corners of new area on screen */ - -extern char *hu_stat[]; /* in eat.c */ -extern char *CD; +#include "extern.h" +xchar scrlx, scrhx, scrly, scrhy; /* corners of new area on + * screen */ +void swallowed() { - char ulook[] = "|@|"; + char ulook[] = "|@|"; ulook[1] = u.usym; cls(); - curs(u.ux-1, u.uy+1); + curs(u.ux - 1, u.uy + 1); fputs("/-\\", stdout); - curx = u.ux+2; - curs(u.ux-1, u.uy+2); + curx = u.ux + 2; + curs(u.ux - 1, u.uy + 2); fputs(ulook, stdout); - curx = u.ux+2; - curs(u.ux-1, u.uy+3); + curx = u.ux + 2; + curs(u.ux - 1, u.uy + 3); fputs("\\-/", stdout); - curx = u.ux+2; + curx = u.ux + 2; u.udispl = 1; u.udisx = u.ux; u.udisy = u.uy; } -/*VARARGS1*/ -boolean panicking; +/* VARARGS1 */ +boolean panicking; -panic(str,a1,a2,a3,a4,a5,a6) -char *str; +void +#ifdef __STDC__ +panic(const char *fmt, ...) +#else +panic(va_alist) + va_dcl +#endif { - if(panicking++) exit(1); /* avoid loops - this should never happen*/ + va_list ap; +#ifndef __STDC__ + const char *fmt; + va_start(ap); + fmt = va_arg(ap, const char *); +#else + va_start(ap, fmt); +#endif + if (panicking++) + exit(1); /* avoid loops - this should never happen */ home(); puts(" Suddenly, the dungeon collapses."); fputs(" ERROR: ", stdout); - printf(str,a1,a2,a3,a4,a5,a6); + vprintf(fmt, ap); + va_end(ap); #ifdef DEBUG #ifdef UNIX - if(!fork()) + if (!fork()) abort(); /* generate core dump */ -#endif UNIX -#endif DEBUG +#endif /* UNIX */ +#endif /* DEBUG */ more(); /* contains a fflush() */ done("panicked"); } -atl(x,y,ch) -register x,y; +void +atl(x, y, ch) +int x, y, ch; { - register struct rm *crm = &levl[x][y]; + struct rm *crm = &levl[x][y]; - if(x<0 || x>COLNO-1 || y<0 || y>ROWNO-1){ - impossible("atl(%d,%d,%c)",x,y,ch); + if (x < 0 || x > COLNO - 1 || y < 0 || y > ROWNO - 1) { + impossible("atl(%d,%d,%c)", x, y, ch); return; } - if(crm->seen && crm->scrsym == ch) return; + if (crm->seen && crm->scrsym == ch) + return; crm->scrsym = ch; crm->new = 1; - on_scr(x,y); + on_scr(x, y); } -on_scr(x,y) -register x,y; +void +on_scr(x, y) +int x, y; { - if(x < scrlx) scrlx = x; - if(x > scrhx) scrhx = x; - if(y < scrly) scrly = y; - if(y > scrhy) scrhy = y; + if (x < scrlx) + scrlx = x; + if (x > scrhx) + scrhx = x; + if (y < scrly) + scrly = y; + if (y > scrhy) + scrhy = y; } -/* call: (x,y) - display - (-1,0) - close (leave last symbol) - (-1,-1)- close (undo last symbol) - (-1,let)-open: initialize symbol - (-2,let)-change let -*/ +/* + * call: (x,y) - display (-1,0) - close (leave last symbol) (-1,-1)- close + * (undo last symbol) (-1,let)-open: initialize symbol (-2,let)-change let + */ -tmp_at(x,y) schar x,y; { -static schar prevx, prevy; -static char let; - if((int)x == -2){ /* change let call */ +void +tmp_at(x, y) + schar x, y; +{ + static schar prevx, prevy; + static char let; + if ((int) x == -2) { /* change let call */ let = y; return; } - if((int)x == -1 && (int)y >= 0){ /* open or close call */ + if ((int) x == -1 && (int) y >= 0) { /* open or close call */ let = y; prevx = -1; return; } - if(prevx >= 0 && cansee(prevx,prevy)) { + if (prevx >= 0 && cansee(prevx, prevy)) { delay_output(); prl(prevx, prevy); /* in case there was a monster */ at(prevx, prevy, levl[prevx][prevy].scrsym); } - if(x >= 0){ /* normal call */ - if(cansee(x,y)) at(x,y,let); + if (x >= 0) { /* normal call */ + if (cansee(x, y)) + at(x, y, let); prevx = x; prevy = y; - } else { /* close call */ + } else { /* close call */ let = 0; prevx = -1; } } /* like the previous, but the symbols are first erased on completion */ -Tmp_at(x,y) schar x,y; { -static char let; -static xchar cnt; -static coord tc[COLNO]; /* but watch reflecting beams! */ -register xx,yy; - if((int)x == -1) { - if(y > 0) { /* open call */ +void +Tmp_at(x, y) + schar x, y; +{ + static char let; + static xchar cnt; + static coord tc[COLNO]; /* but watch reflecting beams! */ + int xx, yy; + if ((int) x == -1) { + if (y > 0) { /* open call */ let = y; cnt = 0; return; } /* close call (do not distinguish y==0 and y==-1) */ - while(cnt--) { + while (cnt--) { xx = tc[cnt].x; yy = tc[cnt].y; prl(xx, yy); @@ -135,89 +164,106 @@ register xx,yy; cnt = let = 0; /* superfluous */ return; } - if((int)x == -2) { /* change let call */ + if ((int) x == -2) { /* change let call */ let = y; return; } /* normal call */ - if(cansee(x,y)) { - if(cnt) delay_output(); - at(x,y,let); + if (cansee(x, y)) { + if (cnt) + delay_output(); + at(x, y, let); tc[cnt].x = x; tc[cnt].y = y; - if(++cnt >= COLNO) panic("Tmp_at overflow?"); + if (++cnt >= COLNO) + panic("Tmp_at overflow?"); levl[x][y].new = 0; /* prevent pline-nscr erasing --- */ } } -setclipped(){ +void +setclipped() +{ error("Hack needs a screen of size at least %d by %d.\n", - ROWNO+2, COLNO); + ROWNO + 2, COLNO); } -at(x,y,ch) -register xchar x,y; -char ch; +void +at(x, y, ch) + xchar x, y; + char ch; { #ifndef lint /* if xchar is unsigned, lint will complain about if(x < 0) */ - if(x < 0 || x > COLNO-1 || y < 0 || y > ROWNO-1) { + if (x < 0 || x > COLNO - 1 || y < 0 || y > ROWNO - 1) { impossible("At gets 0%o at %d %d.", ch, x, y); return; } -#endif lint - if(!ch) { +#endif /* lint */ + if (!ch) { impossible("At gets null at %d %d.", x, y); return; } y += 2; - curs(x,y); + curs(x, y); (void) putchar(ch); curx++; } -prme(){ - if(!Invisible) at(u.ux,u.uy,u.usym); +void +prme() +{ + if (!Invisible) + at(u.ux, u.uy, u.usym); } +int doredraw() { docrt(); - return(0); + return (0); } +void docrt() { - register x,y; - register struct rm *room; - register struct monst *mtmp; + int x, y; + struct rm *room; + struct monst *mtmp; - if(u.uswallow) { + if (u.uswallow) { swallowed(); return; } cls(); -/* Some ridiculous code to get display of @ and monsters (almost) right */ - if(!Invisible) { + /* + * Some ridiculous code to get display of @ and monsters (almost) + * right + */ + if (!Invisible) { levl[(u.udisx = u.ux)][(u.udisy = u.uy)].scrsym = u.usym; levl[u.udisx][u.udisy].seen = 1; u.udispl = 1; - } else u.udispl = 0; + } else + u.udispl = 0; - seemons(); /* reset old positions */ - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) + seemons(); /* reset old positions */ + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) mtmp->mdispl = 0; - seemons(); /* force new positions to be shown */ -/* This nonsense should disappear soon --------------------------------- */ - - for(y = 0; y < ROWNO; y++) - for(x = 0; x < COLNO; x++) - if((room = &levl[x][y])->new) { + seemons(); /* force new positions to be shown */ + /* + * This nonsense should disappear soon + * --------------------------------- + */ + + for (y = 0; y < ROWNO; y++) + for (x = 0; x < COLNO; x++) + if ((room = &levl[x][y])->new) { room->new = 0; - at(x,y,room->scrsym); - } else if(room->seen) - at(x,y,room->scrsym); + at(x, y, room->scrsym); + } else if (room->seen) + at(x, y, room->scrsym); scrlx = COLNO; scrly = ROWNO; scrhx = scrhy = 0; @@ -225,61 +271,65 @@ docrt() bot(); } -docorner(xmin,ymax) register xmin,ymax; { - register x,y; - register struct rm *room; - register struct monst *mtmp; +void +docorner(xmin, ymax) + int xmin, ymax; +{ + int x, y; + struct rm *room; + struct monst *mtmp; - if(u.uswallow) { /* Can be done more efficiently */ + if (u.uswallow) { /* Can be done more efficiently */ swallowed(); return; } + seemons(); /* reset old positions */ + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->mx >= xmin && mtmp->my < ymax) + mtmp->mdispl = 0; + seemons(); /* force new positions to be shown */ - seemons(); /* reset old positions */ - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->mx >= xmin && mtmp->my < ymax) - mtmp->mdispl = 0; - seemons(); /* force new positions to be shown */ - - for(y = 0; y < ymax; y++) { - if(y > ROWNO && CD) break; - curs(xmin,y+2); + for (y = 0; y < ymax; y++) { + if (y > ROWNO && CD) + break; + curs(xmin, y + 2); cl_end(); - if(y < ROWNO) { - for(x = xmin; x < COLNO; x++) { - if((room = &levl[x][y])->new) { - room->new = 0; - at(x,y,room->scrsym); - } else - if(room->seen) - at(x,y,room->scrsym); - } + if (y < ROWNO) { + for (x = xmin; x < COLNO; x++) { + if ((room = &levl[x][y])->new) { + room->new = 0; + at(x, y, room->scrsym); + } else if (room->seen) + at(x, y, room->scrsym); + } } } - if(ymax > ROWNO) { - cornbot(xmin-1); - if(ymax > ROWNO+1 && CD) { - curs(1,ROWNO+3); + if (ymax > ROWNO) { + cornbot(xmin - 1); + if (ymax > ROWNO + 1 && CD) { + curs(1, ROWNO + 3); cl_eos(); } } } -curs_on_u(){ - curs(u.ux, u.uy+2); +void +curs_on_u() +{ + curs(u.ux, u.uy + 2); } +void pru() { - if(u.udispl && (Invisible || u.udisx != u.ux || u.udisy != u.uy)) + if (u.udispl && (Invisible || u.udisx != u.ux || u.udisy != u.uy)) /* if(! levl[u.udisx][u.udisy].new) */ - if(!vism_at(u.udisx, u.udisy)) - newsym(u.udisx, u.udisy); - if(Invisible) { + if (!vism_at(u.udisx, u.udisy)) + newsym(u.udisx, u.udisy); + if (Invisible) { u.udispl = 0; - prl(u.ux,u.uy); - } else - if(!u.udispl || u.udisx != u.ux || u.udisy != u.uy) { + prl(u.ux, u.uy); + } else if (!u.udispl || u.udisx != u.ux || u.udisy != u.uy) { atl(u.ux, u.uy, u.usym); u.udispl = 1; u.udisx = u.ux; @@ -290,293 +340,327 @@ pru() #ifndef NOWORM #include "def.wseg.h" -extern struct wseg *m_atseg; -#endif NOWORM +#endif /* NOWORM */ /* print a position that is visible for @ */ -prl(x,y) +void +prl(x, y) { - register struct rm *room; - register struct monst *mtmp; - register struct obj *otmp; + struct rm *room; + struct monst *mtmp; + struct obj *otmp; - if(x == u.ux && y == u.uy && (!Invisible)) { + if (x == u.ux && y == u.uy && (!Invisible)) { pru(); return; } - if(!isok(x,y)) return; + if (!isok(x, y)) + return; room = &levl[x][y]; - if((!room->typ) || - (IS_ROCK(room->typ) && levl[u.ux][u.uy].typ == CORR)) + if ((!room->typ) || + (IS_ROCK(room->typ) && levl[u.ux][u.uy].typ == CORR)) return; - if((mtmp = m_at(x,y)) && !mtmp->mhide && - (!mtmp->minvis || See_invisible)) { + if ((mtmp = m_at(x, y)) && !mtmp->mhide && + (!mtmp->minvis || See_invisible)) { #ifndef NOWORM - if(m_atseg) + if (m_atseg) pwseg(m_atseg); else -#endif NOWORM - pmon(mtmp); - } - else if((otmp = o_at(x,y)) && room->typ != POOL) - atl(x,y,otmp->olet); - else if(mtmp && (!mtmp->minvis || See_invisible)) { +#endif /* NOWORM */ + pmon(mtmp); + } else if ((otmp = o_at(x, y)) && room->typ != POOL) + atl(x, y, otmp->olet); + else if (mtmp && (!mtmp->minvis || See_invisible)) { /* must be a hiding monster, but not hiding right now */ /* assume for the moment that long worms do not hide */ pmon(mtmp); - } - else if(g_at(x,y) && room->typ != POOL) - atl(x,y,'$'); - else if(!room->seen || room->scrsym == ' ') { + } else if (g_at(x, y) && room->typ != POOL) + atl(x, y, '$'); + else if (!room->seen || room->scrsym == ' ') { room->new = room->seen = 1; - newsym(x,y); - on_scr(x,y); + newsym(x, y); + on_scr(x, y); } room->seen = 1; } char -news0(x,y) -register xchar x,y; +news0(x, y) + xchar x, y; { - register struct obj *otmp; - register struct trap *ttmp; - struct rm *room; - register char tmp; + struct obj *otmp; + struct trap *ttmp; + struct rm *room; + char tmp; room = &levl[x][y]; - if(!room->seen) tmp = ' '; - else if(room->typ == POOL) tmp = POOL_SYM; - else if(!Blind && (otmp = o_at(x,y))) tmp = otmp->olet; - else if(!Blind && g_at(x,y)) tmp = '$'; - else if(x == xupstair && y == yupstair) tmp = '<'; - else if(x == xdnstair && y == ydnstair) tmp = '>'; - else if((ttmp = t_at(x,y)) && ttmp->tseen) tmp = '^'; - else switch(room->typ) { - case SCORR: - case SDOOR: - tmp = room->scrsym; /* %% wrong after killing mimic ! */ - break; - case HWALL: - tmp = '-'; - break; - case VWALL: - tmp = '|'; - break; - case LDOOR: - case DOOR: - tmp = '+'; - break; - case CORR: - tmp = CORR_SYM; - break; - case ROOM: - if(room->lit || cansee(x,y) || Blind) tmp = '.'; - else tmp = ' '; - break; -/* - case POOL: + if (!room->seen) + tmp = ' '; + else if (room->typ == POOL) tmp = POOL_SYM; - break; -*/ - default: - tmp = ERRCHAR; - } - return(tmp); + else if (!Blind && (otmp = o_at(x, y))) + tmp = otmp->olet; + else if (!Blind && g_at(x, y)) + tmp = '$'; + else if (x == xupstair && y == yupstair) + tmp = '<'; + else if (x == xdnstair && y == ydnstair) + tmp = '>'; + else if ((ttmp = t_at(x, y)) && ttmp->tseen) + tmp = '^'; + else + switch (room->typ) { + case SCORR: + case SDOOR: + tmp = room->scrsym; /* %% wrong after killing + * mimic ! */ + break; + case HWALL: + tmp = '-'; + break; + case VWALL: + tmp = '|'; + break; + case LDOOR: + case DOOR: + tmp = '+'; + break; + case CORR: + tmp = CORR_SYM; + break; + case ROOM: + if (room->lit || cansee(x, y) || Blind) + tmp = '.'; + else + tmp = ' '; + break; + /* + case POOL: + tmp = POOL_SYM; + break; + */ + default: + tmp = ERRCHAR; + } + return (tmp); } -newsym(x,y) -register x,y; +void +newsym(x, y) + int x, y; { - atl(x,y,news0(x,y)); + atl(x, y, news0(x, y)); } /* used with wand of digging (or pick-axe): fill scrsym and force display */ /* also when a POOL evaporates */ -mnewsym(x,y) -register x,y; +void +mnewsym(x, y) + int x, y; { - register struct rm *room; - char newscrsym; + struct rm *room; + char newscrsym; - if(!vism_at(x,y)) { + if (!vism_at(x, y)) { room = &levl[x][y]; - newscrsym = news0(x,y); - if(room->scrsym != newscrsym) { + newscrsym = news0(x, y); + if (room->scrsym != newscrsym) { room->scrsym = newscrsym; room->seen = 0; } } } -nosee(x,y) -register x,y; +void +nosee(x, y) + int x, y; { - register struct rm *room; + struct rm *room; - if(!isok(x,y)) return; + if (!isok(x, y)) + return; room = &levl[x][y]; - if(room->scrsym == '.' && !room->lit && !Blind) { + if (room->scrsym == '.' && !room->lit && !Blind) { room->scrsym = ' '; room->new = 1; - on_scr(x,y); + on_scr(x, y); } } #ifndef QUEST -prl1(x,y) -register x,y; -{ - if(u.dx) { - if(u.dy) { - prl(x-(2*u.dx),y); - prl(x-u.dx,y); - prl(x,y); - prl(x,y-u.dy); - prl(x,y-(2*u.dy)); +void +prl1(x, y) + int x, y; +{ + if (u.dx) { + if (u.dy) { + prl(x - (2 * u.dx), y); + prl(x - u.dx, y); + prl(x, y); + prl(x, y - u.dy); + prl(x, y - (2 * u.dy)); } else { - prl(x,y-1); - prl(x,y); - prl(x,y+1); + prl(x, y - 1); + prl(x, y); + prl(x, y + 1); } } else { - prl(x-1,y); - prl(x,y); - prl(x+1,y); + prl(x - 1, y); + prl(x, y); + prl(x + 1, y); } } -nose1(x,y) -register x,y; +void +nose1(x, y) + int x, y; { - if(u.dx) { - if(u.dy) { - nosee(x,u.uy); - nosee(x,u.uy-u.dy); - nosee(x,y); - nosee(u.ux-u.dx,y); - nosee(u.ux,y); + if (u.dx) { + if (u.dy) { + nosee(x, u.uy); + nosee(x, u.uy - u.dy); + nosee(x, y); + nosee(u.ux - u.dx, y); + nosee(u.ux, y); } else { - nosee(x,y-1); - nosee(x,y); - nosee(x,y+1); + nosee(x, y - 1); + nosee(x, y); + nosee(x, y + 1); } } else { - nosee(x-1,y); - nosee(x,y); - nosee(x+1,y); + nosee(x - 1, y); + nosee(x, y); + nosee(x + 1, y); } } -#endif QUEST +#endif /* QUEST */ -vism_at(x,y) -register x,y; +int +vism_at(x, y) + int x, y; { - register struct monst *mtmp; + struct monst *mtmp; - return((x == u.ux && y == u.uy && !Invisible) - ? 1 : - (mtmp = m_at(x,y)) - ? ((Blind && Telepat) || canseemon(mtmp)) : + return ((x == u.ux && y == u.uy && !Invisible) + ? 1 : + (mtmp = m_at(x, y)) + ? ((Blind && Telepat) || canseemon(mtmp)) : 0); } #ifdef NEWSCR -pobj(obj) register struct obj *obj; { -register int show = (!obj->oinvis || See_invisible) && - cansee(obj->ox,obj->oy); - if(obj->odispl){ - if(obj->odx != obj->ox || obj->ody != obj->oy || !show) - if(!vism_at(obj->odx,obj->ody)){ - newsym(obj->odx, obj->ody); - obj->odispl = 0; - } +void +pobj(obj) + struct obj *obj; +{ + int show = (!obj->oinvis || See_invisible) && + cansee(obj->ox, obj->oy); + if (obj->odispl) { + if (obj->odx != obj->ox || obj->ody != obj->oy || !show) + if (!vism_at(obj->odx, obj->ody)) { + newsym(obj->odx, obj->ody); + obj->odispl = 0; + } } - if(show && !vism_at(obj->ox,obj->oy)){ - atl(obj->ox,obj->oy,obj->olet); + if (show && !vism_at(obj->ox, obj->oy)) { + atl(obj->ox, obj->oy, obj->olet); obj->odispl = 1; obj->odx = obj->ox; obj->ody = obj->oy; } } -#endif NEWSCR +#endif /* NEWSCR */ -unpobj(obj) register struct obj *obj; { -/* if(obj->odispl){ - if(!vism_at(obj->odx, obj->ody)) - newsym(obj->odx, obj->ody); - obj->odispl = 0; - } -*/ - if(!vism_at(obj->ox,obj->oy)) - newsym(obj->ox,obj->oy); +void +unpobj(obj) + struct obj *obj; +{ + /* + * if(obj->odispl){ if(!vism_at(obj->odx, obj->ody)) newsym(obj->odx, + * obj->ody); obj->odispl = 0; } + */ + if (!vism_at(obj->ox, obj->oy)) + newsym(obj->ox, obj->oy); } -seeobjs(){ -register struct obj *obj, *obj2; - for(obj = fobj; obj; obj = obj2) { +void +seeobjs() +{ + struct obj *obj, *obj2; + for (obj = fobj; obj; obj = obj2) { obj2 = obj->nobj; - if(obj->olet == FOOD_SYM && obj->otyp >= CORPSE - && obj->age + 250 < moves) - delobj(obj); + if (obj->olet == FOOD_SYM && obj->otyp >= CORPSE + && obj->age + 250 < moves) + delobj(obj); } - for(obj = invent; obj; obj = obj2) { + for (obj = invent; obj; obj = obj2) { obj2 = obj->nobj; - if(obj->olet == FOOD_SYM && obj->otyp >= CORPSE - && obj->age + 250 < moves) - useup(obj); + if (obj->olet == FOOD_SYM && obj->otyp >= CORPSE + && obj->age + 250 < moves) + useup(obj); } } -seemons(){ -register struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon){ - if(mtmp->data->mlet == ';') +void +seemons() +{ + struct monst *mtmp; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + if (mtmp->data->mlet == ';') mtmp->minvis = (u.ustuck != mtmp && - levl[mtmp->mx][mtmp->my].typ == POOL); + levl[mtmp->mx][mtmp->my].typ == POOL); pmon(mtmp); #ifndef NOWORM - if(mtmp->wormno) wormsee(mtmp->wormno); -#endif NOWORM + if (mtmp->wormno) + wormsee(mtmp->wormno); +#endif /* NOWORM */ } } -pmon(mon) register struct monst *mon; { -register int show = (Blind && Telepat) || canseemon(mon); - if(mon->mdispl){ - if(mon->mdx != mon->mx || mon->mdy != mon->my || !show) +void +pmon(mon) + struct monst *mon; +{ + int show = (Blind && Telepat) || canseemon(mon); + if (mon->mdispl) { + if (mon->mdx != mon->mx || mon->mdy != mon->my || !show) unpmon(mon); } - if(show && !mon->mdispl){ - atl(mon->mx,mon->my, - (!mon->mappearance - || u.uprops[PROP(RIN_PROTECTION_FROM_SHAPE_CHANGERS)].p_flgs - ) ? mon->data->mlet : mon->mappearance); + if (show && !mon->mdispl) { + atl(mon->mx, mon->my, + (!mon->mappearance + || u.uprops[PROP(RIN_PROTECTION_FROM_SHAPE_CHANGERS)].p_flgs + ) ? mon->data->mlet : mon->mappearance); mon->mdispl = 1; mon->mdx = mon->mx; mon->mdy = mon->my; } } -unpmon(mon) register struct monst *mon; { - if(mon->mdispl){ +void +unpmon(mon) + struct monst *mon; +{ + if (mon->mdispl) { newsym(mon->mdx, mon->mdy); mon->mdispl = 0; } } +void nscr() { - register x,y; - register struct rm *room; + int x, y; + struct rm *room; - if(u.uswallow || u.ux == FAR || flags.nscrinh) return; + if (u.uswallow || u.ux == FAR || flags.nscrinh) + return; pru(); - for(y = scrly; y <= scrhy; y++) - for(x = scrlx; x <= scrhx; x++) - if((room = &levl[x][y])->new) { + for (y = scrly; y <= scrhy; y++) + for (x = scrlx; x <= scrhx; x++) + if ((room = &levl[x][y])->new) { room->new = 0; - at(x,y,room->scrsym); + at(x, y, room->scrsym); } scrhx = scrhy = 0; scrlx = COLNO; @@ -584,78 +668,87 @@ nscr() } /* 100 suffices for bot(); no relation with COLNO */ -char oldbot[100], newbot[100]; +char oldbot[100], newbot[100]; +void cornbot(lth) -register int lth; + int lth; { - if(lth < sizeof(oldbot)) { + if (lth < sizeof(oldbot)) { oldbot[lth] = 0; flags.botl = 1; } } +void bot() { -register char *ob = oldbot, *nb = newbot; -register int i; -extern char *eos(); - if(flags.botlx) *ob = 0; + char *ob = oldbot, *nb = newbot; + int i; + if (flags.botlx) + *ob = 0; flags.botl = flags.botlx = 0; #ifdef GOLD_ON_BOTL (void) sprintf(newbot, - "Level %-2d Gold %-5lu Hp %3d(%d) Ac %-2d Str ", - dlevel, u.ugold, u.uhp, u.uhpmax, u.uac); + "Level %-2d Gold %-5lu Hp %3d(%d) Ac %-2d Str ", + dlevel, u.ugold, u.uhp, u.uhpmax, u.uac); #else (void) sprintf(newbot, - "Level %-2d Hp %3d(%d) Ac %-2d Str ", - dlevel, u.uhp, u.uhpmax, u.uac); -#endif GOLD_ON_BOTL - if(u.ustr>18) { - if(u.ustr>117) - (void) strcat(newbot,"18/**"); - else - (void) sprintf(eos(newbot), "18/%02d",u.ustr-18); + "Level %-2d Hp %3d(%d) Ac %-2d Str ", + dlevel, u.uhp, u.uhpmax, u.uac); +#endif /* GOLD_ON_BOTL */ + if (u.ustr > 18) { + if (u.ustr > 117) + (void) strcat(newbot, "18/**"); + else + (void) sprintf(eos(newbot), "18/%02d", u.ustr - 18); } else - (void) sprintf(eos(newbot), "%-2d ",u.ustr); + (void) sprintf(eos(newbot), "%-2d ", u.ustr); #ifdef EXP_ON_BOTL - (void) sprintf(eos(newbot), " Exp %2d/%-5lu ", u.ulevel,u.uexp); + (void) sprintf(eos(newbot), " Exp %2d/%-5lu ", u.ulevel, u.uexp); #else (void) sprintf(eos(newbot), " Exp %2u ", u.ulevel); -#endif EXP_ON_BOTL +#endif /* EXP_ON_BOTL */ (void) strcat(newbot, hu_stat[u.uhs]); - if(flags.time) - (void) sprintf(eos(newbot), " %ld", moves); - if(strlen(newbot) >= COLNO) { - register char *bp0, *bp1; + if (flags.time) + (void) sprintf(eos(newbot), " %ld", moves); + if (strlen(newbot) >= COLNO) { + char *bp0, *bp1; bp0 = bp1 = newbot; do { - if(*bp0 != ' ' || bp0[1] != ' ' || bp0[2] != ' ') + if (*bp0 != ' ' || bp0[1] != ' ' || bp0[2] != ' ') *bp1++ = *bp0; - } while(*bp0++); + } while (*bp0++); } - for(i = 1; i<COLNO; i++) { - if(*ob != *nb){ - curs(i,ROWNO+2); + for (i = 1; i < COLNO; i++) { + if (*ob != *nb) { + curs(i, ROWNO + 2); (void) putchar(*nb ? *nb : ' '); curx++; } - if(*ob) ob++; - if(*nb) nb++; + if (*ob) + ob++; + if (*nb) + nb++; } (void) strcpy(oldbot, newbot); } #ifdef WAN_PROBING -mstatusline(mtmp) register struct monst *mtmp; { +void +mstatusline(mtmp) + struct monst *mtmp; +{ pline("Status of %s: ", monnam(mtmp)); pline("Level %-2d Gold %-5lu Hp %3d(%d) Ac %-2d Dam %d", - mtmp->data->mlevel, mtmp->mgold, mtmp->mhp, mtmp->mhpmax, - mtmp->data->ac, (mtmp->data->damn + 1) * (mtmp->data->damd + 1)); + mtmp->data->mlevel, mtmp->mgold, mtmp->mhp, mtmp->mhpmax, + mtmp->data->ac, (mtmp->data->damn + 1) * (mtmp->data->damd + 1)); } -#endif WAN_PROBING +#endif /* WAN_PROBING */ -cls(){ - if(flags.toplin == 1) +void +cls() +{ + if (flags.toplin == 1) more(); flags.toplin = 0; diff --git a/hack/hack.read.c b/hack/hack.read.c index 7fbbf8a7..7e2f4ebf 100644 --- a/hack/hack.read.c +++ b/hack/hack.read.c @@ -1,95 +1,99 @@ +/* $NetBSD: hack.read.c,v 1.4 1997/10/19 16:58:52 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.read.c,v 1.3 1995/03/23 08:31:22 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.read.c,v 1.4 1997/10/19 16:58:52 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" +#include "extern.h" -extern struct monst *makemon(); -extern struct obj *mkobj_at(); -int identify(); - -doread() { - register struct obj *scroll; - register boolean confused = (Confusion != 0); - register boolean known = FALSE; - extern struct obj *some_armor(); +int +doread() +{ + struct obj *scroll; + boolean confused = (Confusion != 0); + boolean known = FALSE; scroll = getobj("?", "read"); - if(!scroll) return(0); - if(!scroll->dknown && Blind) { - pline("Being blind, you cannot read the formula on the scroll."); - return(0); + if (!scroll) + return (0); + if (!scroll->dknown && Blind) { + pline("Being blind, you cannot read the formula on the scroll."); + return (0); } - if(Blind) - pline("As you pronounce the formula on it, the scroll disappears."); + if (Blind) + pline("As you pronounce the formula on it, the scroll disappears."); else - pline("As you read the scroll, it disappears."); - if(confused) - pline("Being confused, you mispronounce the magic words ... "); + pline("As you read the scroll, it disappears."); + if (confused) + pline("Being confused, you mispronounce the magic words ... "); - switch(scroll->otyp) { + switch (scroll->otyp) { #ifdef MAIL case SCR_MAIL: - readmail(/* scroll */); + readmail( /* scroll */ ); break; -#endif MAIL +#endif /* MAIL */ case SCR_ENCHANT_ARMOR: - { register struct obj *otmp = some_armor(); - if(!otmp) { - strange_feeling(scroll,"Your skin glows then fades."); - return(1); - } - if(confused) { - pline("Your %s glows silver for a moment.", - objects[otmp->otyp].oc_name); - otmp->rustfree = 1; - break; - } - if(otmp->spe > 3 && rn2(otmp->spe)) { - pline("Your %s glows violently green for a while, then evaporates.", - objects[otmp->otyp].oc_name); - useup(otmp); + { + struct obj *otmp = some_armor(); + if (!otmp) { + strange_feeling(scroll, "Your skin glows then fades."); + return (1); + } + if (confused) { + pline("Your %s glows silver for a moment.", + objects[otmp->otyp].oc_name); + otmp->rustfree = 1; + break; + } + if (otmp->spe > 3 && rn2(otmp->spe)) { + pline("Your %s glows violently green for a while, then evaporates.", + objects[otmp->otyp].oc_name); + useup(otmp); + break; + } + pline("Your %s glows green for a moment.", + objects[otmp->otyp].oc_name); + otmp->cursed = 0; + otmp->spe++; break; } - pline("Your %s glows green for a moment.", - objects[otmp->otyp].oc_name); - otmp->cursed = 0; - otmp->spe++; - break; - } case SCR_DESTROY_ARMOR: - if(confused) { - register struct obj *otmp = some_armor(); - if(!otmp) { - strange_feeling(scroll,"Your bones itch."); - return(1); + if (confused) { + struct obj *otmp = some_armor(); + if (!otmp) { + strange_feeling(scroll, "Your bones itch."); + return (1); } pline("Your %s glows purple for a moment.", - objects[otmp->otyp].oc_name); + objects[otmp->otyp].oc_name); otmp->rustfree = 0; break; } - if(uarm) { - pline("Your armor turns to dust and falls to the floor!"); - useup(uarm); - } else if(uarmh) { - pline("Your helmet turns to dust and is blown away!"); - useup(uarmh); - } else if(uarmg) { + if (uarm) { + pline("Your armor turns to dust and falls to the floor!"); + useup(uarm); + } else if (uarmh) { + pline("Your helmet turns to dust and is blown away!"); + useup(uarmh); + } else if (uarmg) { pline("Your gloves vanish!"); useup(uarmg); selftouch("You"); } else { - strange_feeling(scroll,"Your skin itches."); - return(1); + strange_feeling(scroll, "Your skin itches."); + return (1); } break; case SCR_CONFUSE_MONSTER: - if(confused) { + if (confused) { pline("Your hands begin to glow purple."); Confusion += rnd(100); } else { @@ -98,324 +102,351 @@ doread() { } break; case SCR_SCARE_MONSTER: - { register int ct = 0; - register struct monst *mtmp; + { + int ct = 0; + struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(cansee(mtmp->mx,mtmp->my)) { - if(confused) - mtmp->mflee = mtmp->mfroz = - mtmp->msleep = 0; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (cansee(mtmp->mx, mtmp->my)) { + if (confused) + mtmp->mflee = mtmp->mfroz = + mtmp->msleep = 0; + else + mtmp->mflee = 1; + ct++; + } + if (!ct) { + if (confused) + pline("You hear sad wailing in the distance."); else - mtmp->mflee = 1; - ct++; + pline("You hear maniacal laughter in the distance."); } - if(!ct) { - if(confused) - pline("You hear sad wailing in the distance."); - else - pline("You hear maniacal laughter in the distance."); + break; } - break; - } case SCR_BLANK_PAPER: - if(confused) - pline("You see strange patterns on this scroll."); + if (confused) + pline("You see strange patterns on this scroll."); else - pline("This scroll seems to be blank."); + pline("This scroll seems to be blank."); break; case SCR_REMOVE_CURSE: - { register struct obj *obj; - if(confused) - pline("You feel like you need some help."); - else - pline("You feel like someone is helping you."); - for(obj = invent; obj ; obj = obj->nobj) - if(obj->owornmask) - obj->cursed = confused; - if(Punished && !confused) { - Punished = 0; - freeobj(uchain); - unpobj(uchain); - free((char *) uchain); - uball->spe = 0; - uball->owornmask &= ~W_BALL; - uchain = uball = (struct obj *) 0; + { + struct obj *obj; + if (confused) + pline("You feel like you need some help."); + else + pline("You feel like someone is helping you."); + for (obj = invent; obj; obj = obj->nobj) + if (obj->owornmask) + obj->cursed = confused; + if (Punished && !confused) { + Punished = 0; + freeobj(uchain); + unpobj(uchain); + free((char *) uchain); + uball->spe = 0; + uball->owornmask &= ~W_BALL; + uchain = uball = (struct obj *) 0; + } + break; } - break; - } case SCR_CREATE_MONSTER: - { register int cnt = 1; + { + int cnt = 1; - if(!rn2(73)) cnt += rnd(4); - if(confused) cnt += 12; - while(cnt--) - (void) makemon(confused ? PM_ACID_BLOB : - (struct permonst *) 0, u.ux, u.uy); - break; - } + if (!rn2(73)) + cnt += rnd(4); + if (confused) + cnt += 12; + while (cnt--) + (void) makemon(confused ? PM_ACID_BLOB : + (struct permonst *) 0, u.ux, u.uy); + break; + } case SCR_ENCHANT_WEAPON: - if(uwep && confused) { + if (uwep && confused) { pline("Your %s glows silver for a moment.", - objects[uwep->otyp].oc_name); + objects[uwep->otyp].oc_name); uwep->rustfree = 1; - } else - if(!chwepon(scroll, 1)) /* tests for !uwep */ - return(1); + } else if (!chwepon(scroll, 1)) /* tests for !uwep */ + return (1); break; case SCR_DAMAGE_WEAPON: - if(uwep && confused) { + if (uwep && confused) { pline("Your %s glows purple for a moment.", - objects[uwep->otyp].oc_name); + objects[uwep->otyp].oc_name); uwep->rustfree = 0; - } else - if(!chwepon(scroll, -1)) /* tests for !uwep */ - return(1); + } else if (!chwepon(scroll, -1)) /* tests for !uwep */ + return (1); break; case SCR_TAMING: - { register int i,j; - register int bd = confused ? 5 : 1; - register struct monst *mtmp; + { + int i, j; + int bd = confused ? 5 : 1; + struct monst *mtmp; - for(i = -bd; i <= bd; i++) for(j = -bd; j <= bd; j++) - if(mtmp = m_at(u.ux+i, u.uy+j)) - (void) tamedog(mtmp, (struct obj *) 0); - break; - } + for (i = -bd; i <= bd; i++) + for (j = -bd; j <= bd; j++) + if ((mtmp = m_at(u.ux + i, u.uy + j)) != NULL) + (void) tamedog(mtmp, (struct obj *) 0); + break; + } case SCR_GENOCIDE: - { extern char genocided[], fut_geno[]; - char buf[BUFSZ]; - register struct monst *mtmp, *mtmp2; + { + extern char genocided[], fut_geno[]; + char buf[BUFSZ]; + struct monst *mtmp, *mtmp2; - pline("You have found a scroll of genocide!"); - known = TRUE; - if(confused) - *buf = u.usym; - else do { - pline("What monster do you want to genocide (Type the letter)? "); - getlin(buf); - } while(strlen(buf) != 1 || !monstersym(*buf)); - if(!index(fut_geno, *buf)) - charcat(fut_geno, *buf); - if(!index(genocided, *buf)) - charcat(genocided, *buf); - else { - pline("Such monsters do not exist in this world."); + pline("You have found a scroll of genocide!"); + known = TRUE; + if (confused) + *buf = u.usym; + else + do { + pline("What monster do you want to genocide (Type the letter)? "); + getlin(buf); + } while (strlen(buf) != 1 || !monstersym(*buf)); + if (!strchr(fut_geno, *buf)) + charcat(fut_geno, *buf); + if (!strchr(genocided, *buf)) + charcat(genocided, *buf); + else { + pline("Such monsters do not exist in this world."); + break; + } + for (mtmp = fmon; mtmp; mtmp = mtmp2) { + mtmp2 = mtmp->nmon; + if (mtmp->data->mlet == *buf) + mondead(mtmp); + } + pline("Wiped out all %c's.", *buf); + if (*buf == u.usym) { + killer = "scroll of genocide"; + u.uhp = -1; + } break; } - for(mtmp = fmon; mtmp; mtmp = mtmp2){ - mtmp2 = mtmp->nmon; - if(mtmp->data->mlet == *buf) - mondead(mtmp); - } - pline("Wiped out all %c's.", *buf); - if(*buf == u.usym) { - killer = "scroll of genocide"; - u.uhp = -1; - } - break; - } case SCR_LIGHT: - if(!Blind) known = TRUE; + if (!Blind) + known = TRUE; litroom(!confused); break; case SCR_TELEPORTATION: - if(confused) + if (confused) level_tele(); else { #ifdef QUEST - register int oux = u.ux, ouy = u.uy; + int oux = u.ux, ouy = u.uy; tele(); - if(dist(oux, ouy) > 100) known = TRUE; -#else QUEST - register int uroom = inroom(u.ux, u.uy); + if (dist(oux, ouy) > 100) + known = TRUE; +#else /* QUEST */ + int uroom = inroom(u.ux, u.uy); tele(); - if(uroom != inroom(u.ux, u.uy)) known = TRUE; -#endif QUEST + if (uroom != inroom(u.ux, u.uy)) + known = TRUE; +#endif /* QUEST */ } break; case SCR_GOLD_DETECTION: - /* Unfortunately this code has become slightly less elegant, - now that gold and traps no longer are of the same type. */ - if(confused) { - register struct trap *ttmp; + /* + * Unfortunately this code has become slightly less elegant, + * now that gold and traps no longer are of the same type. + */ + if (confused) { + struct trap *ttmp; - if(!ftrap) { - strange_feeling(scroll, "Your toes stop itching."); - return(1); - } else { - for(ttmp = ftrap; ttmp; ttmp = ttmp->ntrap) - if(ttmp->tx != u.ux || ttmp->ty != u.uy) - goto outtrapmap; - /* only under me - no separate display required */ - pline("Your toes itch!"); - break; + if (!ftrap) { + strange_feeling(scroll, "Your toes stop itching."); + return (1); + } else { + for (ttmp = ftrap; ttmp; ttmp = ttmp->ntrap) + if (ttmp->tx != u.ux || ttmp->ty != u.uy) + goto outtrapmap; + /* + * only under me - no separate display + * required + */ + pline("Your toes itch!"); + break; outtrapmap: - cls(); - for(ttmp = ftrap; ttmp; ttmp = ttmp->ntrap) - at(ttmp->tx, ttmp->ty, '$'); - prme(); - pline("You feel very greedy!"); - } - } else { - register struct gold *gtmp; - - if(!fgold) { - strange_feeling(scroll, "You feel materially poor."); - return(1); + cls(); + for (ttmp = ftrap; ttmp; ttmp = ttmp->ntrap) + at(ttmp->tx, ttmp->ty, '$'); + prme(); + pline("You feel very greedy!"); + } } else { - known = TRUE; - for(gtmp = fgold; gtmp; gtmp = gtmp->ngold) - if(gtmp->gx != u.ux || gtmp->gy != u.uy) - goto outgoldmap; - /* only under me - no separate display required */ - pline("You notice some gold between your feet."); - break; + struct gold *gtmp; + + if (!fgold) { + strange_feeling(scroll, "You feel materially poor."); + return (1); + } else { + known = TRUE; + for (gtmp = fgold; gtmp; gtmp = gtmp->ngold) + if (gtmp->gx != u.ux || gtmp->gy != u.uy) + goto outgoldmap; + /* + * only under me - no separate display + * required + */ + pline("You notice some gold between your feet."); + break; outgoldmap: - cls(); - for(gtmp = fgold; gtmp; gtmp = gtmp->ngold) - at(gtmp->gx, gtmp->gy, '$'); - prme(); - pline("You feel very greedy, and sense gold!"); + cls(); + for (gtmp = fgold; gtmp; gtmp = gtmp->ngold) + at(gtmp->gx, gtmp->gy, '$'); + prme(); + pline("You feel very greedy, and sense gold!"); + } } - } /* common sequel */ more(); docrt(); break; case SCR_FOOD_DETECTION: - { register ct = 0, ctu = 0; - register struct obj *obj; - register char foodsym = confused ? POTION_SYM : FOOD_SYM; + { + int ct = 0, ctu = 0; + struct obj *obj; + char foodsym = confused ? POTION_SYM : FOOD_SYM; - for(obj = fobj; obj; obj = obj->nobj) - if(obj->olet == FOOD_SYM) { - if(obj->ox == u.ux && obj->oy == u.uy) ctu++; - else ct++; + for (obj = fobj; obj; obj = obj->nobj) + if (obj->olet == FOOD_SYM) { + if (obj->ox == u.ux && obj->oy == u.uy) + ctu++; + else + ct++; + } + if (!ct && !ctu) { + strange_feeling(scroll, "Your nose twitches."); + return (1); + } else if (!ct) { + known = TRUE; + pline("You smell %s close nearby.", + confused ? "something" : "food"); + + } else { + known = TRUE; + cls(); + for (obj = fobj; obj; obj = obj->nobj) + if (obj->olet == foodsym) + at(obj->ox, obj->oy, FOOD_SYM); + prme(); + pline("Your nose tingles and you smell %s!", + confused ? "something" : "food"); + more(); + docrt(); } - if(!ct && !ctu) { - strange_feeling(scroll,"Your nose twitches."); - return(1); - } else if(!ct) { - known = TRUE; - pline("You smell %s close nearby.", - confused ? "something" : "food"); - - } else { - known = TRUE; - cls(); - for(obj = fobj; obj; obj = obj->nobj) - if(obj->olet == foodsym) - at(obj->ox, obj->oy, FOOD_SYM); - prme(); - pline("Your nose tingles and you smell %s!", - confused ? "something" : "food"); - more(); - docrt(); + break; } - break; - } case SCR_IDENTIFY: /* known = TRUE; */ - if(confused) + if (confused) pline("You identify this as an identify scroll."); else pline("This is an identify scroll."); useup(scroll); objects[SCR_IDENTIFY].oc_name_known = 1; - if(!confused) - while( - !ggetobj("identify", identify, rn2(5) ? 1 : rn2(5)) - && invent - ); - return(1); + if (!confused) + while ( + !ggetobj("identify", identify, rn2(5) ? 1 : rn2(5)) + && invent + ); + return (1); case SCR_MAGIC_MAPPING: - { register struct rm *lev; - register int num, zx, zy; + { + struct rm *lev; + int num, zx, zy; - known = TRUE; - pline("On this scroll %s a map!", - confused ? "was" : "is"); - for(zy = 0; zy < ROWNO; zy++) - for(zx = 0; zx < COLNO; zx++) { - if(confused && rn2(7)) continue; - lev = &(levl[zx][zy]); - if((num = lev->typ) == 0) - continue; - if(num == SCORR) { - lev->typ = CORR; - lev->scrsym = CORR_SYM; - } else - if(num == SDOOR) { - lev->typ = DOOR; - lev->scrsym = '+'; - /* do sth in doors ? */ - } else if(lev->seen) continue; + known = TRUE; + pline("On this scroll %s a map!", + confused ? "was" : "is"); + for (zy = 0; zy < ROWNO; zy++) + for (zx = 0; zx < COLNO; zx++) { + if (confused && rn2(7)) + continue; + lev = &(levl[zx][zy]); + if ((num = lev->typ) == 0) + continue; + if (num == SCORR) { + lev->typ = CORR; + lev->scrsym = CORR_SYM; + } else if (num == SDOOR) { + lev->typ = DOOR; + lev->scrsym = '+'; + /* do sth in doors ? */ + } else if (lev->seen) + continue; #ifndef QUEST - if(num != ROOM) -#endif QUEST - { - lev->seen = lev->new = 1; - if(lev->scrsym == ' ' || !lev->scrsym) - newsym(zx,zy); - else - on_scr(zx,zy); + if (num != ROOM) +#endif /* QUEST */ + { + lev->seen = lev->new = 1; + if (lev->scrsym == ' ' || !lev->scrsym) + newsym(zx, zy); + else + on_scr(zx, zy); + } } - } - break; - } + break; + } case SCR_AMNESIA: - { register int zx, zy; + { + int zx, zy; - known = TRUE; - for(zx = 0; zx < COLNO; zx++) for(zy = 0; zy < ROWNO; zy++) - if(!confused || rn2(7)) - if(!cansee(zx,zy)) - levl[zx][zy].seen = 0; - docrt(); - pline("Thinking of Maud you forget everything else."); - break; - } + known = TRUE; + for (zx = 0; zx < COLNO; zx++) + for (zy = 0; zy < ROWNO; zy++) + if (!confused || rn2(7)) + if (!cansee(zx, zy)) + levl[zx][zy].seen = 0; + docrt(); + pline("Thinking of Maud you forget everything else."); + break; + } case SCR_FIRE: - { register int num; - register struct monst *mtmp; + { + int num = 0; + struct monst *mtmp; - known = TRUE; - if(confused) { - pline("The scroll catches fire and you burn your hands."); - losehp(1, "scroll of fire"); - } else { - pline("The scroll erupts in a tower of flame!"); - if(Fire_resistance) - pline("You are uninjured."); - else { - num = rnd(6); - u.uhpmax -= num; - losehp(num, "scroll of fire"); - } - } - num = (2*num + 1)/3; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) { - if(dist(mtmp->mx,mtmp->my) < 3) { - mtmp->mhp -= num; - if(index("FY", mtmp->data->mlet)) - mtmp->mhp -= 3*num; /* this might well kill 'F's */ - if(mtmp->mhp < 1) { - killed(mtmp); - break; /* primitive */ + known = TRUE; + if (confused) { + pline("The scroll catches fire and you burn your hands."); + losehp(1, "scroll of fire"); + } else { + pline("The scroll erupts in a tower of flame!"); + if (Fire_resistance) + pline("You are uninjured."); + else { + num = rnd(6); + u.uhpmax -= num; + losehp(num, "scroll of fire"); + } } - } + num = (2 * num + 1) / 3; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + if (dist(mtmp->mx, mtmp->my) < 3) { + mtmp->mhp -= num; + if (strchr("FY", mtmp->data->mlet)) + mtmp->mhp -= 3 * num; /* this might well kill + * 'F's */ + if (mtmp->mhp < 1) { + killed(mtmp); + break; /* primitive */ + } + } + } + break; } - break; - } case SCR_PUNISHMENT: known = TRUE; - if(confused) { + if (confused) { pline("You feel guilty."); break; } pline("You are being punished for your misbehaviour!"); - if(Punished){ + if (Punished) { pline("Your iron ball gets heavier."); uball->owt += 15; break; @@ -423,121 +454,137 @@ doread() { Punished = INTRINSIC; setworn(mkobj_at(CHAIN_SYM, u.ux, u.uy), W_CHAIN); setworn(mkobj_at(BALL_SYM, u.ux, u.uy), W_BALL); - uball->spe = 1; /* special ball (see save) */ + uball->spe = 1; /* special ball (see save) */ break; default: impossible("What weird language is this written in? (%u)", - scroll->otyp); + scroll->otyp); } - if(!objects[scroll->otyp].oc_name_known) { - if(known && !confused) { + if (!objects[scroll->otyp].oc_name_known) { + if (known && !confused) { objects[scroll->otyp].oc_name_known = 1; - more_experienced(0,10); - } else if(!objects[scroll->otyp].oc_uname) + more_experienced(0, 10); + } else if (!objects[scroll->otyp].oc_uname) docall(scroll); } useup(scroll); - return(1); + return (1); } -identify(otmp) /* also called by newmail() */ -register struct obj *otmp; +int +identify(otmp) /* also called by newmail() */ + struct obj *otmp; { objects[otmp->otyp].oc_name_known = 1; otmp->known = otmp->dknown = 1; prinv(otmp); - return(1); + return (1); } +void litroom(on) -register boolean on; + boolean on; { - register num,zx,zy; +#ifndef QUEST + int num, zx, zy; +#endif /* first produce the text (provided he is not blind) */ - if(Blind) goto do_it; - if(!on) { - if(u.uswallow || !xdnstair || levl[u.ux][u.uy].typ == CORR || + if (Blind) + goto do_it; + if (!on) { + if (u.uswallow || !xdnstair || levl[u.ux][u.uy].typ == CORR || !levl[u.ux][u.uy].lit) { pline("It seems even darker in here than before."); return; } else pline("It suddenly becomes dark in here."); } else { - if(u.uswallow){ + if (u.uswallow) { pline("%s's stomach is lit.", Monnam(u.ustuck)); return; } - if(!xdnstair){ + if (!xdnstair) { pline("Nothing Happens."); return; } #ifdef QUEST pline("The cave lights up around you, then fades."); return; -#else QUEST - if(levl[u.ux][u.uy].typ == CORR) { - pline("The corridor lights up around you, then fades."); - return; - } else if(levl[u.ux][u.uy].lit) { - pline("The light here seems better now."); - return; +#else /* QUEST */ + if (levl[u.ux][u.uy].typ == CORR) { + pline("The corridor lights up around you, then fades."); + return; + } else if (levl[u.ux][u.uy].lit) { + pline("The light here seems better now."); + return; } else - pline("The room is lit."); -#endif QUEST + pline("The room is lit."); +#endif /* QUEST */ } do_it: #ifdef QUEST return; -#else QUEST - if(levl[u.ux][u.uy].lit == on) +#else /* QUEST */ + if (levl[u.ux][u.uy].lit == on) return; - if(levl[u.ux][u.uy].typ == DOOR) { - if(IS_ROOM(levl[u.ux][u.uy+1].typ)) zy = u.uy+1; - else if(IS_ROOM(levl[u.ux][u.uy-1].typ)) zy = u.uy-1; - else zy = u.uy; - if(IS_ROOM(levl[u.ux+1][u.uy].typ)) zx = u.ux+1; - else if(IS_ROOM(levl[u.ux-1][u.uy].typ)) zx = u.ux-1; - else zx = u.ux; + if (levl[u.ux][u.uy].typ == DOOR) { + if (IS_ROOM(levl[u.ux][u.uy + 1].typ)) + zy = u.uy + 1; + else if (IS_ROOM(levl[u.ux][u.uy - 1].typ)) + zy = u.uy - 1; + else + zy = u.uy; + if (IS_ROOM(levl[u.ux + 1][u.uy].typ)) + zx = u.ux + 1; + else if (IS_ROOM(levl[u.ux - 1][u.uy].typ)) + zx = u.ux - 1; + else + zx = u.ux; } else { zx = u.ux; zy = u.uy; } - for(seelx = u.ux; (num = levl[seelx-1][zy].typ) != CORR && num != 0; - seelx--); - for(seehx = u.ux; (num = levl[seehx+1][zy].typ) != CORR && num != 0; - seehx++); - for(seely = u.uy; (num = levl[zx][seely-1].typ) != CORR && num != 0; - seely--); - for(seehy = u.uy; (num = levl[zx][seehy+1].typ) != CORR && num != 0; - seehy++); - for(zy = seely; zy <= seehy; zy++) - for(zx = seelx; zx <= seehx; zx++) { + for (seelx = u.ux; (num = levl[seelx - 1][zy].typ) != CORR && num != 0; + seelx--); + for (seehx = u.ux; (num = levl[seehx + 1][zy].typ) != CORR && num != 0; + seehx++); + for (seely = u.uy; (num = levl[zx][seely - 1].typ) != CORR && num != 0; + seely--); + for (seehy = u.uy; (num = levl[zx][seehy + 1].typ) != CORR && num != 0; + seehy++); + for (zy = seely; zy <= seehy; zy++) + for (zx = seelx; zx <= seehx; zx++) { levl[zx][zy].lit = on; - if(!Blind && dist(zx,zy) > 2) - if(on) prl(zx,zy); else nosee(zx,zy); + if (!Blind && dist(zx, zy) > 2) + if (on) + prl(zx, zy); + else + nosee(zx, zy); } - if(!on) seehx = 0; -#endif QUEST + if (!on) + seehx = 0; +#endif /* QUEST */ } /* Test whether we may genocide all monsters with symbol ch */ -monstersym(ch) /* arnold@ucsfcgl */ -register char ch; +int +monstersym(ch) /* arnold@ucsfcgl */ + char ch; { - register struct permonst *mp; + struct permonst *mp; extern struct permonst pm_eel; /* * can't genocide certain monsters */ - if (index("12 &:", ch)) + if (strchr("12 &:", ch)) return FALSE; if (ch == pm_eel.mlet) return TRUE; - for (mp = mons; mp < &mons[CMNUM+2]; mp++) + for (mp = mons; mp < &mons[CMNUM + 2]; mp++) if (mp->mlet == ch) return TRUE; return FALSE; diff --git a/hack/hack.rip.c b/hack/hack.rip.c index ced3a27b..f9252d78 100644 --- a/hack/hack.rip.c +++ b/hack/hack.rip.c @@ -1,17 +1,18 @@ +/* $NetBSD: hack.rip.c,v 1.5 1997/10/19 16:58:53 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.rip.c,v 1.4 1995/03/23 08:31:23 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.rip.c,v 1.5 1997/10/19 16:58:53 christos Exp $"); +#endif /* not lint */ -#include <stdio.h> #include "hack.h" +#include "extern.h" -extern char plname[]; - -static char *riptop= "\ +static char *riptop = "\ ----------\n\ / \\\n\ / REST \\\n\ @@ -19,14 +20,16 @@ static char *riptop= "\ / PEACE \\\n\ / \\"; -static char *ripmid = " | %*s%*s |\n"; +static char *ripmid = " | %*s%*s |\n"; -static char *ripbot = "\ +static char *ripbot = "\ *| * * * | *\n\ _________)/\\\\_//(\\/(/\\)/\\//\\/|_)_______"; -outrip(){ - char buf[BUFSZ]; +void +outrip() +{ + char buf[BUFSZ]; cls(); curs(1, 8); @@ -37,24 +40,26 @@ outrip(){ (void) sprintf(buf, "%ld AU", u.ugold); center(7, buf); (void) sprintf(buf, "killed by%s", - !strncmp(killer, "the ", 4) ? "" : - !strcmp(killer, "starvation") ? "" : - index(vowels, *killer) ? " an" : " a"); + !strncmp(killer, "the ", 4) ? "" : + !strcmp(killer, "starvation") ? "" : + strchr(vowels, *killer) ? " an" : " a"); center(8, buf); (void) strcpy(buf, killer); - { - register int i1; - if((i1 = strlen(buf)) > 16) { - register int i,i0; + { + int i1; + if ((i1 = strlen(buf)) > 16) { + int i, i0; i0 = i1 = 0; - for(i = 0; i <= 16; i++) - if(buf[i] == ' ') i0 = i, i1 = i+1; - if(!i0) i0 = i1 = 16; + for (i = 0; i <= 16; i++) + if (buf[i] == ' ') + i0 = i, i1 = i + 1; + if (!i0) + i0 = i1 = 16; buf[i1 + 16] = 0; buf[i0] = 0; } center(9, buf); - center(10, buf+i1); + center(10, buf + i1); } (void) sprintf(buf, "%4d", getyear()); center(11, buf); @@ -62,8 +67,11 @@ outrip(){ getret(); } -center(line, text) int line; char *text; { - register int n = strlen(text)/2; - printf(ripmid, 8+n, text, 8-n, ""); +void +center(line, text) + int line; + char *text; +{ + int n = strlen(text) / 2; + printf(ripmid, 8 + n, text, 8 - n, ""); } - diff --git a/hack/hack.rumors.c b/hack/hack.rumors.c index 0ace09e2..f56e95b3 100644 --- a/hack/hack.rumors.c +++ b/hack/hack.rumors.c @@ -1,68 +1,93 @@ +/* $NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.rumors.c,v 1.3 1995/03/23 08:31:24 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $"); +#endif /* not lint */ -#include <stdio.h> -#include "hack.h" /* for RUMORFILE and BSD (index) */ -#define CHARSZ 8 /* number of bits in a char */ -extern long *alloc(); -extern char *index(); -int n_rumors = 0; -int n_used_rumors = -1; -char *usedbits; +#include "hack.h" /* for RUMORFILE and BSD (strchr) */ +#include "extern.h" +#define CHARSZ 8 /* number of bits in a char */ +int n_rumors = 0; +int n_used_rumors = -1; +char *usedbits; -init_rumors(rumf) register FILE *rumf; { -register int i; +void +init_rumors(rumf) + FILE *rumf; +{ + int i; n_used_rumors = 0; - while(skipline(rumf)) n_rumors++; + while (skipline(rumf)) + n_rumors++; rewind(rumf); - i = n_rumors/CHARSZ; - usedbits = (char *) alloc((unsigned)(i+1)); - for( ; i>=0; i--) usedbits[i] = 0; + i = n_rumors / CHARSZ; + usedbits = (char *) alloc((unsigned) (i + 1)); + for (; i >= 0; i--) + usedbits[i] = 0; } -skipline(rumf) register FILE *rumf; { -char line[COLNO]; - while(1) { - if(!fgets(line, sizeof(line), rumf)) return(0); - if(index(line, '\n')) return(1); +int +skipline(rumf) + FILE *rumf; +{ + char line[COLNO]; + while (1) { + if (!fgets(line, sizeof(line), rumf)) + return (0); + if (strchr(line, '\n')) + return (1); } } -outline(rumf) register FILE *rumf; { -char line[COLNO]; -register char *ep; - if(!fgets(line, sizeof(line), rumf)) return; - if((ep = index(line, '\n')) != 0) *ep = 0; +void +outline(rumf) + FILE *rumf; +{ + char line[COLNO]; + char *ep; + if (!fgets(line, sizeof(line), rumf)) + return; + if ((ep = strchr(line, '\n')) != 0) + *ep = 0; pline("This cookie has a scrap of paper inside! It reads: "); pline(line); } -outrumor(){ -register int rn,i; -register FILE *rumf; - if(n_rumors <= n_used_rumors || - (rumf = fopen(RUMORFILE, "r")) == (FILE *) 0) return; - if(n_used_rumors < 0) init_rumors(rumf); - if(!n_rumors) goto none; +void +outrumor() +{ + int rn, i; + FILE *rumf; + if (n_rumors <= n_used_rumors || + (rumf = fopen(RUMORFILE, "r")) == (FILE *) 0) + return; + if (n_used_rumors < 0) + init_rumors(rumf); + if (!n_rumors) + goto none; rn = rn2(n_rumors - n_used_rumors); i = 0; - while(rn || used(i)) { + while (rn || used(i)) { (void) skipline(rumf); - if(!used(i)) rn--; + if (!used(i)) + rn--; i++; } - usedbits[i/CHARSZ] |= (1 << (i % CHARSZ)); + usedbits[i / CHARSZ] |= (1 << (i % CHARSZ)); n_used_rumors++; outline(rumf); none: (void) fclose(rumf); } -used(i) register int i; { - return(usedbits[i/CHARSZ] & (1 << (i % CHARSZ))); +int +used(i) + int i; +{ + return (usedbits[i / CHARSZ] & (1 << (i % CHARSZ))); } diff --git a/hack/hack.save.c b/hack/hack.save.c index 3e7a2543..26386e70 100644 --- a/hack/hack.save.c +++ b/hack/hack.save.c @@ -1,54 +1,61 @@ +/* $NetBSD: hack.save.c,v 1.6 1997/10/19 16:58:57 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.save.c,v 1.5 1995/03/23 08:31:27 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.save.c,v 1.6 1997/10/19 16:58:57 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -extern char genocided[60]; /* defined in Decl.c */ -extern char fut_geno[60]; /* idem */ #include <signal.h> +#include <stdlib.h> #include <unistd.h> +#include <fcntl.h> +#include "hack.h" +#include "extern.h" -extern char SAVEF[], nul[]; -extern char pl_character[PL_CSIZ]; -extern struct obj *restobjchn(); -extern struct monst *restmonchn(); -dosave(){ - if(dosave0(0)) { +int +dosave() +{ + if (dosave0(0)) { settty("Be seeing you ...\n"); exit(0); } -#ifdef lint - return(0); -#endif lint + return (0); } #ifndef NOSAVEONHANGUP -hangup(){ +void +hangup(n) + int n; +{ (void) dosave0(1); exit(1); } -#endif NOSAVEONHANGUP +#endif /* NOSAVEONHANGUP */ /* returns 1 if save successful */ -dosave0(hu) int hu; { - register fd, ofd; - int tmp; /* not register ! */ +int +dosave0(hu) + int hu; +{ + int fd, ofd; + int tmp; /* not ! */ (void) signal(SIGHUP, SIG_IGN); (void) signal(SIGINT, SIG_IGN); - if((fd = creat(SAVEF, FMASK)) < 0) { - if(!hu) pline("Cannot open save file. (Continue or Quit)"); - (void) unlink(SAVEF); /* ab@unido */ - return(0); + if ((fd = creat(SAVEF, FMASK)) < 0) { + if (!hu) + pline("Cannot open save file. (Continue or Quit)"); + (void) unlink(SAVEF); /* ab@unido */ + return (0); } - if(flags.moonphase == FULL_MOON) /* ut-sally!fletcher */ - u.uluck--; /* and unido!ab */ - savelev(fd,dlevel); + if (flags.moonphase == FULL_MOON) /* ut-sally!fletcher */ + u.uluck--; /* and unido!ab */ + savelev(fd, dlevel); saveobjchn(fd, invent); saveobjchn(fd, fcobj); savemonchn(fd, fallen_down); @@ -59,29 +66,30 @@ dosave0(hu) int hu; { bwrite(fd, (char *) &maxdlevel, sizeof maxdlevel); bwrite(fd, (char *) &moves, sizeof moves); bwrite(fd, (char *) &u, sizeof(struct you)); - if(u.ustuck) + if (u.ustuck) bwrite(fd, (char *) &(u.ustuck->m_id), sizeof u.ustuck->m_id); bwrite(fd, (char *) pl_character, sizeof pl_character); bwrite(fd, (char *) genocided, sizeof genocided); bwrite(fd, (char *) fut_geno, sizeof fut_geno); savenames(fd); - for(tmp = 1; tmp <= maxdlevel; tmp++) { - extern int hackpid; - extern boolean level_exists[]; + for (tmp = 1; tmp <= maxdlevel; tmp++) { - if(tmp == dlevel || !level_exists[tmp]) continue; + if (tmp == dlevel || !level_exists[tmp]) + continue; glo(tmp); - if((ofd = open(lock, 0)) < 0) { - if(!hu) pline("Error while saving: cannot read %s.", lock); - (void) close(fd); - (void) unlink(SAVEF); - if(!hu) done("tricked"); - return(0); + if ((ofd = open(lock, 0)) < 0) { + if (!hu) + pline("Error while saving: cannot read %s.", lock); + (void) close(fd); + (void) unlink(SAVEF); + if (!hu) + done("tricked"); + return (0); } getlev(ofd, hackpid, tmp); (void) close(ofd); bwrite(fd, (char *) &tmp, sizeof tmp); /* level number */ - savelev(fd,tmp); /* actual level */ + savelev(fd, tmp); /* actual level */ (void) unlink(lock); } (void) close(fd); @@ -89,155 +97,161 @@ dosave0(hu) int hu; { (void) unlink(lock); /* get rid of current level --jgm */ glo(0); (void) unlink(lock); - return(1); + return (1); } +int dorecover(fd) -register fd; + int fd; { - register nfd; - int tmp; /* not a register ! */ - unsigned mid; /* idem */ - struct obj *otmp; - extern boolean restoring; + int nfd; + int tmp; /* not a ! */ + unsigned mid; /* idem */ + struct obj *otmp; restoring = TRUE; getlev(fd, 0, 0); invent = restobjchn(fd); - for(otmp = invent; otmp; otmp = otmp->nobj) - if(otmp->owornmask) + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp->owornmask) setworn(otmp, otmp->owornmask); fcobj = restobjchn(fd); fallen_down = restmonchn(fd); mread(fd, (char *) &tmp, sizeof tmp); - if(tmp != getuid()) { /* strange ... */ + if (tmp != getuid()) { /* strange ... */ (void) close(fd); (void) unlink(SAVEF); puts("Saved game was not yours."); restoring = FALSE; - return(0); + return (0); } mread(fd, (char *) &flags, sizeof(struct flag)); mread(fd, (char *) &dlevel, sizeof dlevel); mread(fd, (char *) &maxdlevel, sizeof maxdlevel); mread(fd, (char *) &moves, sizeof moves); mread(fd, (char *) &u, sizeof(struct you)); - if(u.ustuck) + if (u.ustuck) mread(fd, (char *) &mid, sizeof mid); mread(fd, (char *) pl_character, sizeof pl_character); mread(fd, (char *) genocided, sizeof genocided); mread(fd, (char *) fut_geno, sizeof fut_geno); restnames(fd); - while(1) { - if(read(fd, (char *) &tmp, sizeof tmp) != sizeof tmp) + while (1) { + if (read(fd, (char *) &tmp, sizeof tmp) != sizeof tmp) break; getlev(fd, 0, tmp); glo(tmp); - if((nfd = creat(lock, FMASK)) < 0) + if ((nfd = creat(lock, FMASK)) < 0) panic("Cannot open temp file %s!\n", lock); - savelev(nfd,tmp); + savelev(nfd, tmp); (void) close(nfd); } - (void) lseek(fd, (off_t)0, 0); + (void) lseek(fd, (off_t) 0, 0); getlev(fd, 0, 0); (void) close(fd); (void) unlink(SAVEF); - if(Punished) { - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(otmp->olet == CHAIN_SYM) goto chainfnd; + if (Punished) { + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp->olet == CHAIN_SYM) + goto chainfnd; panic("Cannot find the iron chain?"); - chainfnd: +chainfnd: uchain = otmp; - if(!uball){ - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(otmp->olet == BALL_SYM && otmp->spe) + if (!uball) { + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp->olet == BALL_SYM && otmp->spe) goto ballfnd; panic("Cannot find the iron ball?"); - ballfnd: + ballfnd: uball = otmp; } } - if(u.ustuck) { - register struct monst *mtmp; + if (u.ustuck) { + struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->m_id == mid) goto monfnd; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->m_id == mid) + goto monfnd; panic("Cannot find the monster ustuck."); - monfnd: +monfnd: u.ustuck = mtmp; } #ifndef QUEST - setsee(); /* only to recompute seelx etc. - these weren't saved */ -#endif QUEST + setsee(); /* only to recompute seelx etc. - these + * weren't saved */ +#endif /* QUEST */ docrt(); restoring = FALSE; - return(1); + return (1); } -struct obj * +struct obj * restobjchn(fd) -register fd; + int fd; { - register struct obj *otmp, *otmp2; - register struct obj *first = 0; - int xl; -#ifdef lint - /* suppress "used before set" warning from lint */ - otmp2 = 0; -#endif lint - while(1) { + struct obj *otmp, *otmp2 = NULL; + struct obj *first = 0; + int xl; + while (1) { mread(fd, (char *) &xl, sizeof(xl)); - if(xl == -1) break; + if (xl == -1) + break; otmp = newobj(xl); - if(!first) first = otmp; - else otmp2->nobj = otmp; + if (!first) + first = otmp; + else + otmp2->nobj = otmp; mread(fd, (char *) otmp, (unsigned) xl + sizeof(struct obj)); - if(!otmp->o_id) otmp->o_id = flags.ident++; + if (!otmp->o_id) + otmp->o_id = flags.ident++; otmp2 = otmp; } - if(first && otmp2->nobj){ + if (first && otmp2->nobj) { impossible("Restobjchn: error reading objchn."); otmp2->nobj = 0; } - return(first); + return (first); } -struct monst * +struct monst * restmonchn(fd) -register fd; + int fd; { - register struct monst *mtmp, *mtmp2; - register struct monst *first = 0; - int xl; + struct monst *mtmp, *mtmp2 = NULL; + struct monst *first = 0; + int xl; struct permonst *monbegin; - long differ; + long differ; - mread(fd, (char *)&monbegin, sizeof(monbegin)); - differ = (char *)(&mons[0]) - (char *)(monbegin); + mread(fd, (char *) &monbegin, sizeof(monbegin)); + differ = (char *) (&mons[0]) - (char *) (monbegin); #ifdef lint /* suppress "used before set" warning from lint */ mtmp2 = 0; -#endif lint - while(1) { +#endif /* lint */ + while (1) { mread(fd, (char *) &xl, sizeof(xl)); - if(xl == -1) break; + if (xl == -1) + break; mtmp = newmonst(xl); - if(!first) first = mtmp; - else mtmp2->nmon = mtmp; + if (!first) + first = mtmp; + else + mtmp2->nmon = mtmp; mread(fd, (char *) mtmp, (unsigned) xl + sizeof(struct monst)); - if(!mtmp->m_id) + if (!mtmp->m_id) mtmp->m_id = flags.ident++; mtmp->data = (struct permonst *) ((char *) mtmp->data + differ); - if(mtmp->minvent) + if (mtmp->minvent) mtmp->minvent = restobjchn(fd); mtmp2 = mtmp; } - if(first && mtmp2->nmon){ + if (first && mtmp2->nmon) { impossible("Restmonchn: error reading monchn."); mtmp2->nmon = 0; } - return(first); + return (first); } diff --git a/hack/hack.search.c b/hack/hack.search.c index d1b77f72..44fdacaf 100644 --- a/hack/hack.search.c +++ b/hack/hack.search.c @@ -1,138 +1,159 @@ +/* $NetBSD: hack.search.c,v 1.4 1997/10/19 16:58:59 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.search.c,v 1.3 1995/03/23 08:31:28 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.search.c,v 1.4 1997/10/19 16:58:59 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" -extern struct monst *makemon(); - -findit() /* returns number of things found */ -{ - int num; - register xchar zx,zy; - register struct trap *ttmp; - register struct monst *mtmp; - xchar lx,hx,ly,hy; +int +findit() +{ /* returns number of things found */ + int num; + xchar zx, zy; + struct trap *ttmp; + struct monst *mtmp; + xchar lx, hx, ly, hy; - if(u.uswallow) return(0); - for(lx = u.ux; (num = levl[lx-1][u.uy].typ) && num != CORR; lx--) ; - for(hx = u.ux; (num = levl[hx+1][u.uy].typ) && num != CORR; hx++) ; - for(ly = u.uy; (num = levl[u.ux][ly-1].typ) && num != CORR; ly--) ; - for(hy = u.uy; (num = levl[u.ux][hy+1].typ) && num != CORR; hy++) ; + if (u.uswallow) + return (0); + for (lx = u.ux; (num = levl[lx - 1][u.uy].typ) && num != CORR; lx--); + for (hx = u.ux; (num = levl[hx + 1][u.uy].typ) && num != CORR; hx++); + for (ly = u.uy; (num = levl[u.ux][ly - 1].typ) && num != CORR; ly--); + for (hy = u.uy; (num = levl[u.ux][hy + 1].typ) && num != CORR; hy++); num = 0; - for(zy = ly; zy <= hy; zy++) - for(zx = lx; zx <= hx; zx++) { - if(levl[zx][zy].typ == SDOOR) { + for (zy = ly; zy <= hy; zy++) + for (zx = lx; zx <= hx; zx++) { + if (levl[zx][zy].typ == SDOOR) { levl[zx][zy].typ = DOOR; atl(zx, zy, '+'); num++; - } else if(levl[zx][zy].typ == SCORR) { + } else if (levl[zx][zy].typ == SCORR) { levl[zx][zy].typ = CORR; atl(zx, zy, CORR_SYM); num++; - } else if(ttmp = t_at(zx, zy)) { - if(ttmp->ttyp == PIERC){ + } else if ((ttmp = t_at(zx, zy)) != NULL) { + if (ttmp->ttyp == PIERC) { (void) makemon(PM_PIERCER, zx, zy); num++; deltrap(ttmp); - } else if(!ttmp->tseen) { + } else if (!ttmp->tseen) { ttmp->tseen = 1; - if(!vism_at(zx, zy)) - atl(zx,zy,'^'); + if (!vism_at(zx, zy)) + atl(zx, zy, '^'); + num++; + } + } else if ((mtmp = m_at(zx, zy)) != NULL) + if (mtmp->mimic) { + seemimic(mtmp); num++; } - } else if(mtmp = m_at(zx,zy)) if(mtmp->mimic){ - seemimic(mtmp); - num++; - } } - return(num); + return (num); } +int dosearch() { - register xchar x,y; - register struct trap *trap; - register struct monst *mtmp; + xchar x, y; + struct trap *trap; + struct monst *mtmp; - if(u.uswallow) + if (u.uswallow) pline("What are you looking for? The exit?"); else - for(x = u.ux-1; x < u.ux+2; x++) - for(y = u.uy-1; y < u.uy+2; y++) if(x != u.ux || y != u.uy) { - if(levl[x][y].typ == SDOOR) { - if(rn2(7)) continue; - levl[x][y].typ = DOOR; - levl[x][y].seen = 0; /* force prl */ - prl(x,y); - nomul(0); - } else if(levl[x][y].typ == SCORR) { - if(rn2(7)) continue; - levl[x][y].typ = CORR; - levl[x][y].seen = 0; /* force prl */ - prl(x,y); - nomul(0); - } else { - /* Be careful not to find anything in an SCORR or SDOOR */ - if(mtmp = m_at(x,y)) if(mtmp->mimic){ - seemimic(mtmp); - pline("You find a mimic."); - return(1); - } - for(trap = ftrap; trap; trap = trap->ntrap) - if(trap->tx == x && trap->ty == y && - !trap->tseen && !rn2(8)) { - nomul(0); - pline("You find a%s.", traps[trap->ttyp]); - if(trap->ttyp == PIERC) { - deltrap(trap); - (void) makemon(PM_PIERCER,x,y); - return(1); + for (x = u.ux - 1; x < u.ux + 2; x++) + for (y = u.uy - 1; y < u.uy + 2; y++) + if (x != u.ux || y != u.uy) { + if (levl[x][y].typ == SDOOR) { + if (rn2(7)) + continue; + levl[x][y].typ = DOOR; + levl[x][y].seen = 0; /* force prl */ + prl(x, y); + nomul(0); + } else if (levl[x][y].typ == SCORR) { + if (rn2(7)) + continue; + levl[x][y].typ = CORR; + levl[x][y].seen = 0; /* force prl */ + prl(x, y); + nomul(0); + } else { + /* + * Be careful not to find + * anything in an SCORR or + * SDOOR + */ + if ((mtmp = m_at(x, y)) != NULL) + if (mtmp->mimic) { + seemimic(mtmp); + pline("You find a mimic."); + return (1); + } + for (trap = ftrap; trap; trap = trap->ntrap) + if (trap->tx == x && trap->ty == y && + !trap->tseen && !rn2(8)) { + nomul(0); + pline("You find a%s.", traps[trap->ttyp]); + if (trap->ttyp == PIERC) { + deltrap(trap); + (void) makemon(PM_PIERCER, x, y); + return (1); + } + trap->tseen = 1; + if (!vism_at(x, y)) + atl(x, y, '^'); + } + } } - trap->tseen = 1; - if(!vism_at(x,y)) atl(x,y,'^'); - } - } - } - return(1); + return (1); } -doidtrap() { -register struct trap *trap; -register int x,y; - if(!getdir(1)) return(0); +int +doidtrap() +{ + struct trap *trap; + int x, y; + if (!getdir(1)) + return (0); x = u.ux + u.dx; y = u.uy + u.dy; - for(trap = ftrap; trap; trap = trap->ntrap) - if(trap->tx == x && trap->ty == y && trap->tseen) { - if(u.dz) - if((u.dz < 0) != (!xdnstair && trap->ttyp == TRAPDOOR)) - continue; - pline("That is a%s.", traps[trap->ttyp]); - return(0); + for (trap = ftrap; trap; trap = trap->ntrap) + if (trap->tx == x && trap->ty == y && trap->tseen) { + if (u.dz) + if ((u.dz < 0) != (!xdnstair && trap->ttyp == TRAPDOOR)) + continue; + pline("That is a%s.", traps[trap->ttyp]); + return (0); } pline("I can't see a trap there."); - return(0); + return (0); } +void wakeup(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { mtmp->msleep = 0; setmangry(mtmp); - if(mtmp->mimic) seemimic(mtmp); + if (mtmp->mimic) + seemimic(mtmp); } /* NOTE: we must check if(mtmp->mimic) before calling this routine */ +void seemimic(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - mtmp->mimic = 0; - mtmp->mappearance = 0; - unpmon(mtmp); - pmon(mtmp); + mtmp->mimic = 0; + mtmp->mappearance = 0; + unpmon(mtmp); + pmon(mtmp); } diff --git a/hack/hack.shk.c b/hack/hack.shk.c index 6e216b7a..0b86d578 100644 --- a/hack/hack.shk.c +++ b/hack/hack.shk.c @@ -1,34 +1,106 @@ +/* $NetBSD: hack.shk.c,v 1.4 1997/10/19 16:59:01 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.shk.c,v 1.3 1995/03/23 08:31:31 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.shk.c,v 1.4 1997/10/19 16:59:01 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" +#include "extern.h" + +#ifndef QUEST +static void setpaid __P((void)); +static void addupbill __P((void)); +static void findshk __P((int)); +static struct bill_x *onbill __P((struct obj *)); +static void pay __P((long, struct monst *)); +static int dopayobj __P((struct bill_x *)); +static int getprice __P((struct obj *)); +static int realhunger __P((void)); +#endif + #ifdef QUEST -int shlevel = 0; -struct monst *shopkeeper = 0; -struct obj *billobjs = 0; -obfree(obj,merge) register struct obj *obj, *merge; { +int shlevel = 0; +struct monst *shopkeeper = 0; +struct obj *billobjs = 0; +void +obfree(obj, merge) + struct obj *obj, *merge; +{ free((char *) obj); } -inshop(){ return(0); } -shopdig(){} -addtobill(){} -subfrombill(){} -splitbill(){} -dopay(){ return(0); } -paybill(){} -doinvbill(){ return(0); } -shkdead(){} -shkcatch(){ return(0); } -shk_move(){ return(0); } -replshk(mtmp,mtmp2) struct monst *mtmp, *mtmp2; {} -char *shkname(){ return(""); } - -#else QUEST +int +inshop() { + return (0); +} +void +shopdig(n) + int n; +{ +} +void +addtobill(obj) + struct obj *obj; +{ +} +void +subfrombill(obj) + struct obj *obj; +{ +} +void +splitbill(o1, o2) + struct obj *o1, *o2; +{ +} +int +dopay() { + return (0); +} +void +paybill() +{ +} +int +doinvbill(n) + int n; +{ + return (0); +} +void +shkdead(m) + struct monst *m; +{ +} +int +shkcatch(obj) + struct obj *obj; +{ + return (0); +} +int +shk_move(m) + struct monst *m; +{ + return (0); +} +void +replshk(mtmp, mtmp2) + struct monst *mtmp, *mtmp2; +{ +} +char *shkname(m) + struct monst *m; +{ + return (""); +} + +#else /* QUEST */ #include "hack.mfndpos.h" #include "def.mkroom.h" #include "def.eshk.h" @@ -37,16 +109,15 @@ char *shkname(){ return(""); } #define NOTANGRY(mon) mon->mpeaceful #define ANGRY(mon) !NOTANGRY(mon) -extern char plname[], *xname(); -extern struct obj *o_on(), *bp_to_obj(); - -/* Descriptor of current shopkeeper. Note that the bill need not be - per-shopkeeper, since it is valid only when in a shop. */ +/* + * Descriptor of current shopkeeper. Note that the bill need not be + * per-shopkeeper, since it is valid only when in a shop. + */ static struct monst *shopkeeper = 0; static struct bill_x *bill; -static int shlevel = 0; /* level of this shopkeeper */ - struct obj *billobjs; /* objects on bill with bp->useup */ - /* only accessed here and by save & restore */ +static int shlevel = 0; /* level of this shopkeeper */ +struct obj *billobjs; /* objects on bill with bp->useup */ +/* only accessed here and by save & restore */ static long int total; /* filled by addupbill() */ static long int followmsg; /* last time of follow message */ @@ -56,224 +127,237 @@ static long int followmsg; /* last time of follow message */ */ -char shtypes[] = { /* 8 shoptypes: 7 specialized, 1 mixed */ +char shtypes[] = { /* 8 shoptypes: 7 specialized, 1 mixed */ RING_SYM, WAND_SYM, WEAPON_SYM, FOOD_SYM, SCROLL_SYM, POTION_SYM, ARMOR_SYM, 0 }; -static char *shopnam[] = { +static char *shopnam[] = { "engagement ring", "walking cane", "antique weapon", "delicatessen", "second hand book", "liquor", "used armor", "assorted antiques" }; -char * -shkname(mtmp) /* called in do_name.c */ -register struct monst *mtmp; +char * +shkname(mtmp) /* called in do_name.c */ + struct monst *mtmp; { - return(ESHK(mtmp)->shknam); + return (ESHK(mtmp)->shknam); } -static void setpaid(); - -shkdead(mtmp) /* called in mon.c */ -register struct monst *mtmp; +void +shkdead(mtmp) /* called in mon.c */ + struct monst *mtmp; { - register struct eshk *eshk = ESHK(mtmp); + struct eshk *eshk = ESHK(mtmp); - if(eshk->shoplevel == dlevel) + if (eshk->shoplevel == dlevel) rooms[eshk->shoproom].rtype = 0; - if(mtmp == shopkeeper) { + if (mtmp == shopkeeper) { setpaid(); shopkeeper = 0; - bill = (struct bill_x *) -1000; /* dump core when referenced */ + bill = (struct bill_x *) - 1000; /* dump core when + * referenced */ } } -replshk(mtmp,mtmp2) -register struct monst *mtmp, *mtmp2; +void +replshk(mtmp, mtmp2) + struct monst *mtmp, *mtmp2; { - if(mtmp == shopkeeper) { + if (mtmp == shopkeeper) { shopkeeper = mtmp2; bill = &(ESHK(shopkeeper)->bill[0]); } } static void -setpaid(){ /* caller has checked that shopkeeper exists */ - /* either we paid or left the shop or he just died */ -register struct obj *obj; -register struct monst *mtmp; - for(obj = invent; obj; obj = obj->nobj) +setpaid() +{ /* caller has checked that shopkeeper exists */ + /* either we paid or left the shop or he just died */ + struct obj *obj; + struct monst *mtmp; + for (obj = invent; obj; obj = obj->nobj) obj->unpaid = 0; - for(obj = fobj; obj; obj = obj->nobj) + for (obj = fobj; obj; obj = obj->nobj) obj->unpaid = 0; - for(obj = fcobj; obj; obj = obj->nobj) + for (obj = fcobj; obj; obj = obj->nobj) obj->unpaid = 0; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - for(obj = mtmp->minvent; obj; obj = obj->nobj) + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + for (obj = mtmp->minvent; obj; obj = obj->nobj) obj->unpaid = 0; - for(mtmp = fallen_down; mtmp; mtmp = mtmp->nmon) - for(obj = mtmp->minvent; obj; obj = obj->nobj) + for (mtmp = fallen_down; mtmp; mtmp = mtmp->nmon) + for (obj = mtmp->minvent; obj; obj = obj->nobj) obj->unpaid = 0; - while(obj = billobjs){ + while ((obj = billobjs) != NULL) { billobjs = obj->nobj; free((char *) obj); } ESHK(shopkeeper)->billct = 0; } -static -addupbill(){ /* delivers result in total */ - /* caller has checked that shopkeeper exists */ -register ct = ESHK(shopkeeper)->billct; -register struct bill_x *bp = bill; +static void +addupbill() +{ /* delivers result in total */ + /* caller has checked that shopkeeper exists */ + int ct = ESHK(shopkeeper)->billct; + struct bill_x *bp = bill; total = 0; - while(ct--){ + while (ct--) { total += bp->price * bp->bquan; bp++; } } -inshop(){ -register roomno = inroom(u.ux,u.uy); - - static void findshk(); +int +inshop() +{ + int roomno = inroom(u.ux, u.uy); /* Did we just leave a shop? */ - if(u.uinshop && + if (u.uinshop && (u.uinshop != roomno + 1 || shlevel != dlevel || !shopkeeper)) { - if(shopkeeper) { - if(ESHK(shopkeeper)->billct) { - if(inroom(shopkeeper->mx, shopkeeper->my) - == u.uinshop - 1) /* ab@unido */ - pline("Somehow you escaped the shop without paying!"); - addupbill(); - pline("You stole for a total worth of %ld zorkmids.", - total); - ESHK(shopkeeper)->robbed += total; - setpaid(); - if((rooms[ESHK(shopkeeper)->shoproom].rtype == GENERAL) - == (rn2(3) == 0)) - ESHK(shopkeeper)->following = 1; - } - shopkeeper = 0; - shlevel = 0; + if (shopkeeper) { + if (ESHK(shopkeeper)->billct) { + if (inroom(shopkeeper->mx, shopkeeper->my) + == u.uinshop - 1) /* ab@unido */ + pline("Somehow you escaped the shop without paying!"); + addupbill(); + pline("You stole for a total worth of %ld zorkmids.", + total); + ESHK(shopkeeper)->robbed += total; + setpaid(); + if ((rooms[ESHK(shopkeeper)->shoproom].rtype == GENERAL) + == (rn2(3) == 0)) + ESHK(shopkeeper)->following = 1; + } + shopkeeper = 0; + shlevel = 0; } - u.uinshop = 0; + u.uinshop = 0; } - /* Did we just enter a zoo of some kind? */ - if(roomno >= 0) { - register int rt = rooms[roomno].rtype; - register struct monst *mtmp; - if(rt == ZOO) { + if (roomno >= 0) { + int rt = rooms[roomno].rtype; + struct monst *mtmp; + if (rt == ZOO) { pline("Welcome to David's treasure zoo!"); - } else - if(rt == SWAMP) { + } else if (rt == SWAMP) { pline("It looks rather muddy down here."); - } else - if(rt == MORGUE) { - if(midnight()) + } else if (rt == MORGUE) { + if (midnight()) pline("Go away! Go away!"); else pline("You get an uncanny feeling ..."); } else rt = 0; - if(rt != 0) { + if (rt != 0) { rooms[roomno].rtype = 0; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(rt != ZOO || !rn2(3)) + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (rt != ZOO || !rn2(3)) mtmp->msleep = 0; } } - /* Did we just enter a shop? */ - if(roomno >= 0 && rooms[roomno].rtype >= 8) { - if(shlevel != dlevel || !shopkeeper - || ESHK(shopkeeper)->shoproom != roomno) - findshk(roomno); - if(!shopkeeper) { - rooms[roomno].rtype = 0; - u.uinshop = 0; - } else if(!u.uinshop){ - if(!ESHK(shopkeeper)->visitct || - strncmp(ESHK(shopkeeper)->customer, plname, PL_NSIZ)){ - - /* He seems to be new here */ - ESHK(shopkeeper)->visitct = 0; - ESHK(shopkeeper)->following = 0; - (void) strncpy(ESHK(shopkeeper)->customer,plname,PL_NSIZ); - NOTANGRY(shopkeeper) = 1; - } - if(!ESHK(shopkeeper)->following) { - boolean box, pick; - - pline("Hello %s! Welcome%s to %s's %s shop!", - plname, - ESHK(shopkeeper)->visitct++ ? " again" : "", - shkname(shopkeeper), - shopnam[rooms[ESHK(shopkeeper)->shoproom].rtype - 8] ); - box = carrying(ICE_BOX); - pick = carrying(PICK_AXE); - if(box || pick) { - if(dochug(shopkeeper)) { - u.uinshop = 0; /* he died moving */ - return(0); + if (roomno >= 0 && rooms[roomno].rtype >= 8) { + if (shlevel != dlevel || !shopkeeper + || ESHK(shopkeeper)->shoproom != roomno) + findshk(roomno); + if (!shopkeeper) { + rooms[roomno].rtype = 0; + u.uinshop = 0; + } else if (!u.uinshop) { + if (!ESHK(shopkeeper)->visitct || + strncmp(ESHK(shopkeeper)->customer, plname, PL_NSIZ)) { + + /* He seems to be new here */ + ESHK(shopkeeper)->visitct = 0; + ESHK(shopkeeper)->following = 0; + (void) strncpy(ESHK(shopkeeper)->customer, plname, PL_NSIZ); + NOTANGRY(shopkeeper) = 1; } - pline("Will you please leave your %s outside?", - (box && pick) ? "box and pick-axe" : - box ? "box" : "pick-axe"); - } + if (!ESHK(shopkeeper)->following) { + boolean box, pick; + + pline("Hello %s! Welcome%s to %s's %s shop!", + plname, + ESHK(shopkeeper)->visitct++ ? " again" : "", + shkname(shopkeeper), + shopnam[rooms[ESHK(shopkeeper)->shoproom].rtype - 8]); + box = carrying(ICE_BOX); + pick = carrying(PICK_AXE); + if (box || pick) { + if (dochug(shopkeeper)) { + u.uinshop = 0; /* he died moving */ + return (0); + } + pline("Will you please leave your %s outside?", + (box && pick) ? "box and pick-axe" : + box ? "box" : "pick-axe"); + } + } + u.uinshop = roomno + 1; } - u.uinshop = roomno + 1; - } } - return(u.uinshop); + return (u.uinshop); } static void findshk(roomno) -register roomno; + int roomno; { -register struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->isshk && ESHK(mtmp)->shoproom == roomno - && ESHK(mtmp)->shoplevel == dlevel) { - shopkeeper = mtmp; - bill = &(ESHK(shopkeeper)->bill[0]); - shlevel = dlevel; - if(ANGRY(shopkeeper) && - strncmp(ESHK(shopkeeper)->customer,plname,PL_NSIZ)) - NOTANGRY(shopkeeper) = 1; - /* billobjs = 0; -- this is wrong if we save in a shop */ - /* (and it is harmless to have too many things in billobjs) */ - return; - } + struct monst *mtmp; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->isshk && ESHK(mtmp)->shoproom == roomno + && ESHK(mtmp)->shoplevel == dlevel) { + shopkeeper = mtmp; + bill = &(ESHK(shopkeeper)->bill[0]); + shlevel = dlevel; + if (ANGRY(shopkeeper) && + strncmp(ESHK(shopkeeper)->customer, plname, PL_NSIZ)) + NOTANGRY(shopkeeper) = 1; + /* + * billobjs = 0; -- this is wrong if we save in a + * shop + */ + /* + * (and it is harmless to have too many things in + * billobjs) + */ + return; + } shopkeeper = 0; shlevel = 0; - bill = (struct bill_x *) -1000; /* dump core when referenced */ + bill = (struct bill_x *) - 1000; /* dump core when referenced */ } static struct bill_x * -onbill(obj) register struct obj *obj; { -register struct bill_x *bp; - if(!shopkeeper) return(0); - for(bp = bill; bp < &bill[ESHK(shopkeeper)->billct]; bp++) - if(bp->bo_id == obj->o_id) { - if(!obj->unpaid) pline("onbill: paid obj on bill?"); - return(bp); +onbill(obj) + struct obj *obj; +{ + struct bill_x *bp; + if (!shopkeeper) + return (0); + for (bp = bill; bp < &bill[ESHK(shopkeeper)->billct]; bp++) + if (bp->bo_id == obj->o_id) { + if (!obj->unpaid) + pline("onbill: paid obj on bill?"); + return (bp); } - if(obj->unpaid) pline("onbill: unpaid obj not on bill?"); - return(0); + if (obj->unpaid) + pline("onbill: unpaid obj not on bill?"); + return (0); } /* called with two args on merge */ -obfree(obj,merge) register struct obj *obj, *merge; { -register struct bill_x *bp = onbill(obj); -register struct bill_x *bpm; - if(bp) { - if(!merge){ +void +obfree(obj, merge) + struct obj *obj, *merge; +{ + struct bill_x *bp = onbill(obj); + struct bill_x *bpm; + if (bp) { + if (!merge) { bp->useup = 1; obj->unpaid = 0; /* only for doinvbill */ obj->nobj = billobjs; @@ -281,7 +365,7 @@ register struct bill_x *bpm; return; } bpm = onbill(merge); - if(!bpm){ + if (!bpm) { /* this used to be a rename */ impossible("obfree: not on bill??"); return; @@ -295,98 +379,100 @@ register struct bill_x *bpm; free((char *) obj); } -static -pay(tmp,shkp) -long tmp; -register struct monst *shkp; +static void +pay(tmp, shkp) + long tmp; + struct monst *shkp; { - long robbed = ESHK(shkp)->robbed; + long robbed = ESHK(shkp)->robbed; u.ugold -= tmp; shkp->mgold += tmp; flags.botl = 1; - if(robbed) { + if (robbed) { robbed -= tmp; - if(robbed < 0) robbed = 0; + if (robbed < 0) + robbed = 0; ESHK(shkp)->robbed = robbed; } } -dopay(){ -long ltmp; -register struct bill_x *bp; -register struct monst *shkp; -int pass, tmp; - - static int dopayobj(); +int +dopay() +{ + long ltmp; + struct bill_x *bp; + struct monst *shkp; + int pass, tmp; multi = 0; (void) inshop(); - for(shkp = fmon; shkp; shkp = shkp->nmon) - if(shkp->isshk && dist(shkp->mx,shkp->my) < 3) + for (shkp = fmon; shkp; shkp = shkp->nmon) + if (shkp->isshk && dist(shkp->mx, shkp->my) < 3) break; - if(!shkp && u.uinshop && - inroom(shopkeeper->mx,shopkeeper->my) == ESHK(shopkeeper)->shoproom) + if (!shkp && u.uinshop && + inroom(shopkeeper->mx, shopkeeper->my) == ESHK(shopkeeper)->shoproom) shkp = shopkeeper; - if(!shkp) { + if (!shkp) { pline("There is nobody here to receive your payment."); - return(0); + return (0); } ltmp = ESHK(shkp)->robbed; - if(shkp != shopkeeper && NOTANGRY(shkp)) { - if(!ltmp) { + if (shkp != shopkeeper && NOTANGRY(shkp)) { + if (!ltmp) { pline("You do not owe %s anything.", monnam(shkp)); - } else - if(!u.ugold) { + } else if (!u.ugold) { pline("You have no money."); } else { - long ugold = u.ugold; + long ugold = u.ugold; - if(u.ugold > ltmp) { - pline("You give %s the %ld gold pieces he asked for.", - monnam(shkp), ltmp); - pay(ltmp, shkp); - } else { - pline("You give %s all your gold.", monnam(shkp)); - pay(u.ugold, shkp); - } - if(ugold < ltmp/2) { - pline("Unfortunately, he doesn't look satisfied."); - } else { - ESHK(shkp)->robbed = 0; - ESHK(shkp)->following = 0; - if(ESHK(shkp)->shoplevel != dlevel) { - /* For convenience's sake, let him disappear */ - shkp->minvent = 0; /* %% */ - shkp->mgold = 0; - mondead(shkp); + if (u.ugold > ltmp) { + pline("You give %s the %ld gold pieces he asked for.", + monnam(shkp), ltmp); + pay(ltmp, shkp); + } else { + pline("You give %s all your gold.", monnam(shkp)); + pay(u.ugold, shkp); + } + if (ugold < ltmp / 2) { + pline("Unfortunately, he doesn't look satisfied."); + } else { + ESHK(shkp)->robbed = 0; + ESHK(shkp)->following = 0; + if (ESHK(shkp)->shoplevel != dlevel) { + /* + * For convenience's sake, let him + * disappear + */ + shkp->minvent = 0; /* %% */ + shkp->mgold = 0; + mondead(shkp); + } } - } } - return(1); + return (1); } - - if(!ESHK(shkp)->billct){ + if (!ESHK(shkp)->billct) { pline("You do not owe %s anything.", monnam(shkp)); - if(!u.ugold){ + if (!u.ugold) { pline("Moreover, you have no money."); - return(1); + return (1); } - if(ESHK(shkp)->robbed){ + if (ESHK(shkp)->robbed) { #define min(a,b) ((a<b)?a:b) - pline("But since his shop has been robbed recently,"); - pline("you %srepay %s's expenses.", - (u.ugold < ESHK(shkp)->robbed) ? "partially " : "", - monnam(shkp)); - pay(min(u.ugold, ESHK(shkp)->robbed), shkp); - ESHK(shkp)->robbed = 0; - return(1); + pline("But since his shop has been robbed recently,"); + pline("you %srepay %s's expenses.", + (u.ugold < ESHK(shkp)->robbed) ? "partially " : "", + monnam(shkp)); + pay(min(u.ugold, ESHK(shkp)->robbed), shkp); + ESHK(shkp)->robbed = 0; + return (1); } - if(ANGRY(shkp)){ + if (ANGRY(shkp)) { pline("But in order to appease %s,", - amonnam(shkp, "angry")); - if(u.ugold >= 1000){ + amonnam(shkp, "angry")); + if (u.ugold >= 1000) { ltmp = 1000; pline(" you give him 1000 gold pieces."); } else { @@ -394,140 +480,152 @@ int pass, tmp; pline(" you give him all your money."); } pay(ltmp, shkp); - if(strncmp(ESHK(shkp)->customer, plname, PL_NSIZ) - || rn2(3)){ + if (strncmp(ESHK(shkp)->customer, plname, PL_NSIZ) + || rn2(3)) { pline("%s calms down.", Monnam(shkp)); NOTANGRY(shkp) = 1; - } else pline("%s is as angry as ever.", - Monnam(shkp)); + } else + pline("%s is as angry as ever.", + Monnam(shkp)); } - return(1); + return (1); } - if(shkp != shopkeeper) { + if (shkp != shopkeeper) { impossible("dopay: not to shopkeeper?"); - if(shopkeeper) setpaid(); - return(0); + if (shopkeeper) + setpaid(); + return (0); } - for(pass = 0; pass <= 1; pass++) { + for (pass = 0; pass <= 1; pass++) { tmp = 0; - while(tmp < ESHK(shopkeeper)->billct) { + while (tmp < ESHK(shopkeeper)->billct) { bp = &bill[tmp]; - if(!pass && !bp->useup) { + if (!pass && !bp->useup) { tmp++; continue; } - if(!dopayobj(bp)) return(1); + if (!dopayobj(bp)) + return (1); bill[tmp] = bill[--ESHK(shopkeeper)->billct]; } } pline("Thank you for shopping in %s's %s store!", - shkname(shopkeeper), - shopnam[rooms[ESHK(shopkeeper)->shoproom].rtype - 8]); + shkname(shopkeeper), + shopnam[rooms[ESHK(shopkeeper)->shoproom].rtype - 8]); NOTANGRY(shopkeeper) = 1; - return(1); + return (1); } /* return 1 if paid successfully */ -/* 0 if not enough money */ -/* -1 if object could not be found (but was paid) */ -static -dopayobj(bp) register struct bill_x *bp; { -register struct obj *obj; -long ltmp; +/* 0 if not enough money */ +/* -1 if object could not be found (but was paid) */ +static int +dopayobj(bp) + struct bill_x *bp; +{ + struct obj *obj; + long ltmp; /* find the object on one of the lists */ obj = bp_to_obj(bp); - if(!obj) { + if (!obj) { impossible("Shopkeeper administration out of order."); setpaid(); /* be nice to the player */ - return(0); + return (0); } - - if(!obj->unpaid && !bp->useup){ + if (!obj->unpaid && !bp->useup) { impossible("Paid object on bill??"); - return(1); + return (1); } obj->unpaid = 0; ltmp = bp->price * bp->bquan; - if(ANGRY(shopkeeper)) ltmp += ltmp/3; - if(u.ugold < ltmp){ + if (ANGRY(shopkeeper)) + ltmp += ltmp / 3; + if (u.ugold < ltmp) { pline("You don't have gold enough to pay %s.", - doname(obj)); + doname(obj)); obj->unpaid = 1; - return(0); + return (0); } pay(ltmp, shopkeeper); pline("You bought %s for %ld gold piece%s.", - doname(obj), ltmp, plur(ltmp)); - if(bp->useup) { - register struct obj *otmp = billobjs; - if(obj == billobjs) + doname(obj), ltmp, plur(ltmp)); + if (bp->useup) { + struct obj *otmp = billobjs; + if (obj == billobjs) billobjs = obj->nobj; else { - while(otmp && otmp->nobj != obj) otmp = otmp->nobj; - if(otmp) otmp->nobj = obj->nobj; - else pline("Error in shopkeeper administration."); + while (otmp && otmp->nobj != obj) + otmp = otmp->nobj; + if (otmp) + otmp->nobj = obj->nobj; + else + pline("Error in shopkeeper administration."); } free((char *) obj); } - return(1); + return (1); } /* routine called after dying (or quitting) with nonempty bill */ -paybill(){ - if(shlevel == dlevel && shopkeeper && ESHK(shopkeeper)->billct){ +void +paybill() +{ + if (shlevel == dlevel && shopkeeper && ESHK(shopkeeper)->billct) { addupbill(); - if(total > u.ugold){ + if (total > u.ugold) { shopkeeper->mgold += u.ugold; u.ugold = 0; - pline("%s comes and takes all your possessions.", - Monnam(shopkeeper)); + pline("%s comes and takes all your possessions.", + Monnam(shopkeeper)); } else { u.ugold -= total; shopkeeper->mgold += total; - pline("%s comes and takes the %ld zorkmids you owed him.", - Monnam(shopkeeper), total); + pline("%s comes and takes the %ld zorkmids you owed him.", + Monnam(shopkeeper), total); } setpaid(); /* in case we create bones */ } } /* find obj on one of the lists */ -struct obj * +struct obj * bp_to_obj(bp) -register struct bill_x *bp; + struct bill_x *bp; { - register struct obj *obj; - register struct monst *mtmp; - register unsigned id = bp->bo_id; + struct obj *obj; + struct monst *mtmp; + unsigned id = bp->bo_id; - if(bp->useup) + if (bp->useup) obj = o_on(id, billobjs); - else if(!(obj = o_on(id, invent)) && - !(obj = o_on(id, fobj)) && - !(obj = o_on(id, fcobj))) { - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(obj = o_on(id, mtmp->minvent)) - break; - for(mtmp = fallen_down; mtmp; mtmp = mtmp->nmon) - if(obj = o_on(id, mtmp->minvent)) - break; - } - return(obj); + else if (!(obj = o_on(id, invent)) && + !(obj = o_on(id, fobj)) && + !(obj = o_on(id, fcobj))) { + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if ((obj = o_on(id, mtmp->minvent)) != NULL) + break; + for (mtmp = fallen_down; mtmp; mtmp = mtmp->nmon) + if ((obj = o_on(id, mtmp->minvent)) != NULL) + break; + } + return (obj); } -static int getprice(); - /* called in hack.c when we pickup an object */ -addtobill(obj) register struct obj *obj; { -register struct bill_x *bp; - if(!inshop() || - (u.ux == ESHK(shopkeeper)->shk.x && u.uy == ESHK(shopkeeper)->shk.y) || - (u.ux == ESHK(shopkeeper)->shd.x && u.uy == ESHK(shopkeeper)->shd.y) || - onbill(obj) /* perhaps we threw it away earlier */ - ) return; - if(ESHK(shopkeeper)->billct == BILLSZ){ +void +addtobill(obj) + struct obj *obj; +{ + struct bill_x *bp; + if (!inshop() || + (u.ux == ESHK(shopkeeper)->shk.x && u.uy == ESHK(shopkeeper)->shk.y) || + (u.ux == ESHK(shopkeeper)->shd.x && u.uy == ESHK(shopkeeper)->shd.y) || + onbill(obj) /* perhaps we threw it away earlier */ + ) + return; + if (ESHK(shopkeeper)->billct == BILLSZ) { pline("You got that for free!"); return; } @@ -540,25 +638,29 @@ register struct bill_x *bp; obj->unpaid = 1; } -splitbill(obj,otmp) register struct obj *obj, *otmp; { +void +splitbill(obj, otmp) + struct obj *obj, *otmp; +{ /* otmp has been split off from obj */ -register struct bill_x *bp; -register int tmp; + struct bill_x *bp; + int tmp; bp = onbill(obj); - if(!bp) { + if (!bp) { impossible("splitbill: not on bill?"); return; } - if(bp->bquan < otmp->quan) { + if (bp->bquan < otmp->quan) { impossible("Negative quantity on bill??"); } - if(bp->bquan == otmp->quan) { + if (bp->bquan == otmp->quan) { impossible("Zero quantity on bill??"); } bp->bquan -= otmp->quan; /* addtobill(otmp); */ - if(ESHK(shopkeeper)->billct == BILLSZ) otmp->unpaid = 0; + if (ESHK(shopkeeper)->billct == BILLSZ) + otmp->unpaid = 0; else { tmp = bp->price; bp = &bill[ESHK(shopkeeper)->billct]; @@ -570,17 +672,20 @@ register int tmp; } } -subfrombill(obj) register struct obj *obj; { -long ltmp; -register int tmp; -register struct obj *otmp; -register struct bill_x *bp; - if(!inshop() || (u.ux == ESHK(shopkeeper)->shk.x && u.uy == ESHK(shopkeeper)->shk.y) || - (u.ux == ESHK(shopkeeper)->shd.x && u.uy == ESHK(shopkeeper)->shd.y)) +void +subfrombill(obj) + struct obj *obj; +{ + long ltmp; + int tmp; + struct obj *otmp; + struct bill_x *bp; + if (!inshop() || (u.ux == ESHK(shopkeeper)->shk.x && u.uy == ESHK(shopkeeper)->shk.y) || + (u.ux == ESHK(shopkeeper)->shd.x && u.uy == ESHK(shopkeeper)->shd.y)) return; - if((bp = onbill(obj)) != 0){ + if ((bp = onbill(obj)) != 0) { obj->unpaid = 0; - if(bp->bquan > obj->quan){ + if (bp->bquan > obj->quan) { otmp = newobj(0); *otmp = *obj; bp->bo_id = otmp->o_id = flags.ident++; @@ -596,153 +701,155 @@ register struct bill_x *bp; *bp = bill[ESHK(shopkeeper)->billct]; return; } - if(obj->unpaid){ + if (obj->unpaid) { pline("%s didn't notice.", Monnam(shopkeeper)); obj->unpaid = 0; return; /* %% */ } /* he dropped something of his own - probably wants to sell it */ - if(shopkeeper->msleep || shopkeeper->mfroz || - inroom(shopkeeper->mx,shopkeeper->my) != ESHK(shopkeeper)->shoproom) + if (shopkeeper->msleep || shopkeeper->mfroz || + inroom(shopkeeper->mx, shopkeeper->my) != ESHK(shopkeeper)->shoproom) return; - if(ESHK(shopkeeper)->billct == BILLSZ || - ((tmp = shtypes[rooms[ESHK(shopkeeper)->shoproom].rtype-8]) && tmp != obj->olet) - || index("_0", obj->olet)) { + if (ESHK(shopkeeper)->billct == BILLSZ || + ((tmp = shtypes[rooms[ESHK(shopkeeper)->shoproom].rtype - 8]) && tmp != obj->olet) + || strchr("_0", obj->olet)) { pline("%s seems not interested.", Monnam(shopkeeper)); return; } ltmp = getprice(obj) * obj->quan; - if(ANGRY(shopkeeper)) { + if (ANGRY(shopkeeper)) { ltmp /= 3; NOTANGRY(shopkeeper) = 1; - } else ltmp /= 2; - if(ESHK(shopkeeper)->robbed){ - if((ESHK(shopkeeper)->robbed -= ltmp) < 0) + } else + ltmp /= 2; + if (ESHK(shopkeeper)->robbed) { + if ((ESHK(shopkeeper)->robbed -= ltmp) < 0) ESHK(shopkeeper)->robbed = 0; -pline("Thank you for your contribution to restock this recently plundered shop."); + pline("Thank you for your contribution to restock this recently plundered shop."); return; } - if(ltmp > shopkeeper->mgold) + if (ltmp > shopkeeper->mgold) ltmp = shopkeeper->mgold; pay(-ltmp, shopkeeper); - if(!ltmp) - pline("%s gladly accepts %s but cannot pay you at present.", - Monnam(shopkeeper), doname(obj)); + if (!ltmp) + pline("%s gladly accepts %s but cannot pay you at present.", + Monnam(shopkeeper), doname(obj)); else - pline("You sold %s and got %ld gold piece%s.", doname(obj), ltmp, - plur(ltmp)); + pline("You sold %s and got %ld gold piece%s.", doname(obj), ltmp, + plur(ltmp)); } +int doinvbill(mode) -int mode; /* 0: deliver count 1: paged */ + int mode; /* 0: deliver count 1: paged */ { - register struct bill_x *bp; - register struct obj *obj; - long totused, thisused; - char buf[BUFSZ]; - - if(mode == 0) { - register int cnt = 0; - - if(shopkeeper) - for(bp = bill; bp - bill < ESHK(shopkeeper)->billct; bp++) - if(bp->useup || - ((obj = bp_to_obj(bp)) && obj->quan < bp->bquan)) - cnt++; - return(cnt); + struct bill_x *bp; + struct obj *obj; + long totused, thisused; + char buf[BUFSZ]; + + if (mode == 0) { + int cnt = 0; + + if (shopkeeper) + for (bp = bill; bp - bill < ESHK(shopkeeper)->billct; bp++) + if (bp->useup || + ((obj = bp_to_obj(bp)) && obj->quan < bp->bquan)) + cnt++; + return (cnt); } - - if(!shopkeeper) { + if (!shopkeeper) { impossible("doinvbill: no shopkeeper?"); - return(0); + return (0); } - set_pager(0); - if(page_line("Unpaid articles already used up:") || page_line("")) - goto quit; + if (page_line("Unpaid articles already used up:") || page_line("")) + goto quit; totused = 0; - for(bp = bill; bp - bill < ESHK(shopkeeper)->billct; bp++) { - obj = bp_to_obj(bp); - if(!obj) { - impossible("Bad shopkeeper administration."); - goto quit; - } - if(bp->useup || bp->bquan > obj->quan) { - register int cnt, oquan, uquan; - - oquan = obj->quan; - uquan = (bp->useup ? bp->bquan : bp->bquan - oquan); - thisused = bp->price * uquan; - totused += thisused; - obj->quan = uquan; /* cheat doname */ - (void) sprintf(buf, "x - %s", doname(obj)); - obj->quan = oquan; /* restore value */ - for(cnt = 0; buf[cnt]; cnt++); - while(cnt < 50) - buf[cnt++] = ' '; - (void) sprintf(&buf[cnt], " %5ld zorkmids", thisused); - if(page_line(buf)) + for (bp = bill; bp - bill < ESHK(shopkeeper)->billct; bp++) { + obj = bp_to_obj(bp); + if (!obj) { + impossible("Bad shopkeeper administration."); goto quit; - } + } + if (bp->useup || bp->bquan > obj->quan) { + int cnt, oquan, uquan; + + oquan = obj->quan; + uquan = (bp->useup ? bp->bquan : bp->bquan - oquan); + thisused = bp->price * uquan; + totused += thisused; + obj->quan = uquan; /* cheat doname */ + (void) sprintf(buf, "x - %s", doname(obj)); + obj->quan = oquan; /* restore value */ + for (cnt = 0; buf[cnt]; cnt++); + while (cnt < 50) + buf[cnt++] = ' '; + (void) sprintf(&buf[cnt], " %5ld zorkmids", thisused); + if (page_line(buf)) + goto quit; + } } (void) sprintf(buf, "Total:%50ld zorkmids", totused); - if(page_line("") || page_line(buf)) + if (page_line("") || page_line(buf)) goto quit; set_pager(1); - return(0); + return (0); quit: set_pager(2); - return(0); + return (0); } -static -getprice(obj) register struct obj *obj; { -register int tmp, ac; - static int realhunger(); +static int +getprice(obj) + struct obj *obj; +{ + int tmp, ac; - switch(obj->olet){ + switch (obj->olet) { case AMULET_SYM: - tmp = 10*rnd(500); + tmp = 10 * rnd(500); break; case TOOL_SYM: - tmp = 10*rnd((obj->otyp == EXPENSIVE_CAMERA) ? 150 : 30); + tmp = 10 * rnd((obj->otyp == EXPENSIVE_CAMERA) ? 150 : 30); break; case RING_SYM: - tmp = 10*rnd(100); + tmp = 10 * rnd(100); break; case WAND_SYM: - tmp = 10*rnd(100); + tmp = 10 * rnd(100); break; case SCROLL_SYM: - tmp = 10*rnd(50); + tmp = 10 * rnd(50); #ifdef MAIL - if(obj->otyp == SCR_MAIL) + if (obj->otyp == SCR_MAIL) tmp = rnd(5); -#endif MAIL +#endif /* MAIL */ break; case POTION_SYM: - tmp = 10*rnd(50); + tmp = 10 * rnd(50); break; case FOOD_SYM: - tmp = 10*rnd(5 + (2000/realhunger())); + tmp = 10 * rnd(5 + (2000 / realhunger())); break; case GEM_SYM: - tmp = 10*rnd(20); + tmp = 10 * rnd(20); break; case ARMOR_SYM: ac = ARM_BONUS(obj); - if(ac <= -10) /* probably impossible */ + if (ac <= -10) /* probably impossible */ ac = -9; - tmp = 100 + ac*ac*rnd(10+ac); + tmp = 100 + ac * ac * rnd(10 + ac); break; case WEAPON_SYM: - if(obj->otyp < BOOMERANG) - tmp = 5*rnd(10); - else if(obj->otyp == LONG_SWORD || - obj->otyp == TWO_HANDED_SWORD) - tmp = 10*rnd(150); - else tmp = 10*rnd(75); + if (obj->otyp < BOOMERANG) + tmp = 5 * rnd(10); + else if (obj->otyp == LONG_SWORD || + obj->otyp == TWO_HANDED_SWORD) + tmp = 10 * rnd(150); + else + tmp = 10 * rnd(75); break; case CHAIN_SYM: pline("Strange ..., carrying a chain?"); @@ -752,101 +859,103 @@ register int tmp, ac; default: tmp = 10000; } - return(tmp); + return (tmp); } -static -realhunger(){ /* not completely foolproof */ -register tmp = u.uhunger; -register struct obj *otmp = invent; - while(otmp){ - if(otmp->olet == FOOD_SYM && !otmp->unpaid) +static int +realhunger() +{ /* not completely foolproof */ + int tmp = u.uhunger; + struct obj *otmp = invent; + while (otmp) { + if (otmp->olet == FOOD_SYM && !otmp->unpaid) tmp += objects[otmp->otyp].nutrition; otmp = otmp->nobj; } - return((tmp <= 0) ? 1 : tmp); + return ((tmp <= 0) ? 1 : tmp); } +int shkcatch(obj) -register struct obj *obj; + struct obj *obj; { - register struct monst *shkp = shopkeeper; + struct monst *shkp = shopkeeper; - if(u.uinshop && shkp && !shkp->mfroz && !shkp->msleep && + if (u.uinshop && shkp && !shkp->mfroz && !shkp->msleep && u.dx && u.dy && - inroom(u.ux+u.dx, u.uy+u.dy) + 1 == u.uinshop && + inroom(u.ux + u.dx, u.uy + u.dy) + 1 == u.uinshop && shkp->mx == ESHK(shkp)->shk.x && shkp->my == ESHK(shkp)->shk.y && u.ux == ESHK(shkp)->shd.x && u.uy == ESHK(shkp)->shd.y) { pline("%s nimbly catches the %s.", Monnam(shkp), xname(obj)); obj->nobj = shkp->minvent; shkp->minvent = obj; - return(1); + return (1); } - return(0); + return (0); } /* * shk_move: return 1: he moved 0: he didnt -1: let m_move do it */ +int shk_move(shkp) -register struct monst *shkp; -{ - register struct monst *mtmp; - register struct permonst *mdat = shkp->data; - register xchar gx,gy,omx,omy,nx,ny,nix,niy; - register schar appr,i; - register int udist; - int z; - schar shkroom,chi,chcnt,cnt; - boolean uondoor, satdoor, avoid, badinv; - coord poss[9]; - int info[9]; - struct obj *ib = 0; + struct monst *shkp; +{ + struct monst *mtmp; + struct permonst *mdat = shkp->data; + xchar gx, gy, omx, omy, nx, ny, nix, niy; + schar appr, i; + int udist; + int z; + schar shkroom, chi, chcnt, cnt; + boolean uondoor = 0, satdoor, avoid = 0, badinv; + coord poss[9]; + int info[9]; + struct obj *ib = 0; omx = shkp->mx; omy = shkp->my; - if((udist = dist(omx,omy)) < 3) { - if(ANGRY(shkp)) { - (void) hitu(shkp, d(mdat->damn, mdat->damd)+1); - return(0); + if ((udist = dist(omx, omy)) < 3) { + if (ANGRY(shkp)) { + (void) hitu(shkp, d(mdat->damn, mdat->damd) + 1); + return (0); } - if(ESHK(shkp)->following) { - if(strncmp(ESHK(shkp)->customer, plname, PL_NSIZ)){ + if (ESHK(shkp)->following) { + if (strncmp(ESHK(shkp)->customer, plname, PL_NSIZ)) { pline("Hello %s! I was looking for %s.", - plname, ESHK(shkp)->customer); + plname, ESHK(shkp)->customer); ESHK(shkp)->following = 0; - return(0); + return (0); } - if(!ESHK(shkp)->robbed) { /* impossible? */ + if (!ESHK(shkp)->robbed) { /* impossible? */ ESHK(shkp)->following = 0; - return(0); + return (0); } - if(moves > followmsg+4) { + if (moves > followmsg + 4) { pline("Hello %s! Didn't you forget to pay?", - plname); + plname); followmsg = moves; } - if(udist < 2) - return(0); + if (udist < 2) + return (0); } } - - shkroom = inroom(omx,omy); + shkroom = inroom(omx, omy); appr = 1; gx = ESHK(shkp)->shk.x; gy = ESHK(shkp)->shk.y; satdoor = (gx == omx && gy == omy); - if(ESHK(shkp)->following || ((z = holetime()) >= 0 && z*z <= udist)){ + if (ESHK(shkp)->following || ((z = holetime()) >= 0 && z * z <= udist)) { gx = u.ux; gy = u.uy; - if(shkroom < 0 || shkroom != inroom(u.ux,u.uy)) - if(udist > 4) - return(-1); /* leave it to m_move */ - } else if(ANGRY(shkp)) { - long saveBlind = Blind; + if (shkroom < 0 || shkroom != inroom(u.ux, u.uy)) + if (udist > 4) + return (-1); /* leave it to m_move */ + } else if (ANGRY(shkp)) { + long saveBlind = Blind; Blind = 0; - if(shkp->mcansee && !Invis && cansee(omx,omy)) { + if (shkp->mcansee && !Invis && cansee(omx, omy)) { gx = u.ux; gy = u.uy; } @@ -854,139 +963,149 @@ register struct monst *shkp; avoid = FALSE; } else { #define GDIST(x,y) ((x-gx)*(x-gx)+(y-gy)*(y-gy)) - if(Invis) - avoid = FALSE; + if (Invis) + avoid = FALSE; else { - uondoor = (u.ux == ESHK(shkp)->shd.x && - u.uy == ESHK(shkp)->shd.y); - if(uondoor) { - if(ESHK(shkp)->billct) - pline("Hello %s! Will you please pay before leaving?", - plname); - badinv = (carrying(PICK_AXE) || carrying(ICE_BOX)); - if(satdoor && badinv) - return(0); - avoid = !badinv; - } else { - avoid = (u.uinshop && dist(gx,gy) > 8); - badinv = FALSE; - } - - if(((!ESHK(shkp)->robbed && !ESHK(shkp)->billct) || avoid) - && GDIST(omx,omy) < 3){ - if(!badinv && !online(omx,omy)) - return(0); - if(satdoor) - appr = gx = gy = 0; - } + uondoor = (u.ux == ESHK(shkp)->shd.x && + u.uy == ESHK(shkp)->shd.y); + if (uondoor) { + if (ESHK(shkp)->billct) + pline("Hello %s! Will you please pay before leaving?", + plname); + badinv = (carrying(PICK_AXE) || carrying(ICE_BOX)); + if (satdoor && badinv) + return (0); + avoid = !badinv; + } else { + avoid = (u.uinshop && dist(gx, gy) > 8); + badinv = FALSE; + } + + if (((!ESHK(shkp)->robbed && !ESHK(shkp)->billct) || avoid) + && GDIST(omx, omy) < 3) { + if (!badinv && !online(omx, omy)) + return (0); + if (satdoor) + appr = gx = gy = 0; + } } } - if(omx == gx && omy == gy) - return(0); - if(shkp->mconf) { + if (omx == gx && omy == gy) + return (0); + if (shkp->mconf) { avoid = FALSE; appr = 0; } nix = omx; niy = omy; - cnt = mfndpos(shkp,poss,info,ALLOW_SSM); - if(avoid && uondoor) { /* perhaps we cannot avoid him */ - for(i=0; i<cnt; i++) - if(!(info[i] & NOTONL)) goto notonl_ok; + cnt = mfndpos(shkp, poss, info, ALLOW_SSM); + if (avoid && uondoor) { /* perhaps we cannot avoid him */ + for (i = 0; i < cnt; i++) + if (!(info[i] & NOTONL)) + goto notonl_ok; avoid = FALSE; - notonl_ok: +notonl_ok: ; } chi = -1; chcnt = 0; - for(i=0; i<cnt; i++){ + for (i = 0; i < cnt; i++) { nx = poss[i].x; ny = poss[i].y; - if(levl[nx][ny].typ == ROOM - || shkroom != ESHK(shkp)->shoproom - || ESHK(shkp)->following) { + if (levl[nx][ny].typ == ROOM + || shkroom != ESHK(shkp)->shoproom + || ESHK(shkp)->following) { #ifdef STUPID - /* cater for stupid compilers */ - register int zz; -#endif STUPID - if(uondoor && (ib = sobj_at(ICE_BOX, nx, ny))) { - nix = nx; niy = ny; chi = i; break; - } - if(avoid && (info[i] & NOTONL)) - continue; - if((!appr && !rn2(++chcnt)) || + /* cater for stupid compilers */ + int zz; +#endif /* STUPID */ + if (uondoor && (ib = sobj_at(ICE_BOX, nx, ny))) { + nix = nx; + niy = ny; + chi = i; + break; + } + if (avoid && (info[i] & NOTONL)) + continue; + if ((!appr && !rn2(++chcnt)) || #ifdef STUPID - (appr && (zz = GDIST(nix,niy)) && zz > GDIST(nx,ny)) + (appr && (zz = GDIST(nix, niy)) && zz > GDIST(nx, ny)) #else - (appr && GDIST(nx,ny) < GDIST(nix,niy)) -#endif STUPID - ) { - nix = nx; - niy = ny; - chi = i; - } + (appr && GDIST(nx, ny) < GDIST(nix, niy)) +#endif /* STUPID */ + ) { + nix = nx; + niy = ny; + chi = i; + } } } - if(nix != omx || niy != omy){ - if(info[chi] & ALLOW_M){ - mtmp = m_at(nix,niy); - if(hitmm(shkp,mtmp) == 1 && rn2(3) && - hitmm(mtmp,shkp) == 2) return(2); - return(0); - } else if(info[chi] & ALLOW_U){ - (void) hitu(shkp, d(mdat->damn, mdat->damd)+1); - return(0); + if (nix != omx || niy != omy) { + if (info[chi] & ALLOW_M) { + mtmp = m_at(nix, niy); + if (hitmm(shkp, mtmp) == 1 && rn2(3) && + hitmm(mtmp, shkp) == 2) + return (2); + return (0); + } else if (info[chi] & ALLOW_U) { + (void) hitu(shkp, d(mdat->damn, mdat->damd) + 1); + return (0); } shkp->mx = nix; shkp->my = niy; pmon(shkp); - if(ib) { + if (ib) { freeobj(ib); mpickobj(shkp, ib); } - return(1); + return (1); } - return(0); + return (0); } /* He is digging in the shop. */ +void shopdig(fall) -register int fall; + int fall; { - if(!fall) { - if(u.utraptype == TT_PIT) - pline("\"Be careful, sir, or you might fall through the floor.\""); - else - pline("\"Please, do not damage the floor here.\""); - } else if(dist(shopkeeper->mx, shopkeeper->my) < 3) { - register struct obj *obj, *obj2; - - pline("%s grabs your backpack!", shkname(shopkeeper)); - for(obj = invent; obj; obj = obj2) { - obj2 = obj->nobj; - if(obj->owornmask) continue; - freeinv(obj); - obj->nobj = shopkeeper->minvent; - shopkeeper->minvent = obj; - if(obj->unpaid) - subfrombill(obj); + if (!fall) { + if (u.utraptype == TT_PIT) + pline("\"Be careful, sir, or you might fall through the floor.\""); + else + pline("\"Please, do not damage the floor here.\""); + } else if (dist(shopkeeper->mx, shopkeeper->my) < 3) { + struct obj *obj, *obj2; + + pline("%s grabs your backpack!", shkname(shopkeeper)); + for (obj = invent; obj; obj = obj2) { + obj2 = obj->nobj; + if (obj->owornmask) + continue; + freeinv(obj); + obj->nobj = shopkeeper->minvent; + shopkeeper->minvent = obj; + if (obj->unpaid) + subfrombill(obj); + } } - } } -#endif QUEST +#endif /* QUEST */ -online(x,y) { - return(x==u.ux || y==u.uy || - (x-u.ux)*(x-u.ux) == (y-u.uy)*(y-u.uy)); +int +online(x, y) +{ + return (x == u.ux || y == u.uy || + (x - u.ux) * (x - u.ux) == (y - u.uy) * (y - u.uy)); } /* Does this monster follow me downstairs? */ +int follower(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - return( mtmp->mtame || index("1TVWZi&, ", mtmp->data->mlet) + return (mtmp->mtame || strchr("1TVWZi&, ", mtmp->data->mlet) #ifndef QUEST || (mtmp->isshk && ESHK(mtmp)->following) -#endif QUEST +#endif /* QUEST */ ); } diff --git a/hack/hack.shknam.c b/hack/hack.shknam.c index 152dbdb1..de3a6323 100644 --- a/hack/hack.shknam.c +++ b/hack/hack.shknam.c @@ -1,14 +1,18 @@ +/* $NetBSD: hack.shknam.c,v 1.4 1997/10/19 16:59:03 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.shknam.c,v 1.3 1995/03/23 08:31:33 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.shknam.c,v 1.4 1997/10/19 16:59:03 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" -char *shkliquors[] = { +char *shkliquors[] = { /* Ukraine */ "Njezjin", "Tsjernigof", "Gomel", "Ossipewsk", "Gorlowka", /* N. Russia */ @@ -23,7 +27,7 @@ char *shkliquors[] = { 0 }; -char *shkbooks[] = { +char *shkbooks[] = { /* Eire */ "Skibbereen", "Kanturk", "Rath Luirc", "Ennistymon", "Lahinch", "Loughrea", "Croagh", "Maumakeogh", "Ballyjamesduff", @@ -35,7 +39,7 @@ char *shkbooks[] = { 0 }; -char *shkarmors[] = { +char *shkarmors[] = { /* Turquie */ "Demirci", "Kalecik", "Boyabai", "Yildizeli", "Gaziantep", "Siirt", "Akhalataki", "Tirebolu", "Aksaray", "Ermenak", @@ -46,7 +50,7 @@ char *shkarmors[] = { 0 }; -char *shkwands[] = { +char *shkwands[] = { /* Wales */ "Yr Wyddgrug", "Trallwng", "Mallwyd", "Pontarfynach", "Rhaeader", "Llandrindod", "Llanfair-ym-muallt", @@ -60,7 +64,7 @@ char *shkwands[] = { 0 }; -char *shkrings[] = { +char *shkrings[] = { /* Hollandse familienamen */ "Feyfer", "Flugi", "Gheel", "Havic", "Haynin", "Hoboken", "Imbyze", "Juyn", "Kinsky", "Massis", "Matray", "Moy", @@ -73,7 +77,7 @@ char *shkrings[] = { 0 }; -char *shkfoods[] = { +char *shkfoods[] = { /* Indonesia */ "Djasinga", "Tjibarusa", "Tjiwidej", "Pengalengan", "Bandjar", "Parbalingga", "Bojolali", "Sarangan", @@ -85,7 +89,7 @@ char *shkfoods[] = { 0 }; -char *shkweapons[] = { +char *shkweapons[] = { /* Perigord */ "Voulgezac", "Rouffiac", "Lerignac", "Touverac", "Guizengeard", "Melac", "Neuvicq", "Vanzac", "Picq", "Urignac", "Corignac", @@ -96,7 +100,7 @@ char *shkweapons[] = { 0 }; -char *shkgeneral[] = { +char *shkgeneral[] = { /* Suriname */ "Hebiwerie", "Possogroenoe", "Asidonhopo", "Manlobbi", "Adjama", "Pakka Pakka", "Kabalebo", "Wonotobo", @@ -115,31 +119,55 @@ char *shkgeneral[] = { }; struct shk_nx { - char x; - char **xn; -} shk_nx[] = { - { POTION_SYM, shkliquors }, - { SCROLL_SYM, shkbooks }, - { ARMOR_SYM, shkarmors }, - { WAND_SYM, shkwands }, - { RING_SYM, shkrings }, - { FOOD_SYM, shkfoods }, - { WEAPON_SYM, shkweapons }, - { 0, shkgeneral } + char x; + char **xn; +} shk_nx[] = { + { + POTION_SYM, shkliquors + }, + { + SCROLL_SYM, shkbooks + }, + { + ARMOR_SYM, shkarmors + }, + { + WAND_SYM, shkwands + }, + { + RING_SYM, shkrings + }, + { + FOOD_SYM, shkfoods + }, + { + WEAPON_SYM, shkweapons + }, + { + 0, shkgeneral + } }; -findname(nampt, let) char *nampt; char let; { -register struct shk_nx *p = shk_nx; -register char **q; -register int i; - while(p->x && p->x != let) p++; +void +findname(nampt, let) + char *nampt; + char let; +{ + struct shk_nx *p = shk_nx; + char **q; + int i; + while (p->x && p->x != let) + p++; q = p->xn; - for(i=0; i<dlevel; i++) if(!q[i]){ - /* Not enough names, try general name */ - if(let) findname(nampt, 0); - else (void) strcpy(nampt, "Dirk"); - return; - } + for (i = 0; i < dlevel; i++) + if (!q[i]) { + /* Not enough names, try general name */ + if (let) + findname(nampt, 0); + else + (void) strcpy(nampt, "Dirk"); + return; + } (void) strncpy(nampt, q[i], PL_NSIZ); - nampt[PL_NSIZ-1] = 0; + nampt[PL_NSIZ - 1] = 0; } diff --git a/hack/hack.steal.c b/hack/hack.steal.c index 9fdae8f4..4c68a5f7 100644 --- a/hack/hack.steal.c +++ b/hack/hack.steal.c @@ -1,33 +1,44 @@ +/* $NetBSD: hack.steal.c,v 1.4 1997/10/19 16:59:04 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.steal.c,v 1.3 1995/03/23 08:31:34 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.steal.c,v 1.4 1997/10/19 16:59:04 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" +#include "extern.h" -long /* actually returns something that fits in an int */ -somegold(){ - return( (u.ugold < 100) ? u.ugold : - (u.ugold > 10000) ? rnd(10000) : rnd((int) u.ugold) ); +long /* actually returns something that fits in an + * int */ +somegold() +{ + return ((u.ugold < 100) ? u.ugold : + (u.ugold > 10000) ? rnd(10000) : rnd((int) u.ugold)); } -stealgold(mtmp) register struct monst *mtmp; { -register struct gold *gold = g_at(u.ux, u.uy); -register long tmp; - if(gold && ( !u.ugold || gold->amount > u.ugold || !rn2(5))) { +void +stealgold(mtmp) + struct monst *mtmp; +{ + struct gold *gold = g_at(u.ux, u.uy); + long tmp; + if (gold && (!u.ugold || gold->amount > u.ugold || !rn2(5))) { mtmp->mgold += gold->amount; freegold(gold); - if(Invisible) newsym(u.ux, u.uy); + if (Invisible) + newsym(u.ux, u.uy); pline("%s quickly snatches some gold from between your feet!", - Monnam(mtmp)); - if(!u.ugold || !rn2(5)) { + Monnam(mtmp)); + if (!u.ugold || !rn2(5)) { rloc(mtmp); mtmp->mflee = 1; } - } else if(u.ugold) { + } else if (u.ugold) { u.ugold -= (tmp = somegold()); pline("Your purse feels lighter."); mtmp->mgold += tmp; @@ -38,108 +49,112 @@ register long tmp; } /* steal armor after he finishes taking it off */ -unsigned stealoid; /* object to be stolen */ -unsigned stealmid; /* monster doing the stealing */ -stealarm(){ - register struct monst *mtmp; - register struct obj *otmp; +unsigned stealoid; /* object to be stolen */ +unsigned stealmid; /* monster doing the stealing */ +int +stealarm() +{ + struct monst *mtmp; + struct obj *otmp; - for(otmp = invent; otmp; otmp = otmp->nobj) - if(otmp->o_id == stealoid) { - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->m_id == stealmid) { - if(dist(mtmp->mx,mtmp->my) < 3) { - freeinv(otmp); - pline("%s steals %s!", Monnam(mtmp), doname(otmp)); - mpickobj(mtmp,otmp); - mtmp->mflee = 1; - rloc(mtmp); + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp->o_id == stealoid) { + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->m_id == stealmid) { + if (dist(mtmp->mx, mtmp->my) < 3) { + freeinv(otmp); + pline("%s steals %s!", Monnam(mtmp), doname(otmp)); + mpickobj(mtmp, otmp); + mtmp->mflee = 1; + rloc(mtmp); + } + break; + } + break; } - break; - } - break; - } stealoid = 0; + return 0; } /* returns 1 when something was stolen */ /* (or at least, when N should flee now) */ /* avoid stealing the object stealoid */ +int steal(mtmp) -struct monst *mtmp; + struct monst *mtmp; { - register struct obj *otmp; - register tmp; - register named = 0; + struct obj *otmp; + int tmp; + int named = 0; - if(!invent){ - if(Blind) - pline("Somebody tries to rob you, but finds nothing to steal."); - else - pline("%s tries to rob you, but she finds nothing to steal!", - Monnam(mtmp)); - return(1); /* let her flee */ + if (!invent) { + if (Blind) + pline("Somebody tries to rob you, but finds nothing to steal."); + else + pline("%s tries to rob you, but she finds nothing to steal!", + Monnam(mtmp)); + return (1); /* let her flee */ } tmp = 0; - for(otmp = invent; otmp; otmp = otmp->nobj) if(otmp != uarm2) - tmp += ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1); + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp != uarm2) + tmp += ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1); tmp = rn2(tmp); - for(otmp = invent; otmp; otmp = otmp->nobj) if(otmp != uarm2) - if((tmp -= ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1)) - < 0) break; - if(!otmp) { + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp != uarm2) + if ((tmp -= ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1)) + < 0) + break; + if (!otmp) { impossible("Steal fails!"); - return(0); + return (0); } - if(otmp->o_id == stealoid) - return(0); - if((otmp->owornmask & (W_ARMOR | W_RING))){ - switch(otmp->olet) { + if (otmp->o_id == stealoid) + return (0); + if ((otmp->owornmask & (W_ARMOR | W_RING))) { + switch (otmp->olet) { case RING_SYM: ringoff(otmp); break; case ARMOR_SYM: - if(multi < 0 || otmp == uarms){ - setworn((struct obj *) 0, otmp->owornmask & W_ARMOR); - break; + if (multi < 0 || otmp == uarms) { + setworn((struct obj *) 0, otmp->owornmask & W_ARMOR); + break; + } { + int curssv = otmp->cursed; + otmp->cursed = 0; + stop_occupation(); + pline("%s seduces you and %s off your %s.", + Amonnam(mtmp, Blind ? "gentle" : "beautiful"), + otmp->cursed ? "helps you to take" + : "you start taking", + (otmp == uarmg) ? "gloves" : + (otmp == uarmh) ? "helmet" : "armor"); + named++; + (void) armoroff(otmp); + otmp->cursed = curssv; + if (multi < 0) { + /* + multi = 0; + nomovemsg = 0; + afternmv = 0; + */ + stealoid = otmp->o_id; + stealmid = mtmp->m_id; + afternmv = stealarm; + return (0); + } + break; } - { int curssv = otmp->cursed; - otmp->cursed = 0; - stop_occupation(); - pline("%s seduces you and %s off your %s.", - Amonnam(mtmp, Blind ? "gentle" : "beautiful"), - otmp->cursed ? "helps you to take" - : "you start taking", - (otmp == uarmg) ? "gloves" : - (otmp == uarmh) ? "helmet" : "armor"); - named++; - (void) armoroff(otmp); - otmp->cursed = curssv; - if(multi < 0){ - extern char *nomovemsg; - extern int (*afternmv)(); - /* - multi = 0; - nomovemsg = 0; - afternmv = 0; - */ - stealoid = otmp->o_id; - stealmid = mtmp->m_id; - afternmv = stealarm; - return(0); - } - break; - } default: impossible("Tried to steal a strange worn thing."); } - } - else if(otmp == uwep) + } else if (otmp == uwep) setuwep((struct obj *) 0); - if(otmp->olet == CHAIN_SYM) { + if (otmp->olet == CHAIN_SYM) { impossible("How come you are carrying that chain?"); } - if(Punished && otmp == uball){ + if (Punished && otmp == uball) { Punished = 0; freeobj(uchain); free((char *) uchain); @@ -149,60 +164,64 @@ struct monst *mtmp; } freeinv(otmp); pline("%s stole %s.", named ? "She" : Monnam(mtmp), doname(otmp)); - mpickobj(mtmp,otmp); - return((multi < 0) ? 0 : 1); + mpickobj(mtmp, otmp); + return ((multi < 0) ? 0 : 1); } -mpickobj(mtmp,otmp) -register struct monst *mtmp; -register struct obj *otmp; +void +mpickobj(mtmp, otmp) + struct monst *mtmp; + struct obj *otmp; { otmp->nobj = mtmp->minvent; mtmp->minvent = otmp; } +int stealamulet(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - register struct obj *otmp; + struct obj *otmp; - for(otmp = invent; otmp; otmp = otmp->nobj) { - if(otmp->olet == AMULET_SYM) { - /* might be an imitation one */ - if(otmp == uwep) setuwep((struct obj *) 0); - freeinv(otmp); - mpickobj(mtmp,otmp); - pline("%s stole %s!", Monnam(mtmp), doname(otmp)); - return(1); - } + for (otmp = invent; otmp; otmp = otmp->nobj) { + if (otmp->olet == AMULET_SYM) { + /* might be an imitation one */ + if (otmp == uwep) + setuwep((struct obj *) 0); + freeinv(otmp); + mpickobj(mtmp, otmp); + pline("%s stole %s!", Monnam(mtmp), doname(otmp)); + return (1); + } } - return(0); + return (0); } /* release the objects the killed animal has stolen */ -relobj(mtmp,show) -register struct monst *mtmp; -register show; +void +relobj(mtmp, show) + struct monst *mtmp; + int show; { - register struct obj *otmp, *otmp2; + struct obj *otmp, *otmp2; - for(otmp = mtmp->minvent; otmp; otmp = otmp2){ + for (otmp = mtmp->minvent; otmp; otmp = otmp2) { otmp->ox = mtmp->mx; otmp->oy = mtmp->my; otmp2 = otmp->nobj; otmp->nobj = fobj; fobj = otmp; stackobj(fobj); - if(show & cansee(mtmp->mx,mtmp->my)) - atl(otmp->ox,otmp->oy,otmp->olet); + if (show & cansee(mtmp->mx, mtmp->my)) + atl(otmp->ox, otmp->oy, otmp->olet); } mtmp->minvent = (struct obj *) 0; - if(mtmp->mgold || mtmp->data->mlet == 'L') { - register long tmp; + if (mtmp->mgold || mtmp->data->mlet == 'L') { + long tmp; tmp = (mtmp->mgold > 10000) ? 10000 : mtmp->mgold; - mkgold((long)(tmp + d(dlevel,30)), mtmp->mx, mtmp->my); - if(show & cansee(mtmp->mx,mtmp->my)) - atl(mtmp->mx,mtmp->my,'$'); + mkgold((long) (tmp + d(dlevel, 30)), mtmp->mx, mtmp->my); + if (show & cansee(mtmp->mx, mtmp->my)) + atl(mtmp->mx, mtmp->my, '$'); } } diff --git a/hack/hack.termcap.c b/hack/hack.termcap.c index f1314a0e..79de41b2 100644 --- a/hack/hack.termcap.c +++ b/hack/hack.termcap.c @@ -1,50 +1,50 @@ +/* $NetBSD: hack.termcap.c,v 1.7 1997/10/19 16:59:06 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.termcap.c,v 1.6 1995/04/29 01:20:00 mycroft Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.termcap.c,v 1.7 1997/10/19 16:59:06 christos Exp $"); +#endif /* not lint */ -#include <stdio.h> #include <string.h> #include <termios.h> -#include "config.h" /* for ROWNO and COLNO */ -#include "def.flag.h" /* for flags.nonull */ -extern char *tgetstr(), *tgoto(), *getenv(); -extern long *alloc(); +#include <termcap.h> +#include <stdlib.h> +#include "hack.h" +#include "extern.h" +#include "def.flag.h" /* for flags.nonull */ -#ifndef lint -extern /* it is defined in libtermlib (libtermcap) */ -#endif lint - speed_t ospeed; /* terminal baudrate; used by tputs */ -static char tbuf[512]; -static char *HO, *CL, *CE, *UP, *CM, *ND, *XD, *BC, *SO, *SE, *TI, *TE; -static char *VS, *VE; -static int SG; -static char PC = '\0'; -char *CD; /* tested in pri.c: docorner() */ -int CO, LI; /* used in pri.c and whatis.c */ +static char tbuf[512]; +static char *HO, *CL, *CE, *UP, *CM, *ND, *XD, *BC, *SO, *SE, *TI, *TE; +static char *VS, *VE; +static int SG; +static char PC = '\0'; +char *CD; /* tested in pri.c: docorner() */ +int CO, LI; /* used in pri.c and whatis.c */ +void startup() { - register char *term; - register char *tptr; - char *tbufptr, *pc; + char *term; + char *tptr; + char *tbufptr, *pc; tptr = (char *) alloc(1024); tbufptr = tbuf; - if(!(term = getenv("TERM"))) + if (!(term = getenv("TERM"))) error("Can't get TERM."); - if(!strncmp(term, "5620", 4)) + if (!strncmp(term, "5620", 4)) flags.nonull = 1; /* this should be a termcap flag */ - if(tgetent(tptr, term) < 1) + if (tgetent(tptr, term) < 1) error("Unknown terminal type: %s.", term); - if(pc = tgetstr("pc", &tbufptr)) + if ((pc = tgetstr("pc", &tbufptr)) != NULL) PC = *pc; - if(!(BC = tgetstr("bc", &tbufptr))) { - if(!tgetflag("bs")) + if (!(BC = tgetstr("bc", &tbufptr))) { + if (!tgetflag("bs")) error("Terminal must backspace."); BC = tbufptr; tbufptr += 2; @@ -53,23 +53,25 @@ startup() HO = tgetstr("ho", &tbufptr); CO = tgetnum("co"); LI = tgetnum("li"); - if(CO < COLNO || LI < ROWNO+2) + if (CO < COLNO || LI < ROWNO + 2) setclipped(); - if(!(CL = tgetstr("cl", &tbufptr))) + if (!(CL = tgetstr("cl", &tbufptr))) error("Hack needs CL."); ND = tgetstr("nd", &tbufptr); - if(tgetflag("os")) + if (tgetflag("os")) error("Hack can't have OS."); CE = tgetstr("ce", &tbufptr); UP = tgetstr("up", &tbufptr); - /* It seems that xd is no longer supported, and we should use - a linefeed instead; unfortunately this requires resetting - CRMOD, and many output routines will have to be modified - slightly. Let's leave that till the next release. */ + /* + * It seems that xd is no longer supported, and we should use a + * linefeed instead; unfortunately this requires resetting CRMOD, and + * many output routines will have to be modified slightly. Let's + * leave that till the next release. + */ XD = tgetstr("xd", &tbufptr); -/* not: XD = tgetstr("do", &tbufptr); */ - if(!(CM = tgetstr("cm", &tbufptr))) { - if(!UP && !HO) + /* not: XD = tgetstr("do", &tbufptr); */ + if (!(CM = tgetstr("cm", &tbufptr))) { + if (!UP && !HO) error("Hack needs CM or UP or HO."); printf("Playing hack on terminals without cm is suspect...\n"); getret(); @@ -77,19 +79,23 @@ startup() SO = tgetstr("so", &tbufptr); SE = tgetstr("se", &tbufptr); SG = tgetnum("sg"); /* -1: not fnd; else # of spaces left by so */ - if(!SO || !SE || (SG > 0)) SO = SE = 0; + if (!SO || !SE || (SG > 0)) + SO = SE = 0; CD = tgetstr("cd", &tbufptr); - set_whole_screen(); /* uses LI and CD */ - if(tbufptr-tbuf > sizeof(tbuf)) error("TERMCAP entry too big...\n"); + set_whole_screen(); /* uses LI and CD */ + if (tbufptr - tbuf > sizeof(tbuf)) + error("TERMCAP entry too big...\n"); free(tptr); } +void start_screen() { xputs(TI); xputs(VS); } +void end_screen() { xputs(VE); @@ -97,55 +103,56 @@ end_screen() } /* Cursor movements */ -extern xchar curx, cury; - +void curs(x, y) -register int x, y; /* not xchar: perhaps xchar is unsigned and - curx-x would be unsigned as well */ + int x, y; /* not xchar: perhaps xchar is unsigned and + * curx-x would be unsigned as well */ { if (y == cury && x == curx) return; - if(!ND && (curx != x || x <= 3)) { /* Extremely primitive */ - cmov(x, y); /* bunker!wtm */ + if (!ND && (curx != x || x <= 3)) { /* Extremely primitive */ + cmov(x, y); /* bunker!wtm */ return; } - if(abs(cury-y) <= 3 && abs(curx-x) <= 3) + if (abs(cury - y) <= 3 && abs(curx - x) <= 3) nocmov(x, y); - else if((x <= 3 && abs(cury-y)<= 3) || (!CM && x<abs(curx-x))) { + else if ((x <= 3 && abs(cury - y) <= 3) || (!CM && x < abs(curx - x))) { (void) putchar('\r'); curx = 1; nocmov(x, y); - } else if(!CM) { + } else if (!CM) { nocmov(x, y); } else cmov(x, y); } +void nocmov(x, y) + int x, y; { if (cury > y) { - if(UP) { + if (UP) { while (cury > y) { /* Go up. */ xputs(UP); cury--; } - } else if(CM) { + } else if (CM) { cmov(x, y); - } else if(HO) { + } else if (HO) { home(); curs(x, y); - } /* else impossible("..."); */ + } /* else impossible("..."); */ } else if (cury < y) { - if(XD) { - while(cury < y) { + if (XD) { + while (cury < y) { xputs(XD); cury++; } - } else if(CM) { + } else if (CM) { cmov(x, y); } else { - while(cury < y) { + while (cury < y) { xputc('\n'); curx = 1; cury++; @@ -153,12 +160,14 @@ nocmov(x, y) } } if (curx < x) { /* Go to the right. */ - if(!ND) cmov(x, y); else /* bah */ + if (!ND) + cmov(x, y); + else /* bah */ /* should instead print what is there already */ - while (curx < x) { - xputs(ND); - curx++; - } + while (curx < x) { + xputs(ND); + curx++; + } } else if (curx > x) { while (curx > x) { /* Go to the left. */ xputs(BC); @@ -167,31 +176,42 @@ nocmov(x, y) } } +void cmov(x, y) -register x, y; + int x, y; { - xputs(tgoto(CM, x-1, y-1)); + xputs(tgoto(CM, x - 1, y - 1)); cury = y; curx = x; } -xputc(c) char c; { +void +xputc(c) + char c; +{ (void) fputc(c, stdout); } -xputs(s) char *s; { +void +xputs(s) + char *s; +{ tputs(s, 1, xputc); } -cl_end() { - if(CE) +void +cl_end() +{ + if (CE) xputs(CE); - else { /* no-CE fix - free after Harold Rynes */ - /* this looks terrible, especially on a slow terminal - but is better than nothing */ - register cx = curx, cy = cury; + else { /* no-CE fix - free after Harold Rynes */ + /* + * this looks terrible, especially on a slow terminal but is + * better than nothing + */ + int cx = curx, cy = cury; - while(curx < COLNO) { + while (curx < COLNO) { xputc(' '); curx++; } @@ -199,74 +219,94 @@ cl_end() { } } -clear_screen() { +void +clear_screen() +{ xputs(CL); curx = cury = 1; } +void home() { - if(HO) + if (HO) xputs(HO); - else if(CM) + else if (CM) xputs(tgoto(CM, 0, 0)); else curs(1, 1); /* using UP ... */ curx = cury = 1; } +void standoutbeg() { - if(SO) xputs(SO); + if (SO) + xputs(SO); } +void standoutend() { - if(SE) xputs(SE); + if (SE) + xputs(SE); } +void backsp() { xputs(BC); curx--; } +void bell() { - (void) putchar('\007'); /* curx does not change */ + (void) putchar('\007'); /* curx does not change */ (void) fflush(stdout); } -delay_output() { +void +delay_output() +{ + extern speed_t ospeed; /* delay 50 ms - could also use a 'nap'-system call */ - /* BUG: if the padding character is visible, as it is on the 5620 - then this looks terrible. */ - if(!flags.nonull) + /* + * BUG: if the padding character is visible, as it is on the 5620 + * then this looks terrible. + */ + if (!flags.nonull) tputs("50", 1, xputc); - /* cbosgd!cbcephus!pds for SYS V R2 */ - /* is this terminfo, or what? */ - /* tputs("$<50>", 1, xputc); */ + /* cbosgd!cbcephus!pds for SYS V R2 */ + /* is this terminfo, or what? */ + /* tputs("$<50>", 1, xputc); */ - else if(ospeed > 0) if(CM) { - /* delay by sending cm(here) an appropriate number of times */ - register int cmlen = strlen(tgoto(CM, curx-1, cury-1)); - register int i = (ospeed + (100 * cmlen)) / (200 * cmlen); + else if (ospeed > 0) + if (CM) { + /* + * delay by sending cm(here) an appropriate number of + * times + */ + int cmlen = strlen(tgoto(CM, curx - 1, cury - 1)); + int i = (ospeed + (100 * cmlen)) / (200 * cmlen); - while(i > 0) { - cmov(curx, cury); + while (i > 0) { + cmov(curx, cury); + } } - } } -cl_eos() /* free after Robert Viduya */ -{ /* must only be called with curx = 1 */ +void +cl_eos() +{ /* free after Robert Viduya *//* must only be + * called with curx = 1 */ - if(CD) + if (CD) xputs(CD); else { - register int cx = curx, cy = cury; - while(cury <= LI-2) { + int cx = curx, cy = cury; + while (cury <= LI - 2) { cl_end(); xputc('\n'); curx = 1; diff --git a/hack/hack.timeout.c b/hack/hack.timeout.c index fa431368..c84312e7 100644 --- a/hack/hack.timeout.c +++ b/hack/hack.timeout.c @@ -1,67 +1,77 @@ +/* $NetBSD: hack.timeout.c,v 1.4 1997/10/19 16:59:08 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.timeout.c,v 1.3 1995/03/23 08:31:37 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.timeout.c,v 1.4 1997/10/19 16:59:08 christos Exp $"); +#endif /* not lint */ -#include "hack.h" +#include "hack.h" +#include "extern.h" -timeout(){ -register struct prop *upp; - if(Stoned) stoned_dialogue(); - for(upp = u.uprops; upp < u.uprops+SIZE(u.uprops); upp++) - if((upp->p_flgs & TIMEOUT) && !--upp->p_flgs) { - if(upp->p_tofn) (*upp->p_tofn)(); - else switch(upp - u.uprops){ - case STONED: - killer = "cockatrice"; - done("died"); - break; - case SICK: - pline("You die because of food poisoning."); - killer = u.usick_cause; - done("died"); - break; - case FAST: - pline("You feel yourself slowing down."); - break; - case CONFUSION: - pline("You feel less confused now."); - break; - case BLIND: - pline("You can see again."); - setsee(); - break; - case INVIS: - on_scr(u.ux,u.uy); - pline("You are no longer invisible."); - break; - case WOUNDED_LEGS: - heal_legs(); - break; +void +timeout() +{ + struct prop *upp; + if (Stoned) + stoned_dialogue(); + for (upp = u.uprops; upp < u.uprops + SIZE(u.uprops); upp++) + if ((upp->p_flgs & TIMEOUT) && !--upp->p_flgs) { + if (upp->p_tofn) + (*upp->p_tofn) (); + else + switch (upp - u.uprops) { + case STONED: + killer = "cockatrice"; + done("died"); + break; + case SICK: + pline("You die because of food poisoning."); + killer = u.usick_cause; + done("died"); + break; + case FAST: + pline("You feel yourself slowing down."); + break; + case CONFUSION: + pline("You feel less confused now."); + break; + case BLIND: + pline("You can see again."); + setsee(); + break; + case INVIS: + on_scr(u.ux, u.uy); + pline("You are no longer invisible."); + break; + case WOUNDED_LEGS: + heal_legs(); + break; + } } - } } /* He is being petrified - dialogue by inmet!tower */ -char *stoned_texts[] = { - "You are slowing down.", /* 5 */ - "Your limbs are stiffening.", /* 4 */ +char *stoned_texts[] = { + "You are slowing down.",/* 5 */ + "Your limbs are stiffening.", /* 4 */ "Your limbs have turned to stone.", /* 3 */ - "You have turned to stone.", /* 2 */ - "You are a statue." /* 1 */ + "You have turned to stone.", /* 2 */ + "You are a statue." /* 1 */ }; +void stoned_dialogue() { - register long i = (Stoned & TIMEOUT); + long i = (Stoned & TIMEOUT); - if(i > 0 && i <= SIZE(stoned_texts)) + if (i > 0 && i <= SIZE(stoned_texts)) pline(stoned_texts[SIZE(stoned_texts) - i]); - if(i == 5) + if (i == 5) Fast = 0; - if(i == 3) + if (i == 3) nomul(-3); } diff --git a/hack/hack.topl.c b/hack/hack.topl.c index bd671bc5..692e5154 100644 --- a/hack/hack.topl.c +++ b/hack/hack.topl.c @@ -1,144 +1,192 @@ +/* $NetBSD: hack.topl.c,v 1.4 1997/10/19 16:59:10 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.topl.c,v 1.3 1995/03/23 08:31:40 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.topl.c,v 1.4 1997/10/19 16:59:10 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" -#include <stdio.h> -extern char *eos(); -extern int CO; +#include "extern.h" -char toplines[BUFSZ]; -xchar tlx, tly; /* set by pline; used by addtopl */ +char toplines[BUFSZ]; +xchar tlx, tly; /* set by pline; used by addtopl */ struct topl { - struct topl *next_topl; - char *topl_text; -} *old_toplines, *last_redone_topl; + struct topl *next_topl; + char *topl_text; +} *old_toplines, *last_redone_topl; #define OTLMAX 20 /* max nr of old toplines remembered */ -doredotopl(){ - if(last_redone_topl) +int +doredotopl() +{ + if (last_redone_topl) last_redone_topl = last_redone_topl->next_topl; - if(!last_redone_topl) + if (!last_redone_topl) last_redone_topl = old_toplines; - if(last_redone_topl){ + if (last_redone_topl) { (void) strcpy(toplines, last_redone_topl->topl_text); } redotoplin(); - return(0); + return (0); } -redotoplin() { +void +redotoplin() +{ home(); - if(index(toplines, '\n')) cl_end(); + if (strchr(toplines, '\n')) + cl_end(); putstr(toplines); cl_end(); tlx = curx; tly = cury; flags.toplin = 1; - if(tly > 1) + if (tly > 1) more(); } -remember_topl() { -register struct topl *tl; -register int cnt = OTLMAX; - if(last_redone_topl && - !strcmp(toplines, last_redone_topl->topl_text)) return; - if(old_toplines && - !strcmp(toplines, old_toplines->topl_text)) return; +void +remember_topl() +{ + struct topl *tl; + int cnt = OTLMAX; + if (last_redone_topl && + !strcmp(toplines, last_redone_topl->topl_text)) + return; + if (old_toplines && + !strcmp(toplines, old_toplines->topl_text)) + return; last_redone_topl = 0; tl = (struct topl *) - alloc((unsigned)(strlen(toplines) + sizeof(struct topl) + 1)); + alloc((unsigned) (strlen(toplines) + sizeof(struct topl) + 1)); tl->next_topl = old_toplines; - tl->topl_text = (char *)(tl + 1); + tl->topl_text = (char *) (tl + 1); (void) strcpy(tl->topl_text, toplines); old_toplines = tl; - while(cnt && tl){ + while (cnt && tl) { cnt--; tl = tl->next_topl; } - if(tl && tl->next_topl){ + if (tl && tl->next_topl) { free((char *) tl->next_topl); tl->next_topl = 0; } } -addtopl(s) char *s; { - curs(tlx,tly); - if(tlx + strlen(s) > CO) putsym('\n'); +void +addtopl(s) + char *s; +{ + curs(tlx, tly); + if (tlx + strlen(s) > CO) + putsym('\n'); putstr(s); tlx = curx; tly = cury; flags.toplin = 1; } +void xmore(s) -char *s; /* allowed chars besides space/return */ + char *s; /* allowed chars besides space/return */ { - if(flags.toplin) { + if (flags.toplin) { curs(tlx, tly); - if(tlx + 8 > CO) putsym('\n'), tly++; + if (tlx + 8 > CO) + putsym('\n'), tly++; } - - if(flags.standout) + if (flags.standout) standoutbeg(); putstr("--More--"); - if(flags.standout) + if (flags.standout) standoutend(); xwaitforspace(s); - if(flags.toplin && tly > 1) { + if (flags.toplin && tly > 1) { home(); cl_end(); - docorner(1, tly-1); + docorner(1, tly - 1); } flags.toplin = 0; } -more(){ +void +more() +{ xmore(""); } +void cmore(s) -register char *s; + char *s; { xmore(s); } -clrlin(){ - if(flags.toplin) { +void +clrlin() +{ + if (flags.toplin) { home(); cl_end(); - if(tly > 1) docorner(1, tly-1); + if (tly > 1) + docorner(1, tly - 1); remember_topl(); } flags.toplin = 0; } -/*VARARGS1*/ -pline(line,arg1,arg2,arg3,arg4,arg5,arg6) -register char *line,*arg1,*arg2,*arg3,*arg4,*arg5,*arg6; +void +#ifdef __STDC__ +pline(const char *fmt, ...) +#else +pline(va_alist) + va_dcl +#endif { - char pbuf[BUFSZ]; - register char *bp = pbuf, *tl; - register int n,n0; + va_list ap; +#ifndef __STDC__ + const char *fmt; + va_start(ap); + fmt = va_arg(ap, const char *); +#else + va_start(ap, fmt); +#endif + vpline(fmt, ap); + va_end(ap); +} - if(!line || !*line) return; - if(!index(line, '%')) (void) strcpy(pbuf,line); else - (void) sprintf(pbuf,line,arg1,arg2,arg3,arg4,arg5,arg6); - if(flags.toplin == 1 && !strcmp(pbuf, toplines)) return; - nscr(); /* %% */ +void +vpline(line, ap) + const char *line; + va_list ap; +{ + char pbuf[BUFSZ]; + char *bp = pbuf, *tl; + int n, n0; + + if (!line || !*line) + return; + if (!strchr(line, '%')) + (void) strcpy(pbuf, line); + else + (void) vsprintf(pbuf, line, ap); + if (flags.toplin == 1 && !strcmp(pbuf, toplines)) + return; + nscr(); /* %% */ /* If there is room on the line, print message on same line */ /* But messages like "You die..." deserve their own line */ n0 = strlen(bp); - if(flags.toplin == 1 && tly == 1 && - n0 + strlen(toplines) + 3 < CO-8 && /* leave room for --More-- */ + if (flags.toplin == 1 && tly == 1 && + n0 + strlen(toplines) + 3 < CO - 8 && /* leave room for + * --More-- */ strncmp(bp, "You ", 4)) { (void) strcat(toplines, " "); (void) strcat(toplines, bp); @@ -146,45 +194,55 @@ register char *line,*arg1,*arg2,*arg3,*arg4,*arg5,*arg6; addtopl(bp); return; } - if(flags.toplin == 1) more(); + if (flags.toplin == 1) + more(); remember_topl(); toplines[0] = 0; - while(n0){ - if(n0 >= CO){ + while (n0) { + if (n0 >= CO) { /* look for appropriate cut point */ n0 = 0; - for(n = 0; n < CO; n++) if(bp[n] == ' ') - n0 = n; - if(!n0) for(n = 0; n < CO-1; n++) - if(!letter(bp[n])) n0 = n; - if(!n0) n0 = CO-2; + for (n = 0; n < CO; n++) + if (bp[n] == ' ') + n0 = n; + if (!n0) + for (n = 0; n < CO - 1; n++) + if (!letter(bp[n])) + n0 = n; + if (!n0) + n0 = CO - 2; } (void) strncpy((tl = eos(toplines)), bp, n0); tl[n0] = 0; bp += n0; /* remove trailing spaces, but leave one */ - while(n0 > 1 && tl[n0-1] == ' ' && tl[n0-2] == ' ') + while (n0 > 1 && tl[n0 - 1] == ' ' && tl[n0 - 2] == ' ') tl[--n0] = 0; n0 = strlen(bp); - if(n0 && tl[0]) (void) strcat(tl, "\n"); + if (n0 && tl[0]) + (void) strcat(tl, "\n"); } redotoplin(); } -putsym(c) char c; { - switch(c) { +void +putsym(c) + char c; +{ + switch (c) { case '\b': backsp(); return; case '\n': curx = 1; cury++; - if(cury > tly) tly = cury; + if (cury > tly) + tly = cury; break; default: - if(curx == CO) + if (curx == CO) putsym('\n'); /* 1 <= curx <= CO; avoid CO */ else curx++; @@ -192,6 +250,10 @@ putsym(c) char c; { (void) putchar(c); } -putstr(s) register char *s; { - while(*s) putsym(*s++); +void +putstr(s) + char *s; +{ + while (*s) + putsym(*s++); } diff --git a/hack/hack.track.c b/hack/hack.track.c index 1225d06c..f6abe297 100644 --- a/hack/hack.track.c +++ b/hack/hack.track.c @@ -1,43 +1,56 @@ +/* $NetBSD: hack.track.c,v 1.4 1997/10/19 16:59:11 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.track.c,v 1.3 1995/03/23 08:31:42 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.track.c,v 1.4 1997/10/19 16:59:11 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" #define UTSZ 50 -coord utrack[UTSZ]; -int utcnt = 0; -int utpnt = 0; +coord utrack[UTSZ]; +int utcnt = 0; +int utpnt = 0; -initrack(){ +void +initrack() +{ utcnt = utpnt = 0; } /* add to track */ -settrack(){ - if(utcnt < UTSZ) utcnt++; - if(utpnt == UTSZ) utpnt = 0; +void +settrack() +{ + if (utcnt < UTSZ) + utcnt++; + if (utpnt == UTSZ) + utpnt = 0; utrack[utpnt].x = u.ux; utrack[utpnt].y = u.uy; utpnt++; } -coord * -gettrack(x,y) register x,y; { -register int i,cnt,dist; -coord tc; +coord * +gettrack(x, y) + int x, y; +{ + int i, cnt, dist; + coord tc; cnt = utcnt; - for(i = utpnt-1; cnt--; i--){ - if(i == -1) i = UTSZ-1; + for (i = utpnt - 1; cnt--; i--) { + if (i == -1) + i = UTSZ - 1; tc = utrack[i]; - dist = (x-tc.x)*(x-tc.x) + (y-tc.y)*(y-tc.y); - if(dist < 3) - return(dist ? &(utrack[i]) : 0); + dist = (x - tc.x) * (x - tc.x) + (y - tc.y) * (y - tc.y); + if (dist < 3) + return (dist ? &(utrack[i]) : 0); } - return(0); + return (0); } diff --git a/hack/hack.trap.c b/hack/hack.trap.c index dbcb1214..594e8c2a 100644 --- a/hack/hack.trap.c +++ b/hack/hack.trap.c @@ -1,18 +1,22 @@ +/* $NetBSD: hack.trap.c,v 1.4 1997/10/19 16:59:16 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.trap.c,v 1.3 1995/03/23 08:31:44 cgd Exp $"; -#endif /* not lint */ - -#include "hack.h" +__RCSID("$NetBSD: hack.trap.c,v 1.4 1997/10/19 16:59:16 christos Exp $"); +#endif /* not lint */ -extern struct monst *makemon(); +#include <stdlib.h> +#include "hack.h" +#include "extern.h" +#include "def.mkroom.h" -char vowels[] = "aeiou"; +char vowels[] = "aeiou"; -char *traps[] = { +char *traps[] = { " bear trap", "n arrow trap", " dart trap", @@ -24,11 +28,11 @@ char *traps[] = { " mimic" }; -struct trap * -maketrap(x,y,typ) -register x,y,typ; +struct trap * +maketrap(x, y, typ) + int x, y, typ; { - register struct trap *ttmp; + struct trap *ttmp; ttmp = newtrap(); ttmp->ttyp = typ; @@ -38,24 +42,27 @@ register x,y,typ; ttmp->ty = y; ttmp->ntrap = ftrap; ftrap = ttmp; - return(ttmp); + return (ttmp); } -dotrap(trap) register struct trap *trap; { - register int ttype = trap->ttyp; +void +dotrap(trap) + struct trap *trap; +{ + int ttype = trap->ttyp; nomul(0); - if(trap->tseen && !rn2(5) && ttype != PIT) + if (trap->tseen && !rn2(5) && ttype != PIT) pline("You escape a%s.", traps[ttype]); else { trap->tseen = 1; - switch(ttype) { + switch (ttype) { case SLP_GAS_TRAP: pline("A cloud of gas puts you to sleep!"); nomul(-rnd(25)); break; case BEAR_TRAP: - if(Levitation) { + if (Levitation) { pline("You float over a bear trap."); break; } @@ -65,73 +72,74 @@ dotrap(trap) register struct trap *trap; { break; case PIERC: deltrap(trap); - if(makemon(PM_PIERCER,u.ux,u.uy)) { - pline("A piercer suddenly drops from the ceiling!"); - if(uarmh) - pline("Its blow glances off your helmet."); - else - (void) thitu(3,d(4,6),"falling piercer"); + if (makemon(PM_PIERCER, u.ux, u.uy)) { + pline("A piercer suddenly drops from the ceiling!"); + if (uarmh) + pline("Its blow glances off your helmet."); + else + (void) thitu(3, d(4, 6), "falling piercer"); } break; case ARROW_TRAP: pline("An arrow shoots out at you!"); - if(!thitu(8,rnd(6),"arrow")){ + if (!thitu(8, rnd(6), "arrow")) { mksobj_at(ARROW, u.ux, u.uy); fobj->quan = 1; } break; case TRAPDOOR: - if(!xdnstair) { -pline("A trap door in the ceiling opens and a rock falls on your head!"); -if(uarmh) pline("Fortunately, you are wearing a helmet!"); - losehp(uarmh ? 2 : d(2,10),"falling rock"); - mksobj_at(ROCK, u.ux, u.uy); - fobj->quan = 1; - stackobj(fobj); - if(Invisible) newsym(u.ux, u.uy); + if (!xdnstair) { + pline("A trap door in the ceiling opens and a rock falls on your head!"); + if (uarmh) + pline("Fortunately, you are wearing a helmet!"); + losehp(uarmh ? 2 : d(2, 10), "falling rock"); + mksobj_at(ROCK, u.ux, u.uy); + fobj->quan = 1; + stackobj(fobj); + if (Invisible) + newsym(u.ux, u.uy); } else { - register int newlevel = dlevel + 1; - while(!rn2(4) && newlevel < 29) + int newlevel = dlevel + 1; + while (!rn2(4) && newlevel < 29) newlevel++; pline("A trap door opens up under you!"); - if(Levitation || u.ustuck) { - pline("For some reason you don't fall in."); + if (Levitation || u.ustuck) { + pline("For some reason you don't fall in."); break; } - goto_level(newlevel, FALSE); } break; case DART_TRAP: pline("A little dart shoots out at you!"); - if(thitu(7,rnd(3),"little dart")) { - if(!rn2(6)) - poisoned("dart","poison dart"); + if (thitu(7, rnd(3), "little dart")) { + if (!rn2(6)) + poisoned("dart", "poison dart"); } else { mksobj_at(DART, u.ux, u.uy); fobj->quan = 1; } break; case TELEP_TRAP: - if(trap->once) { + if (trap->once) { deltrap(trap); - newsym(u.ux,u.uy); + newsym(u.ux, u.uy); vtele(); } else { - newsym(u.ux,u.uy); + newsym(u.ux, u.uy); tele(); } break; case PIT: - if(Levitation) { + if (Levitation) { pline("A pit opens up under you!"); pline("You don't fall in!"); break; } pline("You fall into a pit!"); - u.utrap = rn1(6,2); + u.utrap = rn1(6, 2); u.utraptype = TT_PIT; - losehp(rnd(6),"fall into a pit"); + losehp(rnd(6), "fall into a pit"); selftouch("Falling, you"); break; default: @@ -140,98 +148,104 @@ if(uarmh) pline("Fortunately, you are wearing a helmet!"); } } -mintrap(mtmp) register struct monst *mtmp; { - register struct trap *trap = t_at(mtmp->mx, mtmp->my); - register int wasintrap = mtmp->mtrapped; +int +mintrap(mtmp) + struct monst *mtmp; +{ + struct trap *trap = t_at(mtmp->mx, mtmp->my); + int wasintrap = mtmp->mtrapped; - if(!trap) { + if (!trap) { mtmp->mtrapped = 0; /* perhaps teleported? */ - } else if(wasintrap) { - if(!rn2(40)) mtmp->mtrapped = 0; + } else if (wasintrap) { + if (!rn2(40)) + mtmp->mtrapped = 0; } else { - register int tt = trap->ttyp; - int in_sight = cansee(mtmp->mx,mtmp->my); - extern char mlarge[]; + int tt = trap->ttyp; + int in_sight = cansee(mtmp->mx, mtmp->my); - if(mtmp->mtrapseen & (1 << tt)) { - /* he has been in such a trap - perhaps he escapes */ - if(rn2(4)) return(0); - } - mtmp->mtrapseen |= (1 << tt); - switch (tt) { + if (mtmp->mtrapseen & (1 << tt)) { + /* he has been in such a trap - perhaps he escapes */ + if (rn2(4)) + return (0); + } + mtmp->mtrapseen |= (1 << tt); + switch (tt) { case BEAR_TRAP: - if(index(mlarge, mtmp->data->mlet)) { - if(in_sight) - pline("%s is caught in a bear trap!", - Monnam(mtmp)); - else - if(mtmp->data->mlet == 'o') - pline("You hear the roaring of an angry bear!"); + if (strchr(mlarge, mtmp->data->mlet)) { + if (in_sight) + pline("%s is caught in a bear trap!", + Monnam(mtmp)); + else if (mtmp->data->mlet == 'o') + pline("You hear the roaring of an angry bear!"); mtmp->mtrapped = 1; } break; case PIT: /* there should be a mtmp/data -> floating */ - if(!index("EywBfk'& ", mtmp->data->mlet)) { /* ab */ + if (!strchr("EywBfk'& ", mtmp->data->mlet)) { /* ab */ mtmp->mtrapped = 1; - if(in_sight) - pline("%s falls in a pit!", Monnam(mtmp)); + if (in_sight) + pline("%s falls in a pit!", Monnam(mtmp)); } break; case SLP_GAS_TRAP: - if(!mtmp->msleep && !mtmp->mfroz) { + if (!mtmp->msleep && !mtmp->mfroz) { mtmp->msleep = 1; - if(in_sight) - pline("%s suddenly falls asleep!", - Monnam(mtmp)); + if (in_sight) + pline("%s suddenly falls asleep!", + Monnam(mtmp)); } break; case TELEP_TRAP: rloc(mtmp); - if(in_sight && !cansee(mtmp->mx,mtmp->my)) + if (in_sight && !cansee(mtmp->mx, mtmp->my)) pline("%s suddenly disappears!", - Monnam(mtmp)); + Monnam(mtmp)); break; case ARROW_TRAP: - if(in_sight) { + if (in_sight) { pline("%s is hit by an arrow!", - Monnam(mtmp)); + Monnam(mtmp)); } mtmp->mhp -= 3; break; case DART_TRAP: - if(in_sight) { + if (in_sight) { pline("%s is hit by a dart!", - Monnam(mtmp)); + Monnam(mtmp)); } mtmp->mhp -= 2; /* not mondied here !! */ break; case TRAPDOOR: - if(!xdnstair) { + if (!xdnstair) { mtmp->mhp -= 10; - if(in_sight) -pline("A trap door in the ceiling opens and a rock hits %s!", monnam(mtmp)); + if (in_sight) + pline("A trap door in the ceiling opens and a rock hits %s!", monnam(mtmp)); break; } - if(mtmp->data->mlet != 'w'){ + if (mtmp->data->mlet != 'w') { fall_down(mtmp); - if(in_sight) - pline("Suddenly, %s disappears out of sight.", monnam(mtmp)); - return(2); /* no longer on this level */ + if (in_sight) + pline("Suddenly, %s disappears out of sight.", monnam(mtmp)); + return (2); /* no longer on this level */ } break; case PIERC: break; default: impossible("Some monster encountered a strange trap."); - } + } } - return(mtmp->mtrapped); + return (mtmp->mtrapped); } -selftouch(arg) char *arg; { - if(uwep && uwep->otyp == DEAD_COCKATRICE){ +void +selftouch(arg) + char *arg; +{ + if (uwep && uwep->otyp == DEAD_COCKATRICE) { pline("%s touch the dead cockatrice.", arg); pline("You turn to stone."); killer = objects[uwep->otyp].oc_name; @@ -239,9 +253,11 @@ selftouch(arg) char *arg; { } } -float_up(){ - if(u.utrap) { - if(u.utraptype == TT_PIT) { +void +float_up() +{ + if (u.utrap) { + if (u.utraptype == TT_PIT) { u.utrap = 0; pline("You float up, out of the pit!"); } else { @@ -251,132 +267,151 @@ float_up(){ pline("You start to float in the air!"); } -float_down(){ - register struct trap *trap; +void +float_down() +{ + struct trap *trap; pline("You float gently to the ground."); - if(trap = t_at(u.ux,u.uy)) - switch(trap->ttyp) { + if ((trap = t_at(u.ux, u.uy)) != NULL) + switch (trap->ttyp) { case PIERC: break; case TRAPDOOR: - if(!xdnstair || u.ustuck) break; + if (!xdnstair || u.ustuck) + break; /* fall into next case */ default: dotrap(trap); - } + } pickup(1); } -vtele() { -#include "def.mkroom.h" - register struct mkroom *croom; - for(croom = &rooms[0]; croom->hx >= 0; croom++) - if(croom->rtype == VAULT) { - register x,y; - - x = rn2(2) ? croom->lx : croom->hx; - y = rn2(2) ? croom->ly : croom->hy; - if(teleok(x,y)) { - teleds(x,y); - return; +void +vtele() +{ + struct mkroom *croom; + for (croom = &rooms[0]; croom->hx >= 0; croom++) + if (croom->rtype == VAULT) { + int x, y; + + x = rn2(2) ? croom->lx : croom->hx; + y = rn2(2) ? croom->ly : croom->hy; + if (teleok(x, y)) { + teleds(x, y); + return; + } } - } tele(); } -tele() { - extern coord getpos(); - coord cc; - register int nux,nuy; +void +tele() +{ + coord cc; + int nux, nuy; - if(Teleport_control) { + if (Teleport_control) { pline("To what position do you want to be teleported?"); - cc = getpos(1, "the desired position"); /* 1: force valid */ - /* possible extensions: introduce a small error if - magic power is low; allow transfer to solid rock */ - if(teleok(cc.x, cc.y)){ + cc = getpos(1, "the desired position"); /* 1: force valid */ + /* + * possible extensions: introduce a small error if magic + * power is low; allow transfer to solid rock + */ + if (teleok(cc.x, cc.y)) { teleds(cc.x, cc.y); return; } pline("Sorry ..."); } do { - nux = rnd(COLNO-1); + nux = rnd(COLNO - 1); nuy = rn2(ROWNO); - } while(!teleok(nux, nuy)); + } while (!teleok(nux, nuy)); teleds(nux, nuy); } +void teleds(nux, nuy) -register int nux,nuy; + int nux, nuy; { - if(Punished) unplacebc(); + if (Punished) + unplacebc(); unsee(); u.utrap = 0; u.ustuck = 0; u.ux = nux; u.uy = nuy; setsee(); - if(Punished) placebc(1); - if(u.uswallow){ + if (Punished) + placebc(1); + if (u.uswallow) { u.uswldtim = u.uswallow = 0; docrt(); } nomul(0); - if(levl[nux][nuy].typ == POOL && !Levitation) + if (levl[nux][nuy].typ == POOL && !Levitation) drown(); (void) inshop(); pickup(1); - if(!Blind) read_engr_at(u.ux,u.uy); + if (!Blind) + read_engr_at(u.ux, u.uy); } -teleok(x,y) register int x,y; { /* might throw him into a POOL */ - return( isok(x,y) && !IS_ROCK(levl[x][y].typ) && !m_at(x,y) && - !sobj_at(ENORMOUS_ROCK,x,y) && !t_at(x,y) - ); +int +teleok(x, y) + int x, y; +{ /* might throw him into a POOL */ + return (isok(x, y) && !IS_ROCK(levl[x][y].typ) && !m_at(x, y) && + !sobj_at(ENORMOUS_ROCK, x, y) && !t_at(x, y) + ); /* Note: gold is permitted (because of vaults) */ } -dotele() { - extern char pl_character[]; - - if( +int +dotele() +{ + if ( #ifdef WIZARD - !wizard && -#endif WIZARD - (!Teleportation || u.ulevel < 6 || - (pl_character[0] != 'W' && u.ulevel < 10))) { + !wizard && +#endif /* WIZARD */ + (!Teleportation || u.ulevel < 6 || + (pl_character[0] != 'W' && u.ulevel < 10))) { pline("You are not able to teleport at will."); - return(0); + return (0); } - if(u.uhunger <= 100 || u.ustr < 6) { + if (u.uhunger <= 100 || u.ustr < 6) { pline("You miss the strength for a teleport spell."); - return(1); + return (1); } tele(); morehungry(100); - return(1); + return (1); } -placebc(attach) int attach; { - if(!uchain || !uball){ +void +placebc(attach) + int attach; +{ + if (!uchain || !uball) { impossible("Where are your chain and ball??"); return; } uball->ox = uchain->ox = u.ux; uball->oy = uchain->oy = u.uy; - if(attach){ + if (attach) { uchain->nobj = fobj; fobj = uchain; - if(!carried(uball)){ + if (!carried(uball)) { uball->nobj = fobj; fobj = uball; } } } -unplacebc(){ - if(!carried(uball)){ +void +unplacebc() +{ + if (!carried(uball)) { freeobj(uball); unpobj(uball); } @@ -384,67 +419,75 @@ unplacebc(){ unpobj(uchain); } -level_tele() { -register int newlevel; - if(Teleport_control) { - char buf[BUFSZ]; - - do { - pline("To what level do you want to teleport? [type a number] "); - getlin(buf); - } while(!digit(buf[0]) && (buf[0] != '-' || !digit(buf[1]))); - newlevel = atoi(buf); +void +level_tele() +{ + int newlevel; + if (Teleport_control) { + char buf[BUFSZ]; + + do { + pline("To what level do you want to teleport? [type a number] "); + getlin(buf); + } while (!digit(buf[0]) && (buf[0] != '-' || !digit(buf[1]))); + newlevel = atoi(buf); } else { - newlevel = 5 + rn2(20); /* 5 - 24 */ - if(dlevel == newlevel) - if(!xdnstair) newlevel--; else newlevel++; + newlevel = 5 + rn2(20); /* 5 - 24 */ + if (dlevel == newlevel) + if (!xdnstair) + newlevel--; + else + newlevel++; } - if(newlevel >= 30) { - if(newlevel > MAXLEVEL) newlevel = MAXLEVEL; - pline("You arrive at the center of the earth ..."); - pline("Unfortunately it is here that hell is located."); - if(Fire_resistance) { - pline("But the fire doesn't seem to harm you."); - } else { - pline("You burn to a crisp."); - dlevel = maxdlevel = newlevel; - killer = "visit to the hell"; - done("burned"); - } + if (newlevel >= 30) { + if (newlevel > MAXLEVEL) + newlevel = MAXLEVEL; + pline("You arrive at the center of the earth ..."); + pline("Unfortunately it is here that hell is located."); + if (Fire_resistance) { + pline("But the fire doesn't seem to harm you."); + } else { + pline("You burn to a crisp."); + dlevel = maxdlevel = newlevel; + killer = "visit to the hell"; + done("burned"); + } } - if(newlevel < 0) { - newlevel = 0; - pline("You are now high above the clouds ..."); - if(Levitation) { - pline("You float gently down to earth."); - done("escaped"); - } - pline("Unfortunately, you don't know how to fly."); - pline("You fall down a few thousand feet and break your neck."); - dlevel = 0; - killer = "fall"; - done("died"); + if (newlevel < 0) { + newlevel = 0; + pline("You are now high above the clouds ..."); + if (Levitation) { + pline("You float gently down to earth."); + done("escaped"); + } + pline("Unfortunately, you don't know how to fly."); + pline("You fall down a few thousand feet and break your neck."); + dlevel = 0; + killer = "fall"; + done("died"); } - - goto_level(newlevel, FALSE); /* calls done("escaped") if newlevel==0 */ + goto_level(newlevel, FALSE); /* calls done("escaped") if + * newlevel==0 */ } +void drown() { pline("You fall into a pool!"); pline("You can't swim!"); - if(rn2(3) < u.uluck+2) { + if (rn2(3) < u.uluck + 2) { /* most scrolls become unreadable */ - register struct obj *obj; + struct obj *obj; - for(obj = invent; obj; obj = obj->nobj) - if(obj->olet == SCROLL_SYM && rn2(12) > u.uluck) + for (obj = invent; obj; obj = obj->nobj) + if (obj->olet == SCROLL_SYM && rn2(12) > u.uluck) obj->otyp = SCR_BLANK_PAPER; /* we should perhaps merge these scrolls ? */ pline("You attempt a teleport spell."); /* utcsri!carroll */ (void) dotele(); - if(levl[u.ux][u.uy].typ != POOL) return; + if (levl[u.ux][u.uy].typ != POOL) + return; } pline("You drown ..."); killer = "pool of water"; diff --git a/hack/hack.tty.c b/hack/hack.tty.c index 727fea0d..5259258e 100644 --- a/hack/hack.tty.c +++ b/hack/hack.tty.c @@ -1,3 +1,5 @@ +/* $NetBSD: hack.tty.c,v 1.6 1997/10/19 16:59:17 christos Exp $ */ + /*- * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. @@ -31,22 +33,25 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> #ifndef lint #if 0 -static char sccsid[] = "@(#)hack.tty.c 8.1 (Berkeley) 5/31/93"; +static char sccsid[] = "@(#)hack.tty.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$NetBSD: hack.tty.c,v 1.5 1995/04/29 01:08:54 mycroft Exp $"; +__RCSID("$NetBSD: hack.tty.c,v 1.6 1997/10/19 16:59:17 christos Exp $"); #endif -#endif /* not lint */ +#endif /* not lint */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.tty.c - version 1.0.3 */ -/* With thanks to the people who sent code for SYSV - hpscdi!jon, - arnold@ucsf-cgl, wcs@bo95b, cbcephus!pds and others. */ +/* + * With thanks to the people who sent code for SYSV - hpscdi!jon, + * arnold@ucsf-cgl, wcs@bo95b, cbcephus!pds and others. + */ -#include "hack.h" -#include <stdio.h> -#include <termios.h> +#include <termios.h> +#include "hack.h" +#include "extern.h" /* * Some systems may have getchar() return EOF for various reasons, and @@ -54,20 +59,22 @@ static char rcsid[] = "$NetBSD: hack.tty.c,v 1.5 1995/04/29 01:08:54 mycroft Exp */ #ifndef BSD #define NR_OF_EOFS 20 -#endif BSD +#endif /* BSD */ -extern speed_t ospeed; -static char erase_char, kill_char; -static boolean settty_needed = FALSE; -struct termios inittyb, curttyb; +static char erase_char, kill_char; +static boolean settty_needed = FALSE; +struct termios inittyb, curttyb; /* * Get initial state of terminal, set ospeed (for termcap routines) * and switch off tab expansion if necessary. * Called by startup() in termcap.c and after returning from ! or ^Z */ -gettty(){ - if(tcgetattr(0, &inittyb) < 0) +void +gettty() +{ + extern speed_t ospeed; + if (tcgetattr(0, &inittyb) < 0) perror("Hack (gettty)"); curttyb = inittyb; ospeed = cfgetospeed(&inittyb); @@ -76,7 +83,7 @@ gettty(){ getioctls(); /* do not expand tabs - they might be needed inside a cm sequence */ - if(curttyb.c_oflag & OXTABS) { + if (curttyb.c_oflag & OXTABS) { curttyb.c_oflag &= ~OXTABS; setctty(); } @@ -84,41 +91,49 @@ gettty(){ } /* reset terminal to original state */ -settty(s) char *s; { +void +settty(s) + char *s; +{ clear_screen(); end_screen(); - if(s) printf(s); + if (s) + printf(s); (void) fflush(stdout); - if(tcsetattr(0, TCSADRAIN, &inittyb) < 0) + if (tcsetattr(0, TCSADRAIN, &inittyb) < 0) perror("Hack (settty)"); flags.echo = (inittyb.c_lflag & ECHO) ? ON : OFF; flags.cbreak = (inittyb.c_lflag & ICANON) ? OFF : ON; setioctls(); } -setctty(){ - if(tcsetattr(0, TCSADRAIN, &curttyb) < 0) +void +setctty() +{ + if (tcsetattr(0, TCSADRAIN, &curttyb) < 0) perror("Hack (setctty)"); } -setftty(){ -register int change = 0; +void +setftty() +{ + int change = 0; flags.cbreak = ON; flags.echo = OFF; /* Should use (ECHO|CRMOD) here instead of ECHO */ - if(curttyb.c_lflag & ECHO){ + if (curttyb.c_lflag & ECHO) { curttyb.c_lflag &= ~ECHO; change++; } - if(curttyb.c_lflag & ICANON){ + if (curttyb.c_lflag & ICANON) { curttyb.c_lflag &= ~ICANON; /* be satisfied with one character; no timeout */ curttyb.c_cc[VMIN] = 1; curttyb.c_cc[VTIME] = 0; change++; } - if(change){ + if (change) { setctty(); } start_screen(); @@ -126,11 +141,28 @@ register int change = 0; /* fatal error */ -/*VARARGS1*/ -error(s,x,y) char *s; { - if(settty_needed) +/* VARARGS1 */ +void +#ifdef __STDC__ +error(const char *fmt, ...) +#else +error(va_alist) + va_dcl +#endif +{ + va_list ap; +#ifndef __STDC__ + const char *fmt; + + va_start(ap); + fmt = va_arg(ap, const char *); +#else + va_start(ap, fmt); +#endif + if (settty_needed) settty((char *) 0); - printf(s,x,y); + vprintf(fmt, ap); + va_end(ap); putchar('\n'); exit(1); } @@ -141,43 +173,47 @@ error(s,x,y) char *s; { * Reading can be interrupted by an escape ('\033') - now the * resulting string is "\033". */ +void getlin(bufp) -register char *bufp; + char *bufp; { - register char *obufp = bufp; - register int c; + char *obufp = bufp; + int c; - flags.toplin = 2; /* nonempty, no --More-- required */ - for(;;) { + flags.toplin = 2; /* nonempty, no --More-- required */ + for (;;) { (void) fflush(stdout); - if((c = getchar()) == EOF) { + if ((c = getchar()) == EOF) { *bufp = 0; return; } - if(c == '\033') { + if (c == '\033') { *obufp = c; obufp[1] = 0; return; } - if(c == erase_char || c == '\b') { - if(bufp != obufp) { + if (c == erase_char || c == '\b') { + if (bufp != obufp) { bufp--; - putstr("\b \b"); /* putsym converts \b */ - } else bell(); - } else if(c == '\n') { + putstr("\b \b"); /* putsym converts \b */ + } else + bell(); + } else if (c == '\n') { *bufp = 0; return; - } else if(' ' <= c && c < '\177') { - /* avoid isprint() - some people don't have it - ' ' is not always a printing char */ + } else if (' ' <= c && c < '\177') { + /* + * avoid isprint() - some people don't have it ' ' is + * not always a printing char + */ *bufp = c; bufp[1] = 0; putstr(bufp); - if(bufp-obufp < BUFSZ-1 && bufp-obufp < COLNO) + if (bufp - obufp < BUFSZ - 1 && bufp - obufp < COLNO) bufp++; - } else if(c == kill_char || c == '\177') { /* Robert Viduya */ - /* this test last - @ might be the kill_char */ - while(bufp != obufp) { + } else if (c == kill_char || c == '\177') { /* Robert Viduya */ + /* this test last - @ might be the kill_char */ + while (bufp != obufp) { bufp--; putstr("\b \b"); } @@ -186,104 +222,118 @@ register char *bufp; } } -getret() { +void +getret() +{ cgetret(""); } +void cgetret(s) -register char *s; + char *s; { putsym('\n'); - if(flags.standout) + if (flags.standout) standoutbeg(); putstr("Hit "); putstr(flags.cbreak ? "space" : "return"); putstr(" to continue: "); - if(flags.standout) + if (flags.standout) standoutend(); xwaitforspace(s); } -char morc; /* tell the outside world what char he used */ +char morc; /* tell the outside world what char he used */ +void xwaitforspace(s) -register char *s; /* chars allowed besides space or return */ + char *s; /* chars allowed besides space or return */ { -register int c; + int c; morc = 0; - while((c = readchar()) != '\n') { - if(flags.cbreak) { - if(c == ' ') break; - if(s && index(s,c)) { - morc = c; - break; + while ((c = readchar()) != '\n') { + if (flags.cbreak) { + if (c == ' ') + break; + if (s && strchr(s, c)) { + morc = c; + break; + } + bell(); } - bell(); - } } } -char * +char * parse() { - static char inputline[COLNO]; - register foo; + static char inputline[COLNO]; + int foo; flags.move = 1; - if(!Invisible) curs_on_u(); else home(); - while((foo = readchar()) >= '0' && foo <= '9') - multi = 10*multi+foo-'0'; - if(multi) { + if (!Invisible) + curs_on_u(); + else + home(); + while ((foo = readchar()) >= '0' && foo <= '9') + multi = 10 * multi + foo - '0'; + if (multi) { multi--; save_cm = inputline; } inputline[0] = foo; inputline[1] = 0; - if(foo == 'f' || foo == 'F'){ + if (foo == 'f' || foo == 'F') { inputline[1] = getchar(); #ifdef QUEST - if(inputline[1] == foo) inputline[2] = getchar(); else -#endif QUEST - inputline[2] = 0; + if (inputline[1] == foo) + inputline[2] = getchar(); + else +#endif /* QUEST */ + inputline[2] = 0; } - if(foo == 'm' || foo == 'M'){ + if (foo == 'm' || foo == 'M') { inputline[1] = getchar(); inputline[2] = 0; } clrlin(); - return(inputline); + return (inputline); } char -readchar() { - register int sym; +readchar() +{ + int sym; (void) fflush(stdout); - if((sym = getchar()) == EOF) + if ((sym = getchar()) == EOF) #ifdef NR_OF_EOFS - { /* - * Some SYSV systems seem to return EOFs for various reasons - * (?like when one hits break or for interrupted systemcalls?), - * and we must see several before we quit. - */ - register int cnt = NR_OF_EOFS; + { /* + * Some SYSV systems seem to return EOFs for various reasons + * (?like when one hits break or for interrupted systemcalls?), + * and we must see several before we quit. + */ + int cnt = NR_OF_EOFS; while (cnt--) { - clearerr(stdin); /* omit if clearerr is undefined */ - if((sym = getchar()) != EOF) goto noteof; + clearerr(stdin); /* omit if clearerr is + * undefined */ + if ((sym = getchar()) != EOF) + goto noteof; } end_of_input(); - noteof: ; +noteof: ; } #else end_of_input(); -#endif NR_OF_EOFS - if(flags.toplin == 1) +#endif /* NR_OF_EOFS */ + if (flags.toplin == 1) flags.toplin = 2; - return((char) sym); + return ((char) sym); } +void end_of_input() { settty("End of input?\n"); diff --git a/hack/hack.u_init.c b/hack/hack.u_init.c index f61899d0..9f7ba082 100644 --- a/hack/hack.u_init.c +++ b/hack/hack.u_init.c @@ -1,186 +1,193 @@ +/* $NetBSD: hack.u_init.c,v 1.5 1997/10/19 16:59:19 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.u_init.c,v 1.4 1995/03/23 08:31:51 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.u_init.c,v 1.5 1997/10/19 16:59:19 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -#include <stdio.h> +#include <ctype.h> #include <signal.h> +#include <stdlib.h> +#include "hack.h" +#include "extern.h" + #define Strcpy (void) strcpy #define Strcat (void) strcat #define UNDEF_TYP 0 #define UNDEF_SPE '\177' -extern struct obj *addinv(); -extern char *eos(); -extern char plname[]; -struct you zerou; -char pl_character[PL_CSIZ]; -char *(roles[]) = { /* must all have distinct first letter */ - /* roles[4] may be changed to -woman */ +struct you zerou; +char pl_character[PL_CSIZ]; +char *(roles[]) = { /* must all have distinct first letter */ + /* roles[4] may be changed to -woman */ "Tourist", "Speleologist", "Fighter", "Knight", "Cave-man", "Wizard" }; #define NR_OF_ROLES SIZE(roles) -char rolesyms[NR_OF_ROLES + 1]; /* filled by u_init() */ +char rolesyms[NR_OF_ROLES + 1]; /* filled by u_init() */ struct trobj { - uchar trotyp; - schar trspe; - char trolet; - Bitfield(trquan,6); - Bitfield(trknown,1); + uchar trotyp; + schar trspe; + char trolet; + Bitfield(trquan, 6); + Bitfield(trknown, 1); }; #ifdef WIZARD -struct trobj Extra_objs[] = { - { 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } +struct trobj Extra_objs[] = { + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0} }; -#endif WIZARD +#endif /* WIZARD */ -struct trobj Cave_man[] = { - { MACE, 1, WEAPON_SYM, 1, 1 }, - { BOW, 1, WEAPON_SYM, 1, 1 }, - { ARROW, 0, WEAPON_SYM, 25, 1 }, /* quan is variable */ - { LEATHER_ARMOR, 0, ARMOR_SYM, 1, 1 }, - { 0, 0, 0, 0, 0} +struct trobj Cave_man[] = { + {MACE, 1, WEAPON_SYM, 1, 1}, + {BOW, 1, WEAPON_SYM, 1, 1}, + {ARROW, 0, WEAPON_SYM, 25, 1}, /* quan is variable */ + {LEATHER_ARMOR, 0, ARMOR_SYM, 1, 1}, + {0, 0, 0, 0, 0} }; -struct trobj Fighter[] = { - { TWO_HANDED_SWORD, 0, WEAPON_SYM, 1, 1 }, - { RING_MAIL, 0, ARMOR_SYM, 1, 1 }, - { 0, 0, 0, 0, 0 } +struct trobj Fighter[] = { + {TWO_HANDED_SWORD, 0, WEAPON_SYM, 1, 1}, + {RING_MAIL, 0, ARMOR_SYM, 1, 1}, + {0, 0, 0, 0, 0} }; -struct trobj Knight[] = { - { LONG_SWORD, 0, WEAPON_SYM, 1, 1 }, - { SPEAR, 2, WEAPON_SYM, 1, 1 }, - { RING_MAIL, 1, ARMOR_SYM, 1, 1 }, - { HELMET, 0, ARMOR_SYM, 1, 1 }, - { SHIELD, 0, ARMOR_SYM, 1, 1 }, - { PAIR_OF_GLOVES, 0, ARMOR_SYM, 1, 1 }, - { 0, 0, 0, 0, 0 } +struct trobj Knight[] = { + {LONG_SWORD, 0, WEAPON_SYM, 1, 1}, + {SPEAR, 2, WEAPON_SYM, 1, 1}, + {RING_MAIL, 1, ARMOR_SYM, 1, 1}, + {HELMET, 0, ARMOR_SYM, 1, 1}, + {SHIELD, 0, ARMOR_SYM, 1, 1}, + {PAIR_OF_GLOVES, 0, ARMOR_SYM, 1, 1}, + {0, 0, 0, 0, 0} }; -struct trobj Speleologist[] = { - { STUDDED_LEATHER_ARMOR, 0, ARMOR_SYM, 1, 1 }, - { UNDEF_TYP, 0, POTION_SYM, 2, 0 }, - { FOOD_RATION, 0, FOOD_SYM, 3, 1 }, - { PICK_AXE, UNDEF_SPE, TOOL_SYM, 1, 0 }, - { ICE_BOX, 0, TOOL_SYM, 1, 0 }, - { 0, 0, 0, 0, 0} +struct trobj Speleologist[] = { + {STUDDED_LEATHER_ARMOR, 0, ARMOR_SYM, 1, 1}, + {UNDEF_TYP, 0, POTION_SYM, 2, 0}, + {FOOD_RATION, 0, FOOD_SYM, 3, 1}, + {PICK_AXE, UNDEF_SPE, TOOL_SYM, 1, 0}, + {ICE_BOX, 0, TOOL_SYM, 1, 0}, + {0, 0, 0, 0, 0} }; -struct trobj Tinopener[] = { - { CAN_OPENER, 0, TOOL_SYM, 1, 1 }, - { 0, 0, 0, 0, 0 } +struct trobj Tinopener[] = { + {CAN_OPENER, 0, TOOL_SYM, 1, 1}, + {0, 0, 0, 0, 0} }; -struct trobj Tourist[] = { - { UNDEF_TYP, 0, FOOD_SYM, 10, 1 }, - { POT_EXTRA_HEALING, 0, POTION_SYM, 2, 0 }, - { EXPENSIVE_CAMERA, 0, TOOL_SYM, 1, 1 }, - { DART, 2, WEAPON_SYM, 25, 1 }, /* quan is variable */ - { 0, 0, 0, 0, 0 } +struct trobj Tourist[] = { + {UNDEF_TYP, 0, FOOD_SYM, 10, 1}, + {POT_EXTRA_HEALING, 0, POTION_SYM, 2, 0}, + {EXPENSIVE_CAMERA, 0, TOOL_SYM, 1, 1}, + {DART, 2, WEAPON_SYM, 25, 1}, /* quan is variable */ + {0, 0, 0, 0, 0} }; -struct trobj Wizard[] = { - { ELVEN_CLOAK, 0, ARMOR_SYM, 1, 1 }, - { UNDEF_TYP, UNDEF_SPE, WAND_SYM, 2, 0 }, - { UNDEF_TYP, UNDEF_SPE, RING_SYM, 2, 0 }, - { UNDEF_TYP, UNDEF_SPE, POTION_SYM, 2, 0 }, - { UNDEF_TYP, UNDEF_SPE, SCROLL_SYM, 3, 0 }, - { 0, 0, 0, 0, 0 } +struct trobj Wizard[] = { + {ELVEN_CLOAK, 0, ARMOR_SYM, 1, 1}, + {UNDEF_TYP, UNDEF_SPE, WAND_SYM, 2, 0}, + {UNDEF_TYP, UNDEF_SPE, RING_SYM, 2, 0}, + {UNDEF_TYP, UNDEF_SPE, POTION_SYM, 2, 0}, + {UNDEF_TYP, UNDEF_SPE, SCROLL_SYM, 3, 0}, + {0, 0, 0, 0, 0} }; -u_init(){ -register int i; -char exper = 'y', pc; -extern char readchar(); - if(flags.female) /* should have been set in HACKOPTIONS */ +void +u_init() +{ + int i; + char exper = 'y', pc; + if (flags.female) /* should have been set in HACKOPTIONS */ roles[4] = "Cave-woman"; - for(i = 0; i < NR_OF_ROLES; i++) + for (i = 0; i < NR_OF_ROLES; i++) rolesyms[i] = roles[i][0]; rolesyms[i] = 0; - if(pc = pl_character[0]) { - if(islower(pc)) pc = toupper(pc); - if((i = role_index(pc)) >= 0) + if ((pc = pl_character[0]) != '\0') { + if (islower(pc)) + pc = toupper(pc); + if ((i = role_index(pc)) >= 0) goto got_suffix; /* implies experienced */ printf("\nUnknown role: %c\n", pc); pl_character[0] = pc = 0; } - printf("\nAre you an experienced player? [ny] "); - while(!index("ynYN \n\004", (exper = readchar()))) + while (!strchr("ynYN \n\004", (exper = readchar()))) bell(); - if(exper == '\004') /* Give him an opportunity to get out */ + if (exper == '\004') /* Give him an opportunity to get out */ end_of_input(); - printf("%c\n", exper); /* echo */ - if(index("Nn \n", exper)) { + printf("%c\n", exper); /* echo */ + if (strchr("Nn \n", exper)) { exper = 0; goto beginner; } - printf("\nTell me what kind of character you are:\n"); printf("Are you"); - for(i = 0; i < NR_OF_ROLES; i++) { + for (i = 0; i < NR_OF_ROLES; i++) { printf(" a %s", roles[i]); - if(i == 2) /* %% */ + if (i == 2) /* %% */ printf(",\n\t"); - else if(i < NR_OF_ROLES - 2) + else if (i < NR_OF_ROLES - 2) printf(","); - else if(i == NR_OF_ROLES - 2) + else if (i == NR_OF_ROLES - 2) printf(" or"); } printf("? [%s] ", rolesyms); - while(pc = readchar()) { - if(islower(pc)) pc = toupper(pc); - if((i = role_index(pc)) >= 0) { + while ((pc = readchar()) != '\0') { + if (islower(pc)) + pc = toupper(pc); + if ((i = role_index(pc)) >= 0) { printf("%c\n", pc); /* echo */ (void) fflush(stdout); /* should be seen */ break; } - if(pc == '\n') + if (pc == '\n') break; - if(pc == '\004') /* Give him the opportunity to get out */ + if (pc == '\004') /* Give him the opportunity to get + * out */ end_of_input(); bell(); } - if(pc == '\n') + if (pc == '\n') pc = 0; beginner: - if(!pc) { + if (!pc) { printf("\nI'll choose a character for you.\n"); i = rn2(NR_OF_ROLES); pc = rolesyms[i]; printf("This game you will be a%s %s.\n", - exper ? "n experienced" : "", - roles[i]); + exper ? "n experienced" : "", + roles[i]); getret(); /* give him some feedback in case mklev takes much time */ (void) putchar('\n'); (void) fflush(stdout); } #if 0 - /* Given the above code, I can't see why this would ever change - anything; it does core pretty well, though. - cmh 4/20/93 */ - if(exper) { + /* + * Given the above code, I can't see why this would ever change + * anything; it does core pretty well, though. - cmh 4/20/93 + */ + if (exper) { roles[i][0] = pc; } #endif got_suffix: - (void) strncpy(pl_character, roles[i], PL_CSIZ-1); - pl_character[PL_CSIZ-1] = 0; + (void) strncpy(pl_character, roles[i], PL_CSIZ - 1); + pl_character[PL_CSIZ - 1] = 0; flags.beginner = 1; u = zerou; u.usym = '@'; @@ -188,14 +195,14 @@ got_suffix: init_uhunger(); #ifdef QUEST u.uhorizon = 6; -#endif QUEST +#endif /* QUEST */ uarm = uarm2 = uarmh = uarms = uarmg = uwep = uball = uchain = - uleft = uright = 0; + uleft = uright = 0; - switch(pc) { + switch (pc) { case 'c': case 'C': - Cave_man[2].trquan = 12 + rnd(9)*rnd(9); + Cave_man[2].trquan = 12 + rnd(9) * rnd(9); u.uhp = u.uhpmax = 16; u.ustr = u.ustrmax = 18; ini_inv(Cave_man); @@ -207,12 +214,14 @@ got_suffix: u.uhp = u.uhpmax = 10; u.ustr = u.ustrmax = 8; ini_inv(Tourist); - if(!rn2(25)) ini_inv(Tinopener); + if (!rn2(25)) + ini_inv(Tinopener); break; case 'w': case 'W': - for(i=1; i<=4; i++) if(!rn2(5)) - Wizard[i].trquan += rn2(3) - 1; + for (i = 1; i <= 4; i++) + if (!rn2(5)) + Wizard[i].trquan += rn2(3) - 1; u.uhp = u.uhpmax = 15; u.ustr = u.ustrmax = 16; ini_inv(Wizard); @@ -224,7 +233,8 @@ got_suffix: u.uhp = u.uhpmax = 12; u.ustr = u.ustrmax = 10; ini_inv(Speleologist); - if(!rn2(10)) ini_inv(Tinopener); + if (!rn2(10)) + ini_inv(Tinopener); break; case 'k': case 'K': @@ -238,92 +248,103 @@ got_suffix: u.ustr = u.ustrmax = 17; ini_inv(Fighter); break; - default: /* impossible */ + default: /* impossible */ u.uhp = u.uhpmax = 12; u.ustr = u.ustrmax = 16; } find_ac(); - if(!rn2(20)) { - register int d = rn2(7) - 2; /* biased variation */ + if (!rn2(20)) { + int d = rn2(7) - 2; /* biased variation */ u.ustr += d; u.ustrmax += d; } - #ifdef WIZARD - if(wizard) wiz_inv(); -#endif WIZARD + if (wizard) + wiz_inv(); +#endif /* WIZARD */ /* make sure he can carry all he has - especially for T's */ - while(inv_weight() > 0 && u.ustr < 118) + while (inv_weight() > 0 && u.ustr < 118) u.ustr++, u.ustrmax++; } -ini_inv(trop) register struct trobj *trop; { -register struct obj *obj; -extern struct obj *mkobj(); - while(trop->trolet) { +void +ini_inv(trop) + struct trobj *trop; +{ + struct obj *obj; + while (trop->trolet) { obj = mkobj(trop->trolet); obj->known = trop->trknown; /* not obj->dknown = 1; - let him look at it at least once */ obj->cursed = 0; - if(obj->olet == WEAPON_SYM){ + if (obj->olet == WEAPON_SYM) { obj->quan = trop->trquan; trop->trquan = 1; } - if(trop->trspe != UNDEF_SPE) + if (trop->trspe != UNDEF_SPE) obj->spe = trop->trspe; - if(trop->trotyp != UNDEF_TYP) + if (trop->trotyp != UNDEF_TYP) obj->otyp = trop->trotyp; - else - if(obj->otyp == WAN_WISHING) /* gitpyr!robert */ - obj->otyp = WAN_DEATH; + else if (obj->otyp == WAN_WISHING) /* gitpyr!robert */ + obj->otyp = WAN_DEATH; obj->owt = weight(obj); /* defined after setting otyp+quan */ obj = addinv(obj); - if(obj->olet == ARMOR_SYM){ - switch(obj->otyp){ + if (obj->olet == ARMOR_SYM) { + switch (obj->otyp) { case SHIELD: - if(!uarms) setworn(obj, W_ARMS); + if (!uarms) + setworn(obj, W_ARMS); break; case HELMET: - if(!uarmh) setworn(obj, W_ARMH); + if (!uarmh) + setworn(obj, W_ARMH); break; case PAIR_OF_GLOVES: - if(!uarmg) setworn(obj, W_ARMG); + if (!uarmg) + setworn(obj, W_ARMG); break; case ELVEN_CLOAK: - if(!uarm2) + if (!uarm2) setworn(obj, W_ARM); break; default: - if(!uarm) setworn(obj, W_ARM); + if (!uarm) + setworn(obj, W_ARM); } } - if(obj->olet == WEAPON_SYM) - if(!uwep) setuwep(obj); + if (obj->olet == WEAPON_SYM) + if (!uwep) + setuwep(obj); #ifndef PYRAMID_BUG - if(--trop->trquan) continue; /* make a similar object */ + if (--trop->trquan) + continue; /* make a similar object */ #else - if(trop->trquan) { /* check if zero first */ + if (trop->trquan) { /* check if zero first */ --trop->trquan; - if(trop->trquan) + if (trop->trquan) continue; /* make a similar object */ } -#endif PYRAMID_BUG +#endif /* PYRAMID_BUG */ trop++; } } #ifdef WIZARD -wiz_inv(){ -register struct trobj *trop = &Extra_objs[0]; -extern char *getenv(); -register char *ep = getenv("INVENT"); -register int type; - while(ep && *ep) { +void +wiz_inv() +{ + struct trobj *trop = &Extra_objs[0]; + char *ep = getenv("INVENT"); + int type; + while (ep && *ep) { type = atoi(ep); - ep = index(ep, ','); - if(ep) while(*ep == ',' || *ep == ' ') ep++; - if(type <= 0 || type > NROFOBJECTS) continue; + ep = strchr(ep, ','); + if (ep) + while (*ep == ',' || *ep == ' ') + ep++; + if (type <= 0 || type > NROFOBJECTS) + continue; trop->trotyp = type; trop->trolet = objects[type].oc_olet; trop->trspe = 4; @@ -339,28 +360,31 @@ register int type; trop->trquan = 1; ini_inv(trop); } -#endif WIZARD +#endif /* WIZARD */ -plnamesuffix() { -register char *p; - if(p = rindex(plname, '-')) { +void +plnamesuffix() +{ + char *p; + if ((p = strrchr(plname, '-')) != NULL) { *p = 0; pl_character[0] = p[1]; pl_character[1] = 0; - if(!plname[0]) { + if (!plname[0]) { askname(); plnamesuffix(); } } } +int role_index(pc) -char pc; -{ /* must be called only from u_init() */ - /* so that rolesyms[] is defined */ - register char *cp; + char pc; +{ /* must be called only from u_init() */ + /* so that rolesyms[] is defined */ + char *cp; - if(cp = index(rolesyms, pc)) - return(cp - rolesyms); - return(-1); + if ((cp = strchr(rolesyms, pc)) != NULL) + return (cp - rolesyms); + return (-1); } diff --git a/hack/hack.unix.c b/hack/hack.unix.c index 10c0e660..0160c463 100644 --- a/hack/hack.unix.c +++ b/hack/hack.unix.c @@ -1,10 +1,13 @@ +/* $NetBSD: hack.unix.c,v 1.5 1997/10/19 16:59:21 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.unix.c,v 1.4 1996/02/06 22:47:25 jtc Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.unix.c,v 1.5 1997/10/19 16:59:21 christos Exp $"); +#endif /* not lint */ /* This file collects some Unix dependencies; hack.pager.c contains some more */ @@ -17,59 +20,66 @@ static char rcsid[] = "$NetBSD: hack.unix.c,v 1.4 1996/02/06 22:47:25 jtc Exp $" * - determination of what files are "very old" */ -#include <stdio.h> #include <errno.h> -#include "hack.h" /* mainly for index() which depends on BSD */ - -#include <sys/types.h> /* for time_t and stat */ -#include <sys/stat.h> +#include <sys/types.h> /* for time_t and stat */ +#include <sys/stat.h> #ifdef BSD -#include <sys/time.h> +#include <sys/time.h> #else -#include <time.h> -#endif BSD +#include <time.h> +#endif /* BSD */ +#include <stdlib.h> +#include <unistd.h> +#include <signal.h> +#include <fcntl.h> -extern char *getenv(); -extern time_t time(); +#include "hack.h" /* mainly for strchr() which depends on BSD */ +#include "extern.h" + +void setrandom() { - (void) srandom((int) time ((time_t *) 0)); + (void) srandom((int) time((time_t *) 0)); } -struct tm * +struct tm * getlt() { - time_t date; - struct tm *localtime(); + time_t date; (void) time(&date); - return(localtime(&date)); + return (localtime(&date)); } +int getyear() { - return(1900 + getlt()->tm_year); + return (1900 + getlt()->tm_year); } -char * +char * getdate() { - static char datestr[7]; - register struct tm *lt = getlt(); + static char datestr[7]; + struct tm *lt = getlt(); (void) sprintf(datestr, "%2d%2d%2d", - lt->tm_year, lt->tm_mon + 1, lt->tm_mday); - if(datestr[2] == ' ') datestr[2] = '0'; - if(datestr[4] == ' ') datestr[4] = '0'; - return(datestr); + lt->tm_year, lt->tm_mon + 1, lt->tm_mday); + if (datestr[2] == ' ') + datestr[2] = '0'; + if (datestr[4] == ' ') + datestr[4] = '0'; + return (datestr); } -phase_of_the_moon() /* 0-7, with 0: new, 4: full */ -{ /* moon period: 29.5306 days */ - /* year: 365.2422 days */ - register struct tm *lt = getlt(); - register int epact, diy, golden; +int +phase_of_the_moon() +{ /* 0-7, with 0: new, 4: full *//* moon + * period: 29.5306 days */ + /* year: 365.2422 days */ + struct tm *lt = getlt(); + int epact, diy, golden; diy = lt->tm_yday; golden = (lt->tm_year % 19) + 1; @@ -77,50 +87,57 @@ phase_of_the_moon() /* 0-7, with 0: new, 4: full */ if ((epact == 25 && golden > 11) || epact == 24) epact++; - return( (((((diy + epact) * 6) + 11) % 177) / 22) & 7 ); + return ((((((diy + epact) * 6) + 11) % 177) / 22) & 7); } +int night() { - register int hour = getlt()->tm_hour; + int hour = getlt()->tm_hour; - return(hour < 6 || hour > 21); + return (hour < 6 || hour > 21); } +int midnight() { - return(getlt()->tm_hour == 0); + return (getlt()->tm_hour == 0); } -struct stat buf, hbuf; +struct stat buf, hbuf; -gethdate(name) char *name; { -/* old version - for people short of space */ -/* -/* register char *np; -/* if(stat(name, &hbuf)) -/* error("Cannot get status of %s.", -/* (np = rindex(name, '/')) ? np+1 : name); -/* -/* version using PATH from: seismo!gregc@ucsf-cgl.ARPA (Greg Couch) */ +void +gethdate(name) + char *name; +{ +#if 0 + /* old version - for people short of space */ + char *np; -/* - * The problem with #include <sys/param.h> is that this include file - * does not exist on all systems, and moreover, that it sometimes includes - * <sys/types.h> again, so that the compiler sees these typedefs twice. - */ + if(stat(name, &hbuf)) + error("Cannot get status of %s.", + (np = strrchr(name, '/')) ? np+1 : name); +#else + /* version using PATH from: seismo!gregc@ucsf-cgl.ARPA (Greg Couch) */ + + + /* + * The problem with #include <sys/param.h> is that this include file + * does not exist on all systems, and moreover, that it sometimes includes + * <sys/types.h> again, so that the compiler sees these typedefs twice. + */ #define MAXPATHLEN 1024 -register char *np, *path; -char filename[MAXPATHLEN+1]; - if (index(name, '/') != NULL || (path = getenv("PATH")) == NULL) + char *np, *path; + char filename[MAXPATHLEN + 1]; + if (strchr(name, '/') != NULL || (path = getenv("PATH")) == NULL) path = ""; for (;;) { - if ((np = index(path, ':')) == NULL) + if ((np = strchr(path, ':')) == NULL) np = path + strlen(path); /* point to end str */ - if (np - path <= 1) /* %% */ + if (np - path <= 1) /* %% */ (void) strcpy(filename, name); else { (void) strncpy(filename, path, np - path); @@ -134,122 +151,136 @@ char filename[MAXPATHLEN+1]; path = np + 1; } error("Cannot get status of %s.", - (np = rindex(name, '/')) ? np+1 : name); + (np = strrchr(name, '/')) ? np + 1 : name); +#endif } -uptodate(fd) { - if(fstat(fd, &buf)) { +int +uptodate(fd) +{ + if (fstat(fd, &buf)) { pline("Cannot get status of saved level? "); - return(0); + return (0); } - if(buf.st_mtime < hbuf.st_mtime) { + if (buf.st_mtime < hbuf.st_mtime) { pline("Saved level is out of date. "); - return(0); + return (0); } - return(1); + return (1); } /* see whether we should throw away this xlock file */ -veryold(fd) { - register int i; - time_t date; +int +veryold(fd) + int fd; +{ + int i; + time_t date; - if(fstat(fd, &buf)) return(0); /* cannot get status */ - if(buf.st_size != sizeof(int)) return(0); /* not an xlock file */ + if (fstat(fd, &buf)) + return (0); /* cannot get status */ + if (buf.st_size != sizeof(int)) + return (0); /* not an xlock file */ (void) time(&date); - if(date - buf.st_mtime < 3L*24L*60L*60L) { /* recent */ - int lockedpid; /* should be the same size as hackpid */ + if (date - buf.st_mtime < 3L * 24L * 60L * 60L) { /* recent */ + int lockedpid; /* should be the same size as + * hackpid */ - if(read(fd, (char *)&lockedpid, sizeof(lockedpid)) != - sizeof(lockedpid)) + if (read(fd, (char *) &lockedpid, sizeof(lockedpid)) != + sizeof(lockedpid)) /* strange ... */ - return(0); - - /* From: Rick Adams <seismo!rick> - /* This will work on 4.1cbsd, 4.2bsd and system 3? & 5. - /* It will do nothing on V7 or 4.1bsd. */ - if(!(kill(lockedpid, 0) == -1 && errno == ESRCH)) - return(0); + return (0); + + /* + * From: Rick Adams <seismo!rick> This will work on + * 4.1cbsd, 4.2bsd and system 3? & 5. It will do nothing + * on V7 or 4.1bsd. + */ + if (!(kill(lockedpid, 0) == -1 && errno == ESRCH)) + return (0); } (void) close(fd); - for(i = 1; i <= MAXLEVEL; i++) { /* try to remove all */ + for (i = 1; i <= MAXLEVEL; i++) { /* try to remove all */ glo(i); (void) unlink(lock); } glo(0); - if(unlink(lock)) return(0); /* cannot remove it */ - return(1); /* success! */ + if (unlink(lock)) + return (0); /* cannot remove it */ + return (1); /* success! */ } +void getlock() { - extern int hackpid, locknum; - register int i = 0, fd; + extern int hackpid, locknum; + int i = 0, fd; (void) fflush(stdout); /* we ignore QUIT and INT at this point */ if (link(HLOCK, LLOCK) == -1) { - register int errnosv = errno; + int errnosv = errno; perror(HLOCK); printf("Cannot link %s to %s\n", LLOCK, HLOCK); - switch(errnosv) { + switch (errnosv) { case ENOENT: - printf("Perhaps there is no (empty) file %s ?\n", HLOCK); - break; + printf("Perhaps there is no (empty) file %s ?\n", HLOCK); + break; case EACCES: - printf("It seems you don't have write permission here.\n"); - break; + printf("It seems you don't have write permission here.\n"); + break; case EEXIST: - printf("(Try again or rm %s.)\n", LLOCK); - break; + printf("(Try again or rm %s.)\n", LLOCK); + break; default: - printf("I don't know what is wrong."); + printf("I don't know what is wrong."); } getret(); - error(""); - /*NOTREACHED*/ + error("%s", ""); + /* NOTREACHED */ } - regularize(lock); glo(0); - if(locknum > 25) locknum = 25; + if (locknum > 25) + locknum = 25; do { - if(locknum) lock[0] = 'a' + i++; + if (locknum) + lock[0] = 'a' + i++; - if((fd = open(lock, 0)) == -1) { - if(errno == ENOENT) goto gotlock; /* no such file */ + if ((fd = open(lock, 0)) == -1) { + if (errno == ENOENT) + goto gotlock; /* no such file */ perror(lock); (void) unlink(LLOCK); error("Cannot open %s", lock); } - - if(veryold(fd)) /* if true, this closes fd and unlinks lock */ + if (veryold(fd))/* if true, this closes fd and unlinks lock */ goto gotlock; (void) close(fd); - } while(i < locknum); + } while (i < locknum); (void) unlink(LLOCK); error(locknum ? "Too many hacks running now." - : "There is a game in progress under your name."); + : "There is a game in progress under your name."); gotlock: fd = creat(lock, FMASK); - if(unlink(LLOCK) == -1) + if (unlink(LLOCK) == -1) error("Cannot unlink %s.", LLOCK); - if(fd == -1) { + if (fd == -1) { error("cannot creat lock file."); } else { - if(write(fd, (char *) &hackpid, sizeof(hackpid)) - != sizeof(hackpid)){ + if (write(fd, (char *) &hackpid, sizeof(hackpid)) + != sizeof(hackpid)) { error("cannot write lock"); } - if(close(fd) == -1) { + if (close(fd) == -1) { error("cannot close lock"); } } -} +} #ifdef MAIL @@ -284,151 +315,165 @@ gotlock: * - Do something to the text when the scroll is enchanted or cancelled. */ #include "def.mkroom.h" -static struct stat omstat,nmstat; -static char *mailbox; -static long laststattime; +static struct stat omstat, nmstat; +static char *mailbox; +static long laststattime; -getmailstatus() { - if(!(mailbox = getenv("MAIL"))) +void +getmailstatus() +{ + if (!(mailbox = getenv("MAIL"))) return; - if(stat(mailbox, &omstat)){ + if (stat(mailbox, &omstat)) { #ifdef PERMANENT_MAILBOX pline("Cannot get status of MAIL=%s .", mailbox); mailbox = 0; #else omstat.st_mtime = 0; -#endif PERMANENT_MAILBOX +#endif /* PERMANENT_MAILBOX */ } } -ckmailstatus() { - if(!mailbox +void +ckmailstatus() +{ + if (!mailbox #ifdef MAILCKFREQ - || moves < laststattime + MAILCKFREQ -#endif MAILCKFREQ - ) + || moves < laststattime + MAILCKFREQ +#endif /* MAILCKFREQ */ + ) return; laststattime = moves; - if(stat(mailbox, &nmstat)){ + if (stat(mailbox, &nmstat)) { #ifdef PERMANENT_MAILBOX pline("Cannot get status of MAIL=%s anymore.", mailbox); mailbox = 0; #else nmstat.st_mtime = 0; -#endif PERMANENT_MAILBOX - } else if(nmstat.st_mtime > omstat.st_mtime) { - if(nmstat.st_size) +#endif /* PERMANENT_MAILBOX */ + } else if (nmstat.st_mtime > omstat.st_mtime) { + if (nmstat.st_size) newmail(); - getmailstatus(); /* might be too late ... */ + getmailstatus();/* might be too late ... */ } } -newmail() { +void +newmail() +{ /* produce a scroll of mail */ - register struct obj *obj; - register struct monst *md; - extern char plname[]; - extern struct obj *mksobj(), *addinv(); - extern struct monst *makemon(); - extern struct permonst pm_mail_daemon; + struct obj *obj; + struct monst *md; obj = mksobj(SCR_MAIL); - if(md = makemon(&pm_mail_daemon, u.ux, u.uy)) /* always succeeds */ - mdrush(md,0); + if (md = makemon(&pm_mail_daemon, u.ux, u.uy)) /* always succeeds */ + mdrush(md, 0); pline("\"Hello, %s! I have some mail for you.\"", plname); - if(md) { - if(dist(md->mx,md->my) > 2) + if (md) { + if (dist(md->mx, md->my) > 2) pline("\"Catch!\""); more(); /* let him disappear again */ - mdrush(md,1); + mdrush(md, 1); mondead(md); } - obj = addinv(obj); - (void) identify(obj); /* set known and do prinv() */ + (void) identify(obj); /* set known and do prinv() */ } /* make md run through the cave */ -mdrush(md,away) -register struct monst *md; -boolean away; +void +mdrush(md, away) + struct monst *md; + boolean away; { - register int uroom = inroom(u.ux, u.uy); - if(uroom >= 0) { - register int tmp = rooms[uroom].fdoor; - register int cnt = rooms[uroom].doorct; - register int fx = u.ux, fy = u.uy; - while(cnt--) { - if(dist(fx,fy) < dist(doors[tmp].x, doors[tmp].y)){ + int uroom = inroom(u.ux, u.uy); + if (uroom >= 0) { + int tmp = rooms[uroom].fdoor; + int cnt = rooms[uroom].doorct; + int fx = u.ux, fy = u.uy; + while (cnt--) { + if (dist(fx, fy) < dist(doors[tmp].x, doors[tmp].y)) { fx = doors[tmp].x; fy = doors[tmp].y; } tmp++; } tmp_at(-1, md->data->mlet); /* open call */ - if(away) { /* interchange origin and destination */ + if (away) { /* interchange origin and destination */ unpmon(md); - tmp = fx; fx = md->mx; md->mx = tmp; - tmp = fy; fy = md->my; md->my = tmp; + tmp = fx; + fx = md->mx; + md->mx = tmp; + tmp = fy; + fy = md->my; + md->my = tmp; } - while(fx != md->mx || fy != md->my) { - register int dx,dy,nfx = fx,nfy = fy,d1,d2; - - tmp_at(fx,fy); - d1 = DIST(fx,fy,md->mx,md->my); - for(dx = -1; dx <= 1; dx++) for(dy = -1; dy <= 1; dy++) - if(dx || dy) { - d2 = DIST(fx+dx,fy+dy,md->mx,md->my); - if(d2 < d1) { - d1 = d2; - nfx = fx+dx; - nfy = fy+dy; - } - } - if(nfx != fx || nfy != fy) { - fx = nfx; - fy = nfy; + while (fx != md->mx || fy != md->my) { + int dx, dy, nfx = fx, nfy = fy, d1, + d2; + + tmp_at(fx, fy); + d1 = DIST(fx, fy, md->mx, md->my); + for (dx = -1; dx <= 1; dx++) + for (dy = -1; dy <= 1; dy++) + if (dx || dy) { + d2 = DIST(fx + dx, fy + dy, md->mx, md->my); + if (d2 < d1) { + d1 = d2; + nfx = fx + dx; + nfy = fy + dy; + } + } + if (nfx != fx || nfy != fy) { + fx = nfx; + fy = nfy; } else { - if(!away) { - md->mx = fx; - md->my = fy; - } - break; - } + if (!away) { + md->mx = fx; + md->my = fy; + } + break; + } } - tmp_at(-1,-1); /* close call */ + tmp_at(-1, -1); /* close call */ } - if(!away) + if (!away) pmon(md); } -readmail() { -#ifdef DEF_MAILREADER /* This implies that UNIX is defined */ - register char *mr = 0; +void +readmail() +{ +#ifdef DEF_MAILREADER /* This implies that UNIX is defined */ + char *mr = 0; more(); - if(!(mr = getenv("MAILREADER"))) + if (!(mr = getenv("MAILREADER"))) mr = DEF_MAILREADER; - if(child(1)){ + if (child(1)) { execl(mr, mr, (char *) 0); exit(1); } -#else DEF_MAILREADER +#else /* DEF_MAILREADER */ (void) page_file(mailbox, FALSE); -#endif DEF_MAILREADER - /* get new stat; not entirely correct: there is a small time - window where we do not see new mail */ +#endif /* DEF_MAILREADER */ + /* + * get new stat; not entirely correct: there is a small time window + * where we do not see new mail + */ getmailstatus(); } -#endif MAIL +#endif /* MAIL */ -regularize(s) /* normalize file name - we don't like ..'s or /'s */ -register char *s; +void +regularize(s) /* normalize file name - we don't like ..'s + * or /'s */ + char *s; { - register char *lp; + char *lp; - while((lp = index(s, '.')) || (lp = index(s, '/'))) + while ((lp = strchr(s, '.')) || (lp = strchr(s, '/'))) *lp = '_'; } diff --git a/hack/hack.vault.c b/hack/hack.vault.c index 4564d974..8717674f 100644 --- a/hack/hack.vault.c +++ b/hack/hack.vault.c @@ -1,59 +1,82 @@ +/* $NetBSD: hack.vault.c,v 1.4 1997/10/19 16:59:23 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.vault.c,v 1.3 1995/03/23 08:31:59 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.vault.c,v 1.4 1997/10/19 16:59:23 christos Exp $"); +#endif /* not lint */ -#include "hack.h" +#include "hack.h" +#include "extern.h" #ifdef QUEST -setgd(/* mtmp */) /* struct monst *mtmp; */ {} -gd_move() { return(2); } -gddead(mtmp) struct monst *mtmp; {} -replgd(mtmp,mtmp2) struct monst *mtmp, *mtmp2; {} -invault(){} +void +setgd( /* mtmp */ ) +{ /* struct monst *mtmp; */ +} +int +gd_move() { + return (2); +} +void +gddead() +{ +} +void +replgd(mtmp, mtmp2) + struct monst *mtmp, *mtmp2; +{ +} +void +invault() +{ +} #else #include "def.mkroom.h" -extern struct monst *makemon(); #define FCSIZ (ROWNO+COLNO) struct fakecorridor { - xchar fx,fy,ftyp; + xchar fx, fy, ftyp; }; struct egd { - int fcbeg, fcend; /* fcend: first unused pos */ - xchar gdx, gdy; /* goal of guard's walk */ - unsigned gddone:1; + int fcbeg, fcend; /* fcend: first unused pos */ + xchar gdx, gdy; /* goal of guard's walk */ + unsigned gddone:1; struct fakecorridor fakecorr[FCSIZ]; }; static struct permonst pm_guard = - { "guard", '@', 12, 12, -1, 4, 10, sizeof(struct egd) }; +{"guard", '@', 12, 12, -1, 4, 10, sizeof(struct egd)}; static struct monst *guard; -static int gdlevel; +static int gdlevel; #define EGD ((struct egd *)(&(guard->mextra[0]))) -static +static void restfakecorr __P((void)); +static int goldincorridor __P((void)); + +static void restfakecorr() { - register fcx,fcy,fcbeg; - register struct rm *crm; + int fcx, fcy, fcbeg; + struct rm *crm; - while((fcbeg = EGD->fcbeg) < EGD->fcend) { + while ((fcbeg = EGD->fcbeg) < EGD->fcend) { fcx = EGD->fakecorr[fcbeg].fx; fcy = EGD->fakecorr[fcbeg].fy; - if((u.ux == fcx && u.uy == fcy) || cansee(fcx,fcy) || - m_at(fcx,fcy)) + if ((u.ux == fcx && u.uy == fcy) || cansee(fcx, fcy) || + m_at(fcx, fcy)) return; crm = &levl[fcx][fcy]; crm->typ = EGD->fakecorr[fcbeg].ftyp; - if(!crm->typ) crm->seen = 0; - newsym(fcx,fcy); + if (!crm->typ) + crm->seen = 0; + newsym(fcx, fcy); EGD->fcbeg++; } /* it seems he left the corridor - let the guard disappear */ @@ -61,169 +84,197 @@ restfakecorr() guard = 0; } -static +static int goldincorridor() { - register int fci; + int fci; - for(fci = EGD->fcbeg; fci < EGD->fcend; fci++) - if(g_at(EGD->fakecorr[fci].fx, EGD->fakecorr[fci].fy)) - return(1); - return(0); + for (fci = EGD->fcbeg; fci < EGD->fcend; fci++) + if (g_at(EGD->fakecorr[fci].fx, EGD->fakecorr[fci].fy)) + return (1); + return (0); } -setgd(){ -register struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) if(mtmp->isgd){ - guard = mtmp; - gdlevel = dlevel; - return; - } +void +setgd() +{ + struct monst *mtmp; + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->isgd) { + guard = mtmp; + gdlevel = dlevel; + return; + } guard = 0; } -invault(){ -register tmp = inroom(u.ux, u.uy); - if(tmp < 0 || rooms[tmp].rtype != VAULT) { - u.uinvault = 0; - return; - } - if(++u.uinvault % 50 == 0 && (!guard || gdlevel != dlevel)) { - char buf[BUFSZ]; - register x,y,dd,gx,gy; - - /* first find the goal for the guard */ - for(dd = 1; (dd < ROWNO || dd < COLNO); dd++) { - for(y = u.uy-dd; y <= u.uy+dd; y++) { - if(y < 0 || y > ROWNO-1) continue; - for(x = u.ux-dd; x <= u.ux+dd; x++) { - if(y != u.uy-dd && y != u.uy+dd && x != u.ux-dd) - x = u.ux+dd; - if(x < 0 || x > COLNO-1) continue; - if(levl[x][y].typ == CORR) goto fnd; - } - } +void +invault() +{ + int tmp = inroom(u.ux, u.uy); + if (tmp < 0 || rooms[tmp].rtype != VAULT) { + u.uinvault = 0; + return; } - impossible("Not a single corridor on this level??"); - tele(); - return; -fnd: - gx = x; gy = y; + if (++u.uinvault % 50 == 0 && (!guard || gdlevel != dlevel)) { + char buf[BUFSZ]; + int x, y, dd, gx, gy; - /* next find a good place for a door in the wall */ - x = u.ux; y = u.uy; - while(levl[x][y].typ == ROOM) { - register int dx,dy; + /* first find the goal for the guard */ + for (dd = 1; (dd < ROWNO || dd < COLNO); dd++) { + for (y = u.uy - dd; y <= u.uy + dd; y++) { + if (y < 0 || y > ROWNO - 1) + continue; + for (x = u.ux - dd; x <= u.ux + dd; x++) { + if (y != u.uy - dd && y != u.uy + dd && x != u.ux - dd) + x = u.ux + dd; + if (x < 0 || x > COLNO - 1) + continue; + if (levl[x][y].typ == CORR) + goto fnd; + } + } + } + impossible("Not a single corridor on this level??"); + tele(); + return; +fnd: + gx = x; + gy = y; - dx = (gx > x) ? 1 : (gx < x) ? -1 : 0; - dy = (gy > y) ? 1 : (gy < y) ? -1 : 0; - if(abs(gx-x) >= abs(gy-y)) - x += dx; - else - y += dy; - } + /* next find a good place for a door in the wall */ + x = u.ux; + y = u.uy; + while (levl[x][y].typ == ROOM) { + int dx, dy; - /* make something interesting happen */ - if(!(guard = makemon(&pm_guard,x,y))) return; - guard->isgd = guard->mpeaceful = 1; - EGD->gddone = 0; - gdlevel = dlevel; - if(!cansee(guard->mx, guard->my)) { - mondead(guard); - guard = 0; - return; - } + dx = (gx > x) ? 1 : (gx < x) ? -1 : 0; + dy = (gy > y) ? 1 : (gy < y) ? -1 : 0; + if (abs(gx - x) >= abs(gy - y)) + x += dx; + else + y += dy; + } - pline("Suddenly one of the Vault's guards enters!"); - pmon(guard); - do { - pline("\"Hello stranger, who are you?\" - "); - getlin(buf); - } while (!letter(buf[0])); + /* make something interesting happen */ + if (!(guard = makemon(&pm_guard, x, y))) + return; + guard->isgd = guard->mpeaceful = 1; + EGD->gddone = 0; + gdlevel = dlevel; + if (!cansee(guard->mx, guard->my)) { + mondead(guard); + guard = 0; + return; + } + pline("Suddenly one of the Vault's guards enters!"); + pmon(guard); + do { + pline("\"Hello stranger, who are you?\" - "); + getlin(buf); + } while (!letter(buf[0])); - if(!strcmp(buf, "Croesus") || !strcmp(buf, "Kroisos")) { - pline("\"Oh, yes - of course. Sorry to have disturbed you.\""); - mondead(guard); - guard = 0; - return; - } - clrlin(); - pline("\"I don't know you.\""); - if(!u.ugold) - pline("\"Please follow me.\""); - else { - pline("\"Most likely all that gold was stolen from this vault.\""); - pline("\"Please drop your gold (say d$ ) and follow me.\""); + if (!strcmp(buf, "Croesus") || !strcmp(buf, "Kroisos")) { + pline("\"Oh, yes - of course. Sorry to have disturbed you.\""); + mondead(guard); + guard = 0; + return; + } + clrlin(); + pline("\"I don't know you.\""); + if (!u.ugold) + pline("\"Please follow me.\""); + else { + pline("\"Most likely all that gold was stolen from this vault.\""); + pline("\"Please drop your gold (say d$ ) and follow me.\""); + } + EGD->gdx = gx; + EGD->gdy = gy; + EGD->fcbeg = 0; + EGD->fakecorr[0].fx = x; + EGD->fakecorr[0].fy = y; + EGD->fakecorr[0].ftyp = levl[x][y].typ; + levl[x][y].typ = DOOR; + EGD->fcend = 1; } - EGD->gdx = gx; - EGD->gdy = gy; - EGD->fcbeg = 0; - EGD->fakecorr[0].fx = x; - EGD->fakecorr[0].fy = y; - EGD->fakecorr[0].ftyp = levl[x][y].typ; - levl[x][y].typ = DOOR; - EGD->fcend = 1; - } } -gd_move(){ -register int x,y,dx,dy,gx,gy,nx,ny,typ; -register struct fakecorridor *fcp; -register struct rm *crm; - if(!guard || gdlevel != dlevel){ +int +gd_move() +{ + int x, y, dx, dy, gx, gy, nx, ny, typ; + struct fakecorridor *fcp; + struct rm *crm; + if (!guard || gdlevel != dlevel) { impossible("Where is the guard?"); - return(2); /* died */ + return (2); /* died */ } - if(u.ugold || goldincorridor()) - return(0); /* didnt move */ - if(dist(guard->mx,guard->my) > 1 || EGD->gddone) { + if (u.ugold || goldincorridor()) + return (0); /* didnt move */ + if (dist(guard->mx, guard->my) > 1 || EGD->gddone) { restfakecorr(); - return(0); /* didnt move */ + return (0); /* didnt move */ } x = guard->mx; y = guard->my; /* look around (hor & vert only) for accessible places */ - for(nx = x-1; nx <= x+1; nx++) for(ny = y-1; ny <= y+1; ny++) { - if(nx == x || ny == y) if(nx != x || ny != y) - if(isok(nx,ny)) - if(!IS_WALL(typ = (crm = &levl[nx][ny])->typ) && typ != POOL) { - register int i; - for(i = EGD->fcbeg; i < EGD->fcend; i++) - if(EGD->fakecorr[i].fx == nx && - EGD->fakecorr[i].fy == ny) - goto nextnxy; - if((i = inroom(nx,ny)) >= 0 && rooms[i].rtype == VAULT) - goto nextnxy; - /* seems we found a good place to leave him alone */ - EGD->gddone = 1; - if(ACCESSIBLE(typ)) goto newpos; - crm->typ = (typ == SCORR) ? CORR : DOOR; - goto proceed; - } - nextnxy: ; - } + for (nx = x - 1; nx <= x + 1; nx++) + for (ny = y - 1; ny <= y + 1; ny++) { + if (nx == x || ny == y) + if (nx != x || ny != y) + if (isok(nx, ny)) + if (!IS_WALL(typ = (crm = &levl[nx][ny])->typ) && typ != POOL) { + int i; + for (i = EGD->fcbeg; i < EGD->fcend; i++) + if (EGD->fakecorr[i].fx == nx && + EGD->fakecorr[i].fy == ny) + goto nextnxy; + if ((i = inroom(nx, ny)) >= 0 && rooms[i].rtype == VAULT) + goto nextnxy; + /* + * seems we found a + * good place to + * leave him alone + */ + EGD->gddone = 1; + if (ACCESSIBLE(typ)) + goto newpos; + crm->typ = (typ == SCORR) ? CORR : DOOR; + goto proceed; + } + nextnxy: ; + } nx = x; ny = y; gx = EGD->gdx; gy = EGD->gdy; dx = (gx > x) ? 1 : (gx < x) ? -1 : 0; dy = (gy > y) ? 1 : (gy < y) ? -1 : 0; - if(abs(gx-x) >= abs(gy-y)) nx += dx; else ny += dy; + if (abs(gx - x) >= abs(gy - y)) + nx += dx; + else + ny += dy; - while((typ = (crm = &levl[nx][ny])->typ) != 0) { - /* in view of the above we must have IS_WALL(typ) or typ == POOL */ - /* must be a wall here */ - if(isok(nx+nx-x,ny+ny-y) && typ != POOL && - ZAP_POS(levl[nx+nx-x][ny+ny-y].typ)){ + while ((typ = (crm = &levl[nx][ny])->typ) != 0) { + /* + * in view of the above we must have IS_WALL(typ) or typ == + * POOL + */ + /* must be a wall here */ + if (isok(nx + nx - x, ny + ny - y) && typ != POOL && + ZAP_POS(levl[nx + nx - x][ny + ny - y].typ)) { crm->typ = DOOR; goto proceed; } - if(dy && nx != x) { - nx = x; ny = y+dy; + if (dy && nx != x) { + nx = x; + ny = y + dy; continue; } - if(dx && ny != y) { - ny = y; nx = x+dx; dy = 0; + if (dx && ny != y) { + ny = y; + nx = x + dx; + dy = 0; continue; } /* I don't like this, but ... */ @@ -232,33 +283,38 @@ register struct rm *crm; } crm->typ = CORR; proceed: - if(cansee(nx,ny)) { - mnewsym(nx,ny); - prl(nx,ny); + if (cansee(nx, ny)) { + mnewsym(nx, ny); + prl(nx, ny); } fcp = &(EGD->fakecorr[EGD->fcend]); - if(EGD->fcend++ == FCSIZ) panic("fakecorr overflow"); + if (EGD->fcend++ == FCSIZ) + panic("fakecorr overflow"); fcp->fx = nx; fcp->fy = ny; fcp->ftyp = typ; newpos: - if(EGD->gddone) nx = ny = 0; + if (EGD->gddone) + nx = ny = 0; guard->mx = nx; guard->my = ny; pmon(guard); restfakecorr(); - return(1); + return (1); } -gddead(){ +void +gddead() +{ guard = 0; } -replgd(mtmp,mtmp2) -register struct monst *mtmp, *mtmp2; +void +replgd(mtmp, mtmp2) + struct monst *mtmp, *mtmp2; { - if(mtmp == guard) + if (mtmp == guard) guard = mtmp2; } -#endif QUEST +#endif /* QUEST */ diff --git a/hack/hack.version.c b/hack/hack.version.c index 538a0a7e..33a1cd9f 100644 --- a/hack/hack.version.c +++ b/hack/hack.version.c @@ -1,20 +1,27 @@ +/* $NetBSD: hack.version.c,v 1.4 1997/10/19 16:59:25 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.version.c,v 1.3 1995/03/23 08:32:03 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.version.c,v 1.4 1997/10/19 16:59:25 christos Exp $"); +#endif /* not lint */ -#include "date.h" +#include "date.h" +#include "hack.h" +#include "extern.h" -doversion(){ +int +doversion() +{ pline("%s 1.0.3 - last edit %s.", ( #ifdef QUEST - "Quest" + "Quest" #else - "Hack" -#endif QUEST - ), datestring); - return(0); + "Hack" +#endif /* QUEST */ + ), datestring); + return (0); } diff --git a/hack/hack.wield.c b/hack/hack.wield.c index e0f40b64..bd0b8d20 100644 --- a/hack/hack.wield.c +++ b/hack/hack.wield.c @@ -1,57 +1,69 @@ +/* $NetBSD: hack.wield.c,v 1.4 1997/10/19 16:59:27 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.wield.c,v 1.3 1995/03/23 08:32:06 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.wield.c,v 1.4 1997/10/19 16:59:27 christos Exp $"); +#endif /* not lint */ -#include "hack.h" -extern struct obj zeroobj; +#include "hack.h" +#include "extern.h" -setuwep(obj) register struct obj *obj; { +void +setuwep(obj) + struct obj *obj; +{ setworn(obj, W_WEP); } +int dowield() { - register struct obj *wep; - register int res = 0; + struct obj *wep; + int res = 0; multi = 0; - if(!(wep = getobj("#-)", "wield"))) /* nothing */; - else if(uwep == wep) + if (!(wep = getobj("#-)", "wield"))) /* nothing */ + ; + else if (uwep == wep) pline("You are already wielding that!"); - else if(uwep && uwep->cursed) + else if (uwep && uwep->cursed) pline("The %s welded to your hand!", - aobjnam(uwep, "are")); - else if(wep == &zeroobj) { - if(uwep == 0){ + aobjnam(uwep, "are")); + else if (wep == &zeroobj) { + if (uwep == 0) { pline("You are already empty handed."); } else { setuwep((struct obj *) 0); res++; pline("You are empty handed."); } - } else if(uarms && wep->otyp == TWO_HANDED_SWORD) - pline("You cannot wield a two-handed sword and wear a shield."); - else if(wep->owornmask & (W_ARMOR | W_RING)) + } else if (uarms && wep->otyp == TWO_HANDED_SWORD) + pline("You cannot wield a two-handed sword and wear a shield."); + else if (wep->owornmask & (W_ARMOR | W_RING)) pline("You cannot wield that!"); else { setuwep(wep); res++; - if(uwep->cursed) - pline("The %s %s to your hand!", - aobjnam(uwep, "weld"), - (uwep->quan == 1) ? "itself" : "themselves"); /* a3 */ - else prinv(uwep); + if (uwep->cursed) + pline("The %s %s to your hand!", + aobjnam(uwep, "weld"), + (uwep->quan == 1) ? "itself" : "themselves"); /* a3 */ + else + prinv(uwep); } - return(res); + return (res); } -corrode_weapon(){ - if(!uwep || uwep->olet != WEAPON_SYM) return; /* %% */ - if(uwep->rustfree) +void +corrode_weapon() +{ + if (!uwep || uwep->olet != WEAPON_SYM) + return; /* %% */ + if (uwep->rustfree) pline("Your %s not affected.", aobjnam(uwep, "are")); else { pline("Your %s!", aobjnam(uwep, "corrode")); @@ -59,46 +71,46 @@ corrode_weapon(){ } } -chwepon(otmp,amount) -register struct obj *otmp; -register amount; +int +chwepon(otmp, amount) + struct obj *otmp; + int amount; { -register char *color = (amount < 0) ? "black" : "green"; -register char *time; - if(!uwep || uwep->olet != WEAPON_SYM) { + char *color = (amount < 0) ? "black" : "green"; + char *time; + if (!uwep || uwep->olet != WEAPON_SYM) { strange_feeling(otmp, - (amount > 0) ? "Your hands twitch." - : "Your hands itch."); - return(0); + (amount > 0) ? "Your hands twitch." + : "Your hands itch."); + return (0); } - - if(uwep->otyp == WORM_TOOTH && amount > 0) { + if (uwep->otyp == WORM_TOOTH && amount > 0) { uwep->otyp = CRYSKNIFE; pline("Your weapon seems sharper now."); uwep->cursed = 0; - return(1); + return (1); } - - if(uwep->otyp == CRYSKNIFE && amount < 0) { + if (uwep->otyp == CRYSKNIFE && amount < 0) { uwep->otyp = WORM_TOOTH; pline("Your weapon looks duller now."); - return(1); + return (1); } - /* there is a (soft) upper limit to uwep->spe */ - if(amount > 0 && uwep->spe > 5 && rn2(3)) { - pline("Your %s violently green for a while and then evaporate%s.", - aobjnam(uwep, "glow"), plur(uwep->quan)); - while(uwep) /* let all of them disappear */ - /* note: uwep->quan = 1 is nogood if unpaid */ - useup(uwep); - return(1); + if (amount > 0 && uwep->spe > 5 && rn2(3)) { + pline("Your %s violently green for a while and then evaporate%s.", + aobjnam(uwep, "glow"), plur(uwep->quan)); + while (uwep) /* let all of them disappear */ + /* note: uwep->quan = 1 is nogood if unpaid */ + useup(uwep); + return (1); } - if(!rn2(6)) amount *= 2; - time = (amount*amount == 1) ? "moment" : "while"; + if (!rn2(6)) + amount *= 2; + time = (amount * amount == 1) ? "moment" : "while"; pline("Your %s %s for a %s.", - aobjnam(uwep, "glow"), color, time); + aobjnam(uwep, "glow"), color, time); uwep->spe += amount; - if(amount > 0) uwep->cursed = 0; - return(1); + if (amount > 0) + uwep->cursed = 0; + return (1); } diff --git a/hack/hack.wizard.c b/hack/hack.wizard.c index 984c8b63..e26e480d 100644 --- a/hack/hack.wizard.c +++ b/hack/hack.wizard.c @@ -1,194 +1,222 @@ +/* $NetBSD: hack.wizard.c,v 1.4 1997/10/19 16:59:28 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.wizard.c,v 1.3 1995/03/23 08:32:09 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.wizard.c,v 1.4 1997/10/19 16:59:28 christos Exp $"); +#endif /* not lint */ /* wizard code - inspired by rogue code from Merlyn Leroy (digi-g!brian) */ #include "hack.h" -extern struct permonst pm_wizard; -extern struct monst *makemon(); +#include "extern.h" -#define WIZSHOT 6 /* one chance in WIZSHOT that wizard will try magic */ -#define BOLT_LIM 8 /* from this distance D and 1 will try to hit you */ +#define WIZSHOT 6 /* one chance in WIZSHOT that wizard will try + * magic */ +#define BOLT_LIM 8 /* from this distance D and 1 will try to hit + * you */ -char wizapp[] = "@DNPTUVXcemntx"; +char wizapp[] = "@DNPTUVXcemntx"; /* If he has found the Amulet, make the wizard appear after some time */ -amulet(){ - register struct obj *otmp; - register struct monst *mtmp; +void +amulet() +{ + struct obj *otmp; + struct monst *mtmp; - if(!flags.made_amulet || !flags.no_of_wizards) + if (!flags.made_amulet || !flags.no_of_wizards) return; /* find wizard, and wake him if necessary */ - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) - if(mtmp->data->mlet == '1' && mtmp->msleep && !rn2(40)) - for(otmp = invent; otmp; otmp = otmp->nobj) - if(otmp->olet == AMULET_SYM && !otmp->spe) { - mtmp->msleep = 0; - if(dist(mtmp->mx,mtmp->my) > 2) - pline( - "You get the creepy feeling that somebody noticed your taking the Amulet." - ); - return; - } + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) + if (mtmp->data->mlet == '1' && mtmp->msleep && !rn2(40)) + for (otmp = invent; otmp; otmp = otmp->nobj) + if (otmp->olet == AMULET_SYM && !otmp->spe) { + mtmp->msleep = 0; + if (dist(mtmp->mx, mtmp->my) > 2) + pline( + "You get the creepy feeling that somebody noticed your taking the Amulet." + ); + return; + } } +int wiz_hit(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { /* if we have stolen or found the amulet, we disappear */ - if(mtmp->minvent && mtmp->minvent->olet == AMULET_SYM && + if (mtmp->minvent && mtmp->minvent->olet == AMULET_SYM && mtmp->minvent->spe == 0) { /* vanish -- very primitive */ fall_down(mtmp); - return(1); + return (1); } - /* if it is lying around someplace, we teleport to it */ - if(!carrying(AMULET_OF_YENDOR)) { - register struct obj *otmp; - - for(otmp = fobj; otmp; otmp = otmp->nobj) - if(otmp->olet == AMULET_SYM && !otmp->spe) { - if((u.ux != otmp->ox || u.uy != otmp->oy) && - !m_at(otmp->ox, otmp->oy)) { - - /* teleport to it and pick it up */ - mtmp->mx = otmp->ox; - mtmp->my = otmp->oy; - freeobj(otmp); - mpickobj(mtmp, otmp); - pmon(mtmp); - return(0); - } - goto hithim; - } - return(0); /* we don't know where it is */ + if (!carrying(AMULET_OF_YENDOR)) { + struct obj *otmp; + + for (otmp = fobj; otmp; otmp = otmp->nobj) + if (otmp->olet == AMULET_SYM && !otmp->spe) { + if ((u.ux != otmp->ox || u.uy != otmp->oy) && + !m_at(otmp->ox, otmp->oy)) { + + /* teleport to it and pick it up */ + mtmp->mx = otmp->ox; + mtmp->my = otmp->oy; + freeobj(otmp); + mpickobj(mtmp, otmp); + pmon(mtmp); + return (0); + } + goto hithim; + } + return (0); /* we don't know where it is */ } hithim: - if(rn2(2)) { /* hit - perhaps steal */ - - /* if hit 1/20 chance of stealing amulet & vanish - - amulet is on level 26 again. */ - if(hitu(mtmp, d(mtmp->data->damn,mtmp->data->damd)) - && !rn2(20) && stealamulet(mtmp)) - ; - } - else - inrange(mtmp); /* try magic */ - return(0); + if (rn2(2)) { /* hit - perhaps steal */ + + /* + * if hit 1/20 chance of stealing amulet & vanish - amulet is + * on level 26 again. + */ + if (hitu(mtmp, d(mtmp->data->damn, mtmp->data->damd)) + && !rn2(20) && stealamulet(mtmp)); + } else + inrange(mtmp); /* try magic */ + return (0); } +void inrange(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - register schar tx,ty; + schar tx, ty; /* do nothing if cancelled (but make '1' say something) */ - if(mtmp->data->mlet != '1' && mtmp->mcan) + if (mtmp->data->mlet != '1' && mtmp->mcan) return; /* spit fire only when both in a room or both in a corridor */ - if(inroom(u.ux,u.uy) != inroom(mtmp->mx,mtmp->my)) return; + if (inroom(u.ux, u.uy) != inroom(mtmp->mx, mtmp->my)) + return; tx = u.ux - mtmp->mx; ty = u.uy - mtmp->my; - if((!tx && abs(ty) < BOLT_LIM) || (!ty && abs(tx) < BOLT_LIM) - || (abs(tx) == abs(ty) && abs(tx) < BOLT_LIM)){ - switch(mtmp->data->mlet) { - case 'D': - /* spit fire in the direction of @ (not nec. hitting) */ - buzz(-1,mtmp->mx,mtmp->my,sgn(tx),sgn(ty)); - break; - case '1': - if(rn2(WIZSHOT)) break; - /* if you zapped wizard with wand of cancellation, - he has to shake off the effects before he can throw - spells successfully. 1/2 the time they fail anyway */ - if(mtmp->mcan || rn2(2)) { - if(canseemon(mtmp)) - pline("%s makes a gesture, then curses.", - Monnam(mtmp)); - else - pline("You hear mumbled cursing."); - if(!rn2(3)) { - mtmp->mspeed = 0; - mtmp->minvis = 0; - } - if(!rn2(3)) - mtmp->mcan = 0; - } else { - if(canseemon(mtmp)){ - if(!rn2(6) && !Invis) { - pline("%s hypnotizes you.", Monnam(mtmp)); - nomul(rn2(3) + 3); - break; - } else - pline("%s chants an incantation.", - Monnam(mtmp)); - } else - pline("You hear a mumbled incantation."); - switch(rn2(Invis ? 5 : 6)) { - case 0: - /* create a nasty monster from a deep level */ - /* (for the moment, 'nasty' is not implemented) */ - (void) makemon((struct permonst *)0, u.ux, u.uy); - break; - case 1: - pline("\"Destroy the thief, my pets!\""); - aggravate(); /* aggravate all the monsters */ - /* fall into next case */ - case 2: - if (flags.no_of_wizards == 1 && rnd(5) == 0) - /* if only 1 wizard, clone himself */ - clonewiz(mtmp); - break; - case 3: - if(mtmp->mspeed == MSLOW) - mtmp->mspeed = 0; - else - mtmp->mspeed = MFAST; - break; - case 4: - mtmp->minvis = 1; - break; - case 5: - /* Only if not Invisible */ - pline("You hear a clap of thunder!"); - /* shoot a bolt of fire or cold, or a sleep ray */ - buzz(-rnd(3),mtmp->mx,mtmp->my,sgn(tx),sgn(ty)); + if ((!tx && abs(ty) < BOLT_LIM) || (!ty && abs(tx) < BOLT_LIM) + || (abs(tx) == abs(ty) && abs(tx) < BOLT_LIM)) { + switch (mtmp->data->mlet) { + case 'D': + /* spit fire in the direction of @ (not nec. hitting) */ + buzz(-1, mtmp->mx, mtmp->my, sgn(tx), sgn(ty)); break; - } + case '1': + if (rn2(WIZSHOT)) + break; + /* + * if you zapped wizard with wand of cancellation, he + * has to shake off the effects before he can throw + * spells successfully. 1/2 the time they fail + * anyway + */ + if (mtmp->mcan || rn2(2)) { + if (canseemon(mtmp)) + pline("%s makes a gesture, then curses.", + Monnam(mtmp)); + else + pline("You hear mumbled cursing."); + if (!rn2(3)) { + mtmp->mspeed = 0; + mtmp->minvis = 0; + } + if (!rn2(3)) + mtmp->mcan = 0; + } else { + if (canseemon(mtmp)) { + if (!rn2(6) && !Invis) { + pline("%s hypnotizes you.", Monnam(mtmp)); + nomul(rn2(3) + 3); + break; + } else + pline("%s chants an incantation.", + Monnam(mtmp)); + } else + pline("You hear a mumbled incantation."); + switch (rn2(Invis ? 5 : 6)) { + case 0: + /* + * create a nasty monster from a deep + * level + */ + /* + * (for the moment, 'nasty' is not + * implemented) + */ + (void) makemon((struct permonst *) 0, u.ux, u.uy); + break; + case 1: + pline("\"Destroy the thief, my pets!\""); + aggravate(); /* aggravate all the + * monsters */ + /* fall into next case */ + case 2: + if (flags.no_of_wizards == 1 && rnd(5) == 0) + /* + * if only 1 wizard, clone + * himself + */ + clonewiz(mtmp); + break; + case 3: + if (mtmp->mspeed == MSLOW) + mtmp->mspeed = 0; + else + mtmp->mspeed = MFAST; + break; + case 4: + mtmp->minvis = 1; + break; + case 5: + /* Only if not Invisible */ + pline("You hear a clap of thunder!"); + /* + * shoot a bolt of fire or cold, or a + * sleep ray + */ + buzz(-rnd(3), mtmp->mx, mtmp->my, sgn(tx), sgn(ty)); + break; + } + } } - } - if(u.uhp < 1) done_in_by(mtmp); + if (u.uhp < 1) + done_in_by(mtmp); } } +void aggravate() { - register struct monst *mtmp; + struct monst *mtmp; - for(mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { mtmp->msleep = 0; - if(mtmp->mfroz && !rn2(5)) + if (mtmp->mfroz && !rn2(5)) mtmp->mfroz = 0; } } +void clonewiz(mtmp) -register struct monst *mtmp; + struct monst *mtmp; { - register struct monst *mtmp2; + struct monst *mtmp2; - if(mtmp2 = makemon(PM_WIZARD, mtmp->mx, mtmp->my)) { + if ((mtmp2 = makemon(PM_WIZARD, mtmp->mx, mtmp->my)) != NULL) { flags.no_of_wizards = 2; unpmon(mtmp2); - mtmp2->mappearance = wizapp[rn2(sizeof(wizapp)-1)]; + mtmp2->mappearance = wizapp[rn2(sizeof(wizapp) - 1)]; pmon(mtmp); } } diff --git a/hack/hack.worm.c b/hack/hack.worm.c index 1849e387..f48dbdc8 100644 --- a/hack/hack.worm.c +++ b/hack/hack.worm.c @@ -1,59 +1,78 @@ +/* $NetBSD: hack.worm.c,v 1.4 1997/10/19 16:59:30 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.worm.c,v 1.3 1995/03/23 08:32:12 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.worm.c,v 1.4 1997/10/19 16:59:30 christos Exp $"); +#endif /* not lint */ +#include <stdlib.h> #include "hack.h" +#include "extern.h" #ifndef NOWORM #include "def.wseg.h" -struct wseg *wsegs[32]; /* linked list, tail first */ -struct wseg *wheads[32]; -long wgrowtime[32]; +struct wseg *wsegs[32]; /* linked list, tail first */ +struct wseg *wheads[32]; +long wgrowtime[32]; -getwn(mtmp) struct monst *mtmp; { -register tmp; - for(tmp=1; tmp<32; tmp++) if(!wsegs[tmp]) { - mtmp->wormno = tmp; - return(1); - } - return(0); /* level infested with worms */ +int +getwn(mtmp) + struct monst *mtmp; +{ + int tmp; + for (tmp = 1; tmp < 32; tmp++) + if (!wsegs[tmp]) { + mtmp->wormno = tmp; + return (1); + } + return (0); /* level infested with worms */ } /* called to initialize a worm unless cut in half */ -initworm(mtmp) struct monst *mtmp; { -register struct wseg *wtmp; -register tmp = mtmp->wormno; - if(!tmp) return; +void +initworm(mtmp) + struct monst *mtmp; +{ + struct wseg *wtmp; + int tmp = mtmp->wormno; + if (!tmp) + return; wheads[tmp] = wsegs[tmp] = wtmp = newseg(); wgrowtime[tmp] = 0; wtmp->wx = mtmp->mx; wtmp->wy = mtmp->my; -/* wtmp->wdispl = 0; */ + /* wtmp->wdispl = 0; */ wtmp->nseg = 0; } -worm_move(mtmp) struct monst *mtmp; { -register struct wseg *wtmp, *whd; -register tmp = mtmp->wormno; +void +worm_move(mtmp) + struct monst *mtmp; +{ + struct wseg *wtmp, *whd = NULL; + int tmp = mtmp->wormno; wtmp = newseg(); wtmp->wx = mtmp->mx; wtmp->wy = mtmp->my; wtmp->nseg = 0; -/* wtmp->wdispl = 0; */ + /* wtmp->wdispl = 0; */ (whd = wheads[tmp])->nseg = wtmp; wheads[tmp] = wtmp; - if(cansee(whd->wx,whd->wy)){ + if (cansee(whd->wx, whd->wy)) { unpmon(mtmp); atl(whd->wx, whd->wy, '~'); whd->wdispl = 1; - } else whd->wdispl = 0; - if(wgrowtime[tmp] <= moves) { - if(!wgrowtime[tmp]) wgrowtime[tmp] = moves + rnd(5); - else wgrowtime[tmp] += 2+rnd(15); + } else + whd->wdispl = 0; + if (wgrowtime[tmp] <= moves) { + if (!wgrowtime[tmp]) + wgrowtime[tmp] = moves + rnd(5); + else + wgrowtime[tmp] += 2 + rnd(15); mtmp->mhpmax += 3; mtmp->mhp += 3; return; @@ -63,87 +82,110 @@ register tmp = mtmp->wormno; remseg(whd); } -worm_nomove(mtmp) register struct monst *mtmp; { -register tmp; -register struct wseg *wtmp; +void +worm_nomove(mtmp) + struct monst *mtmp; +{ + int tmp; + struct wseg *wtmp; tmp = mtmp->wormno; wtmp = wsegs[tmp]; - if(wtmp == wheads[tmp]) return; - if(wtmp == 0 || wtmp->nseg == 0) panic("worm_nomove?"); + if (wtmp == wheads[tmp]) + return; + if (wtmp == 0 || wtmp->nseg == 0) + panic("worm_nomove?"); wsegs[tmp] = wtmp->nseg; remseg(wtmp); - mtmp->mhp -= 3; /* mhpmax not changed ! */ + mtmp->mhp -= 3; /* mhpmax not changed ! */ } -wormdead(mtmp) register struct monst *mtmp; { -register tmp = mtmp->wormno; -register struct wseg *wtmp, *wtmp2; - if(!tmp) return; +void +wormdead(mtmp) + struct monst *mtmp; +{ + int tmp = mtmp->wormno; + struct wseg *wtmp, *wtmp2; + if (!tmp) + return; mtmp->wormno = 0; - for(wtmp = wsegs[tmp]; wtmp; wtmp = wtmp2){ + for (wtmp = wsegs[tmp]; wtmp; wtmp = wtmp2) { wtmp2 = wtmp->nseg; remseg(wtmp); } wsegs[tmp] = 0; } -wormhit(mtmp) register struct monst *mtmp; { -register tmp = mtmp->wormno; -register struct wseg *wtmp; - if(!tmp) return; /* worm without tail */ - for(wtmp = wsegs[tmp]; wtmp; wtmp = wtmp->nseg) - (void) hitu(mtmp,1); +void +wormhit(mtmp) + struct monst *mtmp; +{ + int tmp = mtmp->wormno; + struct wseg *wtmp; + if (!tmp) + return; /* worm without tail */ + for (wtmp = wsegs[tmp]; wtmp; wtmp = wtmp->nseg) + (void) hitu(mtmp, 1); } -wormsee(tmp) register unsigned tmp; { -register struct wseg *wtmp = wsegs[tmp]; - if(!wtmp) panic("wormsee: wtmp==0"); - for(; wtmp->nseg; wtmp = wtmp->nseg) - if(!cansee(wtmp->wx,wtmp->wy) && wtmp->wdispl){ +void +wormsee(tmp) + unsigned tmp; +{ + struct wseg *wtmp = wsegs[tmp]; + if (!wtmp) + panic("wormsee: wtmp==0"); + for (; wtmp->nseg; wtmp = wtmp->nseg) + if (!cansee(wtmp->wx, wtmp->wy) && wtmp->wdispl) { newsym(wtmp->wx, wtmp->wy); wtmp->wdispl = 0; } } -pwseg(wtmp) register struct wseg *wtmp; { - if(!wtmp->wdispl){ +void +pwseg(wtmp) + struct wseg *wtmp; +{ + if (!wtmp->wdispl) { atl(wtmp->wx, wtmp->wy, '~'); wtmp->wdispl = 1; } } -cutworm(mtmp,x,y,weptyp) -register struct monst *mtmp; -register xchar x,y; -register uchar weptyp; /* uwep->otyp or 0 */ +void +cutworm(mtmp, x, y, weptyp) + struct monst *mtmp; + xchar x, y; + uchar weptyp; /* uwep->otyp or 0 */ { - register struct wseg *wtmp, *wtmp2; - register struct monst *mtmp2; - register tmp,tmp2; - if(mtmp->mx == x && mtmp->my == y) return; /* hit headon */ + struct wseg *wtmp, *wtmp2; + struct monst *mtmp2; + int tmp, tmp2; + if (mtmp->mx == x && mtmp->my == y) + return; /* hit headon */ /* cutting goes best with axe or sword */ tmp = rnd(20); - if(weptyp == LONG_SWORD || weptyp == TWO_HANDED_SWORD || - weptyp == AXE) tmp += 5; - if(tmp < 12) return; + if (weptyp == LONG_SWORD || weptyp == TWO_HANDED_SWORD || + weptyp == AXE) + tmp += 5; + if (tmp < 12) + return; /* if tail then worm just loses a tail segment */ tmp = mtmp->wormno; wtmp = wsegs[tmp]; - if(wtmp->wx == x && wtmp->wy == y){ + if (wtmp->wx == x && wtmp->wy == y) { wsegs[tmp] = wtmp->nseg; remseg(wtmp); return; } - /* cut the worm in two halves */ mtmp2 = newmonst(0); *mtmp2 = *mtmp; mtmp2->mxlth = mtmp2->mnamelth = 0; /* sometimes the tail end dies */ - if(rn2(3) || !getwn(mtmp2)){ + if (rn2(3) || !getwn(mtmp2)) { monfree(mtmp2); tmp2 = 0; } else { @@ -152,12 +194,13 @@ register uchar weptyp; /* uwep->otyp or 0 */ wgrowtime[tmp2] = 0; } do { - if(wtmp->nseg->wx == x && wtmp->nseg->wy == y){ - if(tmp2) wheads[tmp2] = wtmp; + if (wtmp->nseg->wx == x && wtmp->nseg->wy == y) { + if (tmp2) + wheads[tmp2] = wtmp; wsegs[tmp] = wtmp->nseg->nseg; remseg(wtmp->nseg); wtmp->nseg = 0; - if(tmp2){ + if (tmp2) { pline("You cut the worm in half."); mtmp2->mhpmax = mtmp2->mhp = d(mtmp2->data->mlevel, 8); @@ -174,15 +217,19 @@ register uchar weptyp; /* uwep->otyp or 0 */ return; } wtmp2 = wtmp->nseg; - if(!tmp2) remseg(wtmp); + if (!tmp2) + remseg(wtmp); wtmp = wtmp2; - } while(wtmp->nseg); + } while (wtmp->nseg); panic("Cannot find worm segment"); } -remseg(wtmp) register struct wseg *wtmp; { - if(wtmp->wdispl) +void +remseg(wtmp) + struct wseg *wtmp; +{ + if (wtmp->wdispl) newsym(wtmp->wx, wtmp->wy); free((char *) wtmp); } -#endif NOWORM +#endif /* NOWORM */ diff --git a/hack/hack.worn.c b/hack/hack.worn.c index 6dd5c2b1..3a8c8ae9 100644 --- a/hack/hack.worn.c +++ b/hack/hack.worn.c @@ -1,52 +1,82 @@ +/* $NetBSD: hack.worn.c,v 1.4 1997/10/19 16:59:32 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.worn.c,v 1.3 1995/03/23 08:32:17 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.worn.c,v 1.4 1997/10/19 16:59:32 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" struct worn { - long w_mask; - struct obj **w_obj; -} worn[] = { - { W_ARM, &uarm }, - { W_ARM2, &uarm2 }, - { W_ARMH, &uarmh }, - { W_ARMS, &uarms }, - { W_ARMG, &uarmg }, - { W_RINGL, &uleft }, - { W_RINGR, &uright }, - { W_WEP, &uwep }, - { W_BALL, &uball }, - { W_CHAIN, &uchain }, - { 0, 0 } + long w_mask; + struct obj **w_obj; +} worn[] = { + { + W_ARM, &uarm + }, + { + W_ARM2, &uarm2 + }, + { + W_ARMH, &uarmh + }, + { + W_ARMS, &uarms + }, + { + W_ARMG, &uarmg + }, + { + W_RINGL, &uleft + }, + { + W_RINGR, &uright + }, + { + W_WEP, &uwep + }, + { + W_BALL, &uball + }, + { + W_CHAIN, &uchain + }, + { + 0, 0 + } }; +void setworn(obj, mask) -register struct obj *obj; -long mask; + struct obj *obj; + long mask; { - register struct worn *wp; - register struct obj *oobj; + struct worn *wp; + struct obj *oobj; - for(wp = worn; wp->w_mask; wp++) if(wp->w_mask & mask) { - oobj = *(wp->w_obj); - if(oobj && !(oobj->owornmask & wp->w_mask)) - impossible("Setworn: mask = %ld.", wp->w_mask); - if(oobj) oobj->owornmask &= ~wp->w_mask; - if(obj && oobj && wp->w_mask == W_ARM){ - if(uarm2) { - impossible("Setworn: uarm2 set?"); - } else - setworn(uarm, W_ARM2); + for (wp = worn; wp->w_mask; wp++) + if (wp->w_mask & mask) { + oobj = *(wp->w_obj); + if (oobj && !(oobj->owornmask & wp->w_mask)) + impossible("Setworn: mask = %ld.", wp->w_mask); + if (oobj) + oobj->owornmask &= ~wp->w_mask; + if (obj && oobj && wp->w_mask == W_ARM) { + if (uarm2) { + impossible("Setworn: uarm2 set?"); + } else + setworn(uarm, W_ARM2); + } + *(wp->w_obj) = obj; + if (obj) + obj->owornmask |= wp->w_mask; } - *(wp->w_obj) = obj; - if(obj) obj->owornmask |= wp->w_mask; - } - if(uarm2 && !uarm) { + if (uarm2 && !uarm) { uarm = uarm2; uarm2 = 0; uarm->owornmask ^= (W_ARM | W_ARM2); @@ -54,15 +84,18 @@ long mask; } /* called e.g. when obj is destroyed */ -setnotworn(obj) register struct obj *obj; { - register struct worn *wp; +void +setnotworn(obj) + struct obj *obj; +{ + struct worn *wp; - for(wp = worn; wp->w_mask; wp++) - if(obj == *(wp->w_obj)) { + for (wp = worn; wp->w_mask; wp++) + if (obj == *(wp->w_obj)) { *(wp->w_obj) = 0; obj->owornmask &= ~wp->w_mask; } - if(uarm2 && !uarm) { + if (uarm2 && !uarm) { uarm = uarm2; uarm2 = 0; uarm->owornmask ^= (W_ARM | W_ARM2); diff --git a/hack/hack.zap.c b/hack/hack.zap.c index a282dc0e..fa17320d 100644 --- a/hack/hack.zap.c +++ b/hack/hack.zap.c @@ -1,19 +1,18 @@ +/* $NetBSD: hack.zap.c,v 1.4 1997/10/19 16:59:34 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: hack.zap.c,v 1.3 1995/03/23 08:32:21 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: hack.zap.c,v 1.4 1997/10/19 16:59:34 christos Exp $"); +#endif /* not lint */ #include "hack.h" +#include "extern.h" -extern struct obj *mkobj_at(); -extern struct monst *makemon(), *mkmon_at(), youmonst; -struct monst *bhit(); -char *exclam(); - -char *fl[]= { +char *fl[] = { "magic missile", "bolt of fire", "sleep ray", @@ -23,19 +22,22 @@ char *fl[]= { /* Routines for IMMEDIATE wands. */ /* bhitm: monster mtmp was hit by the effect of wand otmp */ +void bhitm(mtmp, otmp) -register struct monst *mtmp; -register struct obj *otmp; + struct monst *mtmp; + struct obj *otmp; { wakeup(mtmp); - switch(otmp->otyp) { + switch (otmp->otyp) { case WAN_STRIKING: - if(u.uswallow || rnd(20) < 10+mtmp->data->ac) { - register int tmp = d(2,12); + if (u.uswallow || rnd(20) < 10 + mtmp->data->ac) { + int tmp = d(2, 12); hit("wand", mtmp, exclam(tmp)); mtmp->mhp -= tmp; - if(mtmp->mhp < 1) killed(mtmp); - } else miss("wand", mtmp); + if (mtmp->mhp < 1) + killed(mtmp); + } else + miss("wand", mtmp); break; case WAN_SLOW_MONSTER: mtmp->mspeed = MSLOW; @@ -44,14 +46,16 @@ register struct obj *otmp; mtmp->mspeed = MFAST; break; case WAN_UNDEAD_TURNING: - if(index(UNDEAD,mtmp->data->mlet)) { + if (strchr(UNDEAD, mtmp->data->mlet)) { mtmp->mhp -= rnd(8); - if(mtmp->mhp < 1) killed(mtmp); - else mtmp->mflee = 1; + if (mtmp->mhp < 1) + killed(mtmp); + else + mtmp->mflee = 1; } break; case WAN_POLYMORPH: - if( newcham(mtmp,&mons[rn2(CMNUM)]) ) + if (newcham(mtmp, &mons[rn2(CMNUM)])) objects[otmp->otyp].oc_name_known = 1; break; case WAN_CANCELLATION: @@ -67,330 +71,362 @@ register struct obj *otmp; case WAN_PROBING: mstatusline(mtmp); break; -#endif WAN_PROBING +#endif /* WAN_PROBING */ default: impossible("What an interesting wand (%u)", otmp->otyp); } } -bhito(obj, otmp) /* object obj was hit by the effect of wand otmp */ -register struct obj *obj, *otmp; /* returns TRUE if sth was done */ +int +bhito(obj, otmp) /* object obj was hit by the effect of wand + * otmp */ + struct obj *obj, *otmp; /* returns TRUE if sth was done */ { - register int res = TRUE; + int res = TRUE; - if(obj == uball || obj == uchain) + if (obj == uball || obj == uchain) res = FALSE; else - switch(otmp->otyp) { - case WAN_POLYMORPH: - /* preserve symbol and quantity, but turn rocks into gems */ - mkobj_at((obj->otyp == ROCK || obj->otyp == ENORMOUS_ROCK) - ? GEM_SYM : obj->olet, - obj->ox, obj->oy) -> quan = obj->quan; - delobj(obj); - break; - case WAN_STRIKING: - if(obj->otyp == ENORMOUS_ROCK) - fracture_rock(obj); - else + switch (otmp->otyp) { + case WAN_POLYMORPH: + /* + * preserve symbol and quantity, but turn rocks into + * gems + */ + mkobj_at((obj->otyp == ROCK || obj->otyp == ENORMOUS_ROCK) + ? GEM_SYM : obj->olet, + obj->ox, obj->oy)->quan = obj->quan; + delobj(obj); + break; + case WAN_STRIKING: + if (obj->otyp == ENORMOUS_ROCK) + fracture_rock(obj); + else + res = FALSE; + break; + case WAN_CANCELLATION: + if (obj->spe && obj->olet != AMULET_SYM) { + obj->known = 0; + obj->spe = 0; + } + break; + case WAN_TELEPORTATION: + rloco(obj); + break; + case WAN_MAKE_INVISIBLE: + obj->oinvis = 1; + break; + case WAN_UNDEAD_TURNING: + res = revive(obj); + break; + case WAN_SLOW_MONSTER: /* no effect on objects */ + case WAN_SPEED_MONSTER: +#ifdef WAN_PROBING + case WAN_PROBING: +#endif /* WAN_PROBING */ res = FALSE; - break; - case WAN_CANCELLATION: - if(obj->spe && obj->olet != AMULET_SYM) { - obj->known = 0; - obj->spe = 0; + break; + default: + impossible("What an interesting wand (%u)", otmp->otyp); } - break; - case WAN_TELEPORTATION: - rloco(obj); - break; - case WAN_MAKE_INVISIBLE: - obj->oinvis = 1; - break; - case WAN_UNDEAD_TURNING: - res = revive(obj); - break; - case WAN_SLOW_MONSTER: /* no effect on objects */ - case WAN_SPEED_MONSTER: -#ifdef WAN_PROBING - case WAN_PROBING: -#endif WAN_PROBING - res = FALSE; - break; - default: - impossible("What an interesting wand (%u)", otmp->otyp); - } - return(res); + return (res); } +int dozap() { - register struct obj *obj; - xchar zx,zy; + struct obj *obj; + xchar zx, zy; obj = getobj("/", "zap"); - if(!obj) return(0); - if(obj->spe < 0 || (obj->spe == 0 && rn2(121))) { + if (!obj) + return (0); + if (obj->spe < 0 || (obj->spe == 0 && rn2(121))) { pline("Nothing Happens."); - return(1); + return (1); } - if(obj->spe == 0) + if (obj->spe == 0) pline("You wrest one more spell from the worn-out wand."); - if(!(objects[obj->otyp].bits & NODIR) && !getdir(1)) - return(1); /* make him pay for knowing !NODIR */ + if (!(objects[obj->otyp].bits & NODIR) && !getdir(1)) + return (1); /* make him pay for knowing !NODIR */ obj->spe--; - if(objects[obj->otyp].bits & IMMEDIATE) { - if(u.uswallow) + if (objects[obj->otyp].bits & IMMEDIATE) { + if (u.uswallow) bhitm(u.ustuck, obj); - else if(u.dz) { - if(u.dz > 0) { - register struct obj *otmp = o_at(u.ux, u.uy); - if(otmp) + else if (u.dz) { + if (u.dz > 0) { + struct obj *otmp = o_at(u.ux, u.uy); + if (otmp) (void) bhito(otmp, obj); } } else - (void) bhit(u.dx,u.dy,rn1(8,6),0,bhitm,bhito,obj); + (void) bhit(u.dx, u.dy, rn1(8, 6), 0, bhitm, bhito, obj); } else { - switch(obj->otyp){ + switch (obj->otyp) { case WAN_LIGHT: litroom(TRUE); break; case WAN_SECRET_DOOR_DETECTION: - if(!findit()) return(1); + if (!findit()) + return (1); break; case WAN_CREATE_MONSTER: - { register int cnt = 1; - if(!rn2(23)) cnt += rn2(7) + 1; - while(cnt--) - (void) makemon((struct permonst *) 0, u.ux, u.uy); + { + int cnt = 1; + if (!rn2(23)) + cnt += rn2(7) + 1; + while (cnt--) + (void) makemon((struct permonst *) 0, u.ux, u.uy); } break; case WAN_WISHING: - { char buf[BUFSZ]; - register struct obj *otmp; - extern struct obj *readobjnam(), *addinv(); - if(u.uluck + rn2(5) < 0) { - pline("Unfortunately, nothing happens."); - break; - } - pline("You may wish for an object. What do you want? "); - getlin(buf); - if(buf[0] == '\033') buf[0] = 0; - otmp = readobjnam(buf); - otmp = addinv(otmp); - prinv(otmp); - break; + { + char buf[BUFSZ]; + struct obj *otmp; + if (u.uluck + rn2(5) < 0) { + pline("Unfortunately, nothing happens."); + break; + } + pline("You may wish for an object. What do you want? "); + getlin(buf); + if (buf[0] == '\033') + buf[0] = 0; + otmp = readobjnam(buf); + otmp = addinv(otmp); + prinv(otmp); + break; } case WAN_DIGGING: - /* Original effect (approximately): - * from CORR: dig until we pierce a wall - * from ROOM: piece wall and dig until we reach - * an ACCESSIBLE place. - * Currently: dig for digdepth positions; - * also down on request of Lennart Augustsson. + /* + * Original effect (approximately): from CORR: dig + * until we pierce a wall from ROOM: piece wall and + * dig until we reach an ACCESSIBLE place. Currently: + * dig for digdepth positions; also down on request + * of Lennart Augustsson. */ - { register struct rm *room; - register int digdepth; - if(u.uswallow) { - register struct monst *mtmp = u.ustuck; - - pline("You pierce %s's stomach wall!", - monnam(mtmp)); - mtmp->mhp = 1; /* almost dead */ - unstuck(mtmp); - mnexto(mtmp); - break; - } - if(u.dz) { - if(u.dz < 0) { - pline("You loosen a rock from the ceiling."); - pline("It falls on your head!"); - losehp(1, "falling rock"); - mksobj_at(ROCK, u.ux, u.uy); - fobj->quan = 1; - stackobj(fobj); - if(Invisible) newsym(u.ux, u.uy); - } else { - dighole(); - } - break; - } - zx = u.ux+u.dx; - zy = u.uy+u.dy; - digdepth = 8 + rn2(18); - Tmp_at(-1, '*'); /* open call */ - while(--digdepth >= 0) { - if(!isok(zx,zy)) break; - room = &levl[zx][zy]; - Tmp_at(zx,zy); - if(!xdnstair){ - if(zx < 3 || zx > COLNO-3 || - zy < 3 || zy > ROWNO-3) - break; - if(room->typ == HWALL || - room->typ == VWALL){ - room->typ = ROOM; + { + struct rm *room; + int digdepth; + if (u.uswallow) { + struct monst *mtmp = u.ustuck; + + pline("You pierce %s's stomach wall!", + monnam(mtmp)); + mtmp->mhp = 1; /* almost dead */ + unstuck(mtmp); + mnexto(mtmp); + break; + } + if (u.dz) { + if (u.dz < 0) { + pline("You loosen a rock from the ceiling."); + pline("It falls on your head!"); + losehp(1, "falling rock"); + mksobj_at(ROCK, u.ux, u.uy); + fobj->quan = 1; + stackobj(fobj); + if (Invisible) + newsym(u.ux, u.uy); + } else { + dighole(); + } + break; + } + zx = u.ux + u.dx; + zy = u.uy + u.dy; + digdepth = 8 + rn2(18); + Tmp_at(-1, '*'); /* open call */ + while (--digdepth >= 0) { + if (!isok(zx, zy)) break; + room = &levl[zx][zy]; + Tmp_at(zx, zy); + if (!xdnstair) { + if (zx < 3 || zx > COLNO - 3 || + zy < 3 || zy > ROWNO - 3) + break; + if (room->typ == HWALL || + room->typ == VWALL) { + room->typ = ROOM; + break; + } + } else if (room->typ == HWALL || room->typ == VWALL || + room->typ == SDOOR || room->typ == LDOOR) { + room->typ = DOOR; + digdepth -= 2; + } else if (room->typ == SCORR || !room->typ) { + room->typ = CORR; + digdepth--; } - } else - if(room->typ == HWALL || room->typ == VWALL || - room->typ == SDOOR || room->typ == LDOOR){ - room->typ = DOOR; - digdepth -= 2; - } else - if(room->typ == SCORR || !room->typ) { - room->typ = CORR; - digdepth--; + mnewsym(zx, zy); + zx += u.dx; + zy += u.dy; } - mnewsym(zx,zy); - zx += u.dx; - zy += u.dy; - } - mnewsym(zx,zy); /* not always necessary */ - Tmp_at(-1,-1); /* closing call */ - break; + mnewsym(zx, zy); /* not always necessary */ + Tmp_at(-1, -1); /* closing call */ + break; } default: buzz((int) obj->otyp - WAN_MAGIC_MISSILE, - u.ux, u.uy, u.dx, u.dy); + u.ux, u.uy, u.dx, u.dy); break; } - if(!objects[obj->otyp].oc_name_known) { + if (!objects[obj->otyp].oc_name_known) { objects[obj->otyp].oc_name_known = 1; - more_experienced(0,10); + more_experienced(0, 10); } } - return(1); + return (1); } -char * +char * exclam(force) -register int force; + int force; { /* force == 0 occurs e.g. with sleep ray */ - /* note that large force is usual with wands so that !! would - require information about hand/weapon/wand */ - return( (force < 0) ? "?" : (force <= 4) ? "." : "!" ); + /* + * note that large force is usual with wands so that !! would require + * information about hand/weapon/wand + */ + return ((force < 0) ? "?" : (force <= 4) ? "." : "!"); } -hit(str,mtmp,force) -register char *str; -register struct monst *mtmp; -register char *force; /* usually either "." or "!" */ +void +hit(str, mtmp, force) + char *str; + struct monst *mtmp; + char *force; /* usually either "." or "!" */ { - if(!cansee(mtmp->mx,mtmp->my)) pline("The %s hits it.", str); - else pline("The %s hits %s%s", str, monnam(mtmp), force); + if (!cansee(mtmp->mx, mtmp->my)) + pline("The %s hits it.", str); + else + pline("The %s hits %s%s", str, monnam(mtmp), force); } -miss(str,mtmp) -register char *str; -register struct monst *mtmp; +void +miss(str, mtmp) + char *str; + struct monst *mtmp; { - if(!cansee(mtmp->mx,mtmp->my)) pline("The %s misses it.",str); - else pline("The %s misses %s.",str,monnam(mtmp)); + if (!cansee(mtmp->mx, mtmp->my)) + pline("The %s misses it.", str); + else + pline("The %s misses %s.", str, monnam(mtmp)); } -/* bhit: called when a weapon is thrown (sym = obj->olet) or when an - IMMEDIATE wand is zapped (sym = 0); the weapon falls down at end of - range or when a monster is hit; the monster is returned, and bhitpos - is set to the final position of the weapon thrown; the ray of a wand - may affect several objects and monsters on its path - for each of - these an argument function is called. */ +/* + * bhit: called when a weapon is thrown (sym = obj->olet) or when an + * IMMEDIATE wand is zapped (sym = 0); the weapon falls down at end of range + * or when a monster is hit; the monster is returned, and bhitpos is set to + * the final position of the weapon thrown; the ray of a wand may affect + * several objects and monsters on its path - for each of these an argument + * function is called. + */ /* check !u.uswallow before calling bhit() */ -struct monst * -bhit(ddx,ddy,range,sym,fhitm,fhito,obj) -register int ddx,ddy,range; /* direction and range */ -char sym; /* symbol displayed on path */ -int (*fhitm)(), (*fhito)(); /* fns called when mon/obj hit */ -struct obj *obj; /* 2nd arg to fhitm/fhito */ +struct monst * +bhit(ddx, ddy, range, sym, fhitm, fhito, obj) + int ddx, ddy, range; /* direction and range */ + char sym; /* symbol displayed on path */ + /* fns called when mon/obj hit */ + void (*fhitm) __P((struct monst *, struct obj *)); + int (*fhito) __P((struct obj *, struct obj *)); + struct obj *obj; /* 2nd arg to fhitm/fhito */ { - register struct monst *mtmp; - register struct obj *otmp; - register int typ; + struct monst *mtmp; + struct obj *otmp; + int typ; bhitpos.x = u.ux; bhitpos.y = u.uy; - if(sym) tmp_at(-1, sym); /* open call */ - while(range-- > 0) { + if (sym) + tmp_at(-1, sym);/* open call */ + while (range-- > 0) { bhitpos.x += ddx; bhitpos.y += ddy; typ = levl[bhitpos.x][bhitpos.y].typ; - if(mtmp = m_at(bhitpos.x,bhitpos.y)){ - if(sym) { + if ((mtmp = m_at(bhitpos.x, bhitpos.y)) != NULL) { + if (sym) { tmp_at(-1, -1); /* close call */ - return(mtmp); + return (mtmp); } - (*fhitm)(mtmp, obj); + (*fhitm) (mtmp, obj); range -= 3; } - if(fhito && (otmp = o_at(bhitpos.x,bhitpos.y))){ - if((*fhito)(otmp, obj)) + if (fhito && (otmp = o_at(bhitpos.x, bhitpos.y))) { + if ((*fhito) (otmp, obj)) range--; } - if(!ZAP_POS(typ)) { + if (!ZAP_POS(typ)) { bhitpos.x -= ddx; bhitpos.y -= ddy; break; } - if(sym) tmp_at(bhitpos.x, bhitpos.y); + if (sym) + tmp_at(bhitpos.x, bhitpos.y); } /* leave last symbol unless in a pool */ - if(sym) - tmp_at(-1, (levl[bhitpos.x][bhitpos.y].typ == POOL) ? -1 : 0); - return(0); + if (sym) + tmp_at(-1, (levl[bhitpos.x][bhitpos.y].typ == POOL) ? -1 : 0); + return (0); } -struct monst * -boomhit(dx,dy) { - register int i, ct; - register struct monst *mtmp; - char sym = ')'; - extern schar xdir[], ydir[]; +struct monst * +boomhit(dx, dy) +{ + int i, ct; + struct monst *mtmp; + char sym = ')'; bhitpos.x = u.ux; bhitpos.y = u.uy; - for(i=0; i<8; i++) if(xdir[i] == dx && ydir[i] == dy) break; + for (i = 0; i < 8; i++) + if (xdir[i] == dx && ydir[i] == dy) + break; tmp_at(-1, sym); /* open call */ - for(ct=0; ct<10; ct++) { - if(i == 8) i = 0; + for (ct = 0; ct < 10; ct++) { + if (i == 8) + i = 0; sym = ')' + '(' - sym; - tmp_at(-2, sym); /* change let call */ + tmp_at(-2, sym);/* change let call */ dx = xdir[i]; dy = ydir[i]; bhitpos.x += dx; bhitpos.y += dy; - if(mtmp = m_at(bhitpos.x, bhitpos.y)){ - tmp_at(-1,-1); - return(mtmp); + if ((mtmp = m_at(bhitpos.x, bhitpos.y)) != NULL) { + tmp_at(-1, -1); + return (mtmp); } - if(!ZAP_POS(levl[bhitpos.x][bhitpos.y].typ)) { + if (!ZAP_POS(levl[bhitpos.x][bhitpos.y].typ)) { bhitpos.x -= dx; bhitpos.y -= dy; break; } - if(bhitpos.x == u.ux && bhitpos.y == u.uy) { /* ct == 9 */ - if(rn2(20) >= 10+u.ulevel){ /* we hit ourselves */ + if (bhitpos.x == u.ux && bhitpos.y == u.uy) { /* ct == 9 */ + if (rn2(20) >= 10 + u.ulevel) { /* we hit ourselves */ (void) thitu(10, rnd(10), "boomerang"); break; - } else { /* we catch it */ - tmp_at(-1,-1); + } else {/* we catch it */ + tmp_at(-1, -1); pline("Skillfully, you catch the boomerang."); - return(&youmonst); + return (&youmonst); } } tmp_at(bhitpos.x, bhitpos.y); - if(ct % 5 != 0) i++; + if (ct % 5 != 0) + i++; } - tmp_at(-1, -1); /* do not leave last symbol */ - return(0); + tmp_at(-1, -1); /* do not leave last symbol */ + return (0); } char -dirlet(dx,dy) register dx,dy; { +dirlet(dx, dy) + int dx, dy; +{ return (dx == dy) ? '\\' : (dx && dy) ? '/' : dx ? '-' : '|'; } @@ -398,43 +434,48 @@ dirlet(dx,dy) register dx,dy; { /* type == -1: monster spitting fire at you */ /* type == -1,-2,-3: bolts sent out by wizard */ /* called with dx = dy = 0 with vertical bolts */ -buzz(type,sx,sy,dx,dy) -register int type; -register xchar sx,sy; -register int dx,dy; +void +buzz(type, sx, sy, dx, dy) + int type; + xchar sx, sy; + int dx, dy; { - int abstype = abs(type); - register char *fltxt = (type == -1) ? "blaze of fire" : fl[abstype]; - struct rm *lev; - xchar range; - struct monst *mon; + int abstype = abs(type); + char *fltxt = (type == -1) ? "blaze of fire" : fl[abstype]; + struct rm *lev; + xchar range; + struct monst *mon; - if(u.uswallow) { - register int tmp; + if (u.uswallow) { + int tmp; - if(type < 0) return; + if (type < 0) + return; tmp = zhit(u.ustuck, type); pline("The %s rips into %s%s", - fltxt, monnam(u.ustuck), exclam(tmp)); + fltxt, monnam(u.ustuck), exclam(tmp)); return; } - if(type < 0) pru(); - range = rn1(7,7); - Tmp_at(-1, dirlet(dx,dy)); /* open call */ - while(range-- > 0) { + if (type < 0) + pru(); + range = rn1(7, 7); + Tmp_at(-1, dirlet(dx, dy)); /* open call */ + while (range-- > 0) { sx += dx; sy += dy; - if((lev = &levl[sx][sy])->typ) Tmp_at(sx,sy); + if ((lev = &levl[sx][sy])->typ) + Tmp_at(sx, sy); else { - int bounce = 0; - if(cansee(sx-dx,sy-dy)) + int bounce = 0; + if (cansee(sx - dx, sy - dy)) pline("The %s bounces!", fltxt); - if(ZAP_POS(levl[sx][sy-dy].typ)) + if (ZAP_POS(levl[sx][sy - dy].typ)) bounce = 1; - if(ZAP_POS(levl[sx-dx][sy].typ)) { - if(!bounce || rn2(2)) bounce = 2; + if (ZAP_POS(levl[sx - dx][sy].typ)) { + if (!bounce || rn2(2)) + bounce = 2; } - switch(bounce){ + switch (bounce) { case 0: dx = -dx; dy = -dy; @@ -448,199 +489,215 @@ register int dx,dy; sy -= dy; break; } - Tmp_at(-2,dirlet(dx,dy)); + Tmp_at(-2, dirlet(dx, dy)); continue; } - if(lev->typ == POOL && abstype == 1 /* fire */) { + if (lev->typ == POOL && abstype == 1 /* fire */ ) { range -= 3; lev->typ = ROOM; - if(cansee(sx,sy)) { - mnewsym(sx,sy); + if (cansee(sx, sy)) { + mnewsym(sx, sy); pline("The water evaporates."); } else pline("You hear a hissing sound."); } - if((mon = m_at(sx,sy)) && - (type != -1 || mon->data->mlet != 'D')) { + if ((mon = m_at(sx, sy)) && + (type != -1 || mon->data->mlet != 'D')) { wakeup(mon); - if(rnd(20) < 18 + mon->data->ac) { - register int tmp = zhit(mon,abstype); - if(mon->mhp < 1) { - if(type < 0) { - if(cansee(mon->mx,mon->my)) - pline("%s is killed by the %s!", - Monnam(mon), fltxt); - mondied(mon); + if (rnd(20) < 18 + mon->data->ac) { + int tmp = zhit(mon, abstype); + if (mon->mhp < 1) { + if (type < 0) { + if (cansee(mon->mx, mon->my)) + pline("%s is killed by the %s!", + Monnam(mon), fltxt); + mondied(mon); } else - killed(mon); + killed(mon); } else hit(fltxt, mon, exclam(tmp)); range -= 2; } else - miss(fltxt,mon); - } else if(sx == u.ux && sy == u.uy) { + miss(fltxt, mon); + } else if (sx == u.ux && sy == u.uy) { nomul(0); - if(rnd(20) < 18+u.uac) { - register int dam = 0; + if (rnd(20) < 18 + u.uac) { + int dam = 0; range -= 2; - pline("The %s hits you!",fltxt); - switch(abstype) { + pline("The %s hits you!", fltxt); + switch (abstype) { case 0: - dam = d(2,6); + dam = d(2, 6); break; case 1: - if(Fire_resistance) + if (Fire_resistance) pline("You don't feel hot!"); - else dam = d(6,6); - if(!rn2(3)) + else + dam = d(6, 6); + if (!rn2(3)) burn_scrolls(); break; case 2: - nomul(-rnd(25)); /* sleep ray */ + nomul(-rnd(25)); /* sleep ray */ break; case 3: - if(Cold_resistance) + if (Cold_resistance) pline("You don't feel cold!"); - else dam = d(6,6); + else + dam = d(6, 6); break; case 4: u.uhp = -1; } - losehp(dam,fltxt); - } else pline("The %s whizzes by you!",fltxt); + losehp(dam, fltxt); + } else + pline("The %s whizzes by you!", fltxt); stop_occupation(); } - if(!ZAP_POS(lev->typ)) { - int bounce = 0, rmn; - if(cansee(sx,sy)) pline("The %s bounces!",fltxt); + if (!ZAP_POS(lev->typ)) { + int bounce = 0, rmn; + if (cansee(sx, sy)) + pline("The %s bounces!", fltxt); range--; - if(!dx || !dy || !rn2(20)){ + if (!dx || !dy || !rn2(20)) { dx = -dx; dy = -dy; } else { - if(ZAP_POS(rmn = levl[sx][sy-dy].typ) && - (IS_ROOM(rmn) || ZAP_POS(levl[sx+dx][sy-dy].typ))) - bounce = 1; - if(ZAP_POS(rmn = levl[sx-dx][sy].typ) && - (IS_ROOM(rmn) || ZAP_POS(levl[sx-dx][sy+dy].typ))) - if(!bounce || rn2(2)) - bounce = 2; - - switch(bounce){ - case 0: - dy = -dy; - dx = -dx; - break; - case 1: - dy = -dy; - break; - case 2: - dx = -dx; - break; - } - Tmp_at(-2, dirlet(dx,dy)); + if (ZAP_POS(rmn = levl[sx][sy - dy].typ) && + (IS_ROOM(rmn) || ZAP_POS(levl[sx + dx][sy - dy].typ))) + bounce = 1; + if (ZAP_POS(rmn = levl[sx - dx][sy].typ) && + (IS_ROOM(rmn) || ZAP_POS(levl[sx - dx][sy + dy].typ))) + if (!bounce || rn2(2)) + bounce = 2; + + switch (bounce) { + case 0: + dy = -dy; + dx = -dx; + break; + case 1: + dy = -dy; + break; + case 2: + dx = -dx; + break; + } + Tmp_at(-2, dirlet(dx, dy)); } } } - Tmp_at(-1,-1); + Tmp_at(-1, -1); } -zhit(mon,type) /* returns damage to mon */ -register struct monst *mon; -register type; +int +zhit(mon, type) /* returns damage to mon */ + struct monst *mon; + int type; { - register int tmp = 0; + int tmp = 0; - switch(type) { - case 0: /* magic missile */ - tmp = d(2,6); + switch (type) { + case 0: /* magic missile */ + tmp = d(2, 6); break; case -1: /* Dragon blazing fire */ - case 1: /* fire */ - if(index("Dg", mon->data->mlet)) break; - tmp = d(6,6); - if(index("YF", mon->data->mlet)) tmp += 7; + case 1: /* fire */ + if (strchr("Dg", mon->data->mlet)) + break; + tmp = d(6, 6); + if (strchr("YF", mon->data->mlet)) + tmp += 7; break; - case 2: /* sleep*/ + case 2: /* sleep */ mon->mfroz = 1; break; - case 3: /* cold */ - if(index("YFgf", mon->data->mlet)) break; - tmp = d(6,6); - if(mon->data->mlet == 'D') tmp += 7; + case 3: /* cold */ + if (strchr("YFgf", mon->data->mlet)) + break; + tmp = d(6, 6); + if (mon->data->mlet == 'D') + tmp += 7; break; - case 4: /* death*/ - if(index(UNDEAD, mon->data->mlet)) break; - tmp = mon->mhp+1; + case 4: /* death */ + if (strchr(UNDEAD, mon->data->mlet)) + break; + tmp = mon->mhp + 1; break; } mon->mhp -= tmp; - return(tmp); + return (tmp); } #define CORPSE_I_TO_C(otyp) (char) ((otyp >= DEAD_ACID_BLOB)\ ? 'a' + (otyp - DEAD_ACID_BLOB)\ : '@' + (otyp - DEAD_HUMAN)) +int revive(obj) -register struct obj *obj; + struct obj *obj; { - register struct monst *mtmp; + struct monst *mtmp = NULL; - if(obj->olet == FOOD_SYM && obj->otyp > CORPSE) { + if (obj->olet == FOOD_SYM && obj->otyp > CORPSE) { /* do not (yet) revive shopkeepers */ - /* Note: this might conceivably produce two monsters - at the same position - strange, but harmless */ - mtmp = mkmon_at(CORPSE_I_TO_C(obj->otyp),obj->ox,obj->oy); + /* + * Note: this might conceivably produce two monsters at the + * same position - strange, but harmless + */ + mtmp = mkmon_at(CORPSE_I_TO_C(obj->otyp), obj->ox, obj->oy); delobj(obj); } - return(!!mtmp); /* TRUE if some monster created */ + return (!!mtmp); /* TRUE if some monster created */ } +void rloco(obj) -register struct obj *obj; + struct obj *obj; { - register tx,ty,otx,oty; + int tx, ty, otx, oty; otx = obj->ox; oty = obj->oy; do { - tx = rn1(COLNO-3,2); + tx = rn1(COLNO - 3, 2); ty = rn2(ROWNO); - } while(!goodpos(tx,ty)); + } while (!goodpos(tx, ty)); obj->ox = tx; obj->oy = ty; - if(cansee(otx,oty)) - newsym(otx,oty); + if (cansee(otx, oty)) + newsym(otx, oty); } -fracture_rock(obj) /* fractured by pick-axe or wand of striking */ -register struct obj *obj; /* no texts here! */ +void +fracture_rock(obj) /* fractured by pick-axe or wand of striking */ + struct obj *obj; /* no texts here! */ { /* unpobj(obj); */ obj->otyp = ROCK; obj->quan = 7 + rn2(60); obj->owt = weight(obj); obj->olet = WEAPON_SYM; - if(cansee(obj->ox,obj->oy)) - prl(obj->ox,obj->oy); + if (cansee(obj->ox, obj->oy)) + prl(obj->ox, obj->oy); } +void burn_scrolls() { - register struct obj *obj, *obj2; - register int cnt = 0; + struct obj *obj, *obj2; + int cnt = 0; - for(obj = invent; obj; obj = obj2) { + for (obj = invent; obj; obj = obj2) { obj2 = obj->nobj; - if(obj->olet == SCROLL_SYM) { + if (obj->olet == SCROLL_SYM) { cnt++; useup(obj); } } - if(cnt > 1) { + if (cnt > 1) { pline("Your scrolls catch fire!"); losehp(cnt, "burning scrolls"); - } else if(cnt) { + } else if (cnt) { pline("Your scroll catches fire!"); losehp(1, "burning scroll"); } diff --git a/hack/makedefs.c b/hack/makedefs.c index e0567032..7ae60871 100644 --- a/hack/makedefs.c +++ b/hack/makedefs.c @@ -1,30 +1,46 @@ +/* $NetBSD: makedefs.c,v 1.5 1997/10/19 16:59:36 christos Exp $ */ + /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: makedefs.c,v 1.4 1995/04/24 12:23:39 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: makedefs.c,v 1.5 1997/10/19 16:59:36 christos Exp $"); +#endif /* not lint */ #include <stdio.h> #include <string.h> +#include <fcntl.h> +#include <unistd.h> /* construct definitions of object constants */ #define LINSZ 1000 #define STRSZ 40 -int fd; -char string[STRSZ]; +int fd; +char string[STRSZ]; + +static void readline __P((void)); +static char nextchar __P((void)); +static int skipuntil __P((char *)); +static int getentry __P((void)); +static void capitalize __P((char *)); +static int letter __P((int)); +static int digit __P((int)); + +int main __P((int, char **)); +int main(argc, argv) - int argc; - char **argv; + int argc; + char **argv; { -register int index = 0; -register int propct = 0; -register char *sp; + int i = 0; + int propct = 0; + char *sp; if (argc != 2) { - (void)fprintf(stderr, "usage: makedefs file\n"); + (void) fprintf(stderr, "usage: makedefs file\n"); exit(1); } if ((fd = open(argv[1], 0)) < 0) { @@ -32,123 +48,137 @@ register char *sp; exit(1); } skipuntil("objects[] = {"); - while(getentry()) { - if(!*string){ - index++; + while (getentry()) { + if (!*string) { + i++; continue; } - for(sp = string; *sp; sp++) - if(*sp == ' ' || *sp == '\t' || *sp == '-') + for (sp = string; *sp; sp++) + if (*sp == ' ' || *sp == '\t' || *sp == '-') *sp = '_'; - if(!strncmp(string, "RIN_", 4)){ - capitalize(string+4); + if (!strncmp(string, "RIN_", 4)) { + capitalize(string + 4); printf("#define %s u.uprops[%d].p_flgs\n", - string+4, propct++); + string + 4, propct++); } - for(sp = string; *sp; sp++) capitalize(sp); + for (sp = string; *sp; sp++) + capitalize(sp); /* avoid trouble with stupid C preprocessors */ - if(!strncmp(string, "WORTHLESS_PIECE_OF_", 19)) - printf("/* #define %s %d */\n", string, index); + if (!strncmp(string, "WORTHLESS_PIECE_OF_", 19)) + printf("/* #define %s %d */\n", string, i); else - printf("#define %s %d\n", string, index); - index++; + printf("#define %s %d\n", string, i); + i++; } printf("\n#define CORPSE DEAD_HUMAN\n"); printf("#define LAST_GEM (JADE+1)\n"); printf("#define LAST_RING %d\n", propct); - printf("#define NROFOBJECTS %d\n", index-1); + printf("#define NROFOBJECTS %d\n", i - 1); exit(0); } -char line[LINSZ], *lp = line, *lp0 = line, *lpe = line; -int eof; +char line[LINSZ], *lp = line, *lp0 = line, *lpe = line; +int eof; -readline(){ -register int n = read(fd, lp0, (line+LINSZ)-lp0); - if(n < 0){ +static void +readline() +{ + int n = read(fd, lp0, (line + LINSZ) - lp0); + if (n < 0) { printf("Input error.\n"); exit(1); } - if(n == 0) eof++; - lpe = lp0+n; + if (n == 0) + eof++; + lpe = lp0 + n; } -char -nextchar(){ - if(lp == lpe){ +static char +nextchar() +{ + if (lp == lpe) { readline(); lp = lp0; } - return((lp == lpe) ? 0 : *lp++); + return ((lp == lpe) ? 0 : *lp++); } -skipuntil(s) char *s; { -register char *sp0, *sp1; +static int +skipuntil(s) + char *s; +{ + char *sp0, *sp1; loop: - while(*s != nextchar()) - if(eof) { + while (*s != nextchar()) + if (eof) { printf("Cannot skipuntil %s\n", s); exit(1); } - if(strlen(s) > lpe-lp+1){ - register char *lp1, *lp2; + if (strlen(s) > lpe - lp + 1) { + char *lp1, *lp2; lp2 = lp; lp1 = lp = lp0; - while(lp2 != lpe) *lp1++ = *lp2++; + while (lp2 != lpe) + *lp1++ = *lp2++; lp2 = lp0; /* save value */ lp0 = lp1; readline(); lp0 = lp2; - if(strlen(s) > lpe-lp+1) { + if (strlen(s) > lpe - lp + 1) { printf("error in skipuntil"); exit(1); } } - sp0 = s+1; + sp0 = s + 1; sp1 = lp; - while(*sp0 && *sp0 == *sp1) sp0++, sp1++; - if(!*sp0){ + while (*sp0 && *sp0 == *sp1) + sp0++, sp1++; + if (!*sp0) { lp = sp1; - return(1); + return (1); } goto loop; } -getentry(){ -int inbraces = 0, inparens = 0, stringseen = 0, commaseen = 0; -int prefix = 0; -char ch; +static int +getentry() +{ + int inbraces = 0, inparens = 0, stringseen = 0, commaseen = 0; + int prefix = 0; + char ch; #define NSZ 10 -char identif[NSZ], *ip; + char identif[NSZ], *ip; string[0] = string[4] = 0; - /* read until {...} or XXX(...) followed by , - skip comment and #define lines - deliver 0 on failure + /* + * read until {...} or XXX(...) followed by , skip comment and + * #define lines deliver 0 on failure */ - while(1) { + while (1) { ch = nextchar(); - swi: - if(letter(ch)){ +swi: + if (letter(ch)) { ip = identif; do { - if(ip < identif+NSZ-1) *ip++ = ch; + if (ip < identif + NSZ - 1) + *ip++ = ch; ch = nextchar(); - } while(letter(ch) || digit(ch)); + } while (letter(ch) || digit(ch)); *ip = 0; - while(ch == ' ' || ch == '\t') ch = nextchar(); - if(ch == '(' && !inparens && !stringseen) - if(!strcmp(identif, "WAND") || - !strcmp(identif, "RING") || - !strcmp(identif, "POTION") || - !strcmp(identif, "SCROLL")) - (void) strncpy(string, identif, 3), - string[3] = '_', - prefix = 4; + while (ch == ' ' || ch == '\t') + ch = nextchar(); + if (ch == '(' && !inparens && !stringseen) + if (!strcmp(identif, "WAND") || + !strcmp(identif, "RING") || + !strcmp(identif, "POTION") || + !strcmp(identif, "SCROLL")) + (void) strncpy(string, identif, 3), + string[3] = '_', + prefix = 4; } - switch(ch) { + switch (ch) { case '/': /* watch for comment */ - if((ch = nextchar()) == '*') + if ((ch = nextchar()) == '*') skipuntil("*/"); goto swi; case '{': @@ -159,72 +189,86 @@ char identif[NSZ], *ip; continue; case '}': inbraces--; - if(inbraces < 0) return(0); + if (inbraces < 0) + return (0); continue; case ')': inparens--; - if(inparens < 0) { + if (inparens < 0) { printf("too many ) ?"); exit(1); } continue; case '\n': /* watch for #define at begin of line */ - if((ch = nextchar()) == '#'){ - register char pch; + if ((ch = nextchar()) == '#') { + char pch; /* skip until '\n' not preceded by '\\' */ do { pch = ch; ch = nextchar(); - } while(ch != '\n' || pch == '\\'); + } while (ch != '\n' || pch == '\\'); continue; } goto swi; case ',': - if(!inparens && !inbraces){ - if(prefix && !string[prefix]) + if (!inparens && !inbraces) { + if (prefix && !string[prefix]) string[0] = 0; - if(stringseen) return(1); + if (stringseen) + return (1); printf("unexpected ,\n"); exit(1); } commaseen++; continue; case '\'': - if((ch = nextchar()) == '\\') ch = nextchar(); - if(nextchar() != '\''){ + if ((ch = nextchar()) == '\\') + ch = nextchar(); + if (nextchar() != '\'') { printf("strange character denotation?\n"); exit(1); } continue; case '"': { - register char *sp = string + prefix; - register char pch; - register int store = (inbraces || inparens) - && !stringseen++ && !commaseen; + char *sp = string + prefix; + char pch; + int store = (inbraces || inparens) + && !stringseen++ && !commaseen; do { pch = ch; ch = nextchar(); - if(store && sp < string+STRSZ) + if (store && sp < string + STRSZ) *sp++ = ch; - } while(ch != '"' || pch == '\\'); - if(store) *--sp = 0; + } while (ch != '"' || pch == '\\'); + if (store) + *--sp = 0; continue; } } } } -capitalize(sp) register char *sp; { - if('a' <= *sp && *sp <= 'z') *sp += 'A'-'a'; +static void +capitalize(sp) + char *sp; +{ + if ('a' <= *sp && *sp <= 'z') + *sp += 'A' - 'a'; } -letter(ch) register char ch; { - return( ('a' <= ch && ch <= 'z') || - ('A' <= ch && ch <= 'Z') ); +static int +letter(ch) + char ch; +{ + return (('a' <= ch && ch <= 'z') || + ('A' <= ch && ch <= 'Z')); } -digit(ch) register char ch; { - return( '0' <= ch && ch <= '9' ); +static int +digit(ch) + char ch; +{ + return ('0' <= ch && ch <= '9'); } @@ -1,32 +1,44 @@ +/* $NetBSD: rnd.c,v 1.4 1997/10/19 16:59:39 christos Exp $ */ + +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$NetBSD: rnd.c,v 1.3 1995/03/23 08:32:28 cgd Exp $"; -#endif /* not lint */ +__RCSID("$NetBSD: rnd.c,v 1.4 1997/10/19 16:59:39 christos Exp $"); +#endif /* not lint */ + +#include <stdlib.h> +#include "hack.h" +#include "extern.h" #define RND(x) ((random()>>3) % x) -rn1(x,y) -register x,y; +int +rn1(x, y) + int x, y; { - return(RND(x)+y); + return (RND(x) + y); } +int rn2(x) -register x; + int x; { - return(RND(x)); + return (RND(x)); } +int rnd(x) -register x; + int x; { - return(RND(x)+1); + return (RND(x) + 1); } -d(n,x) -register n,x; +int +d(n, x) + int n, x; { - register tmp = n; + int tmp = n; - while(n--) tmp += RND(x); - return(tmp); + while (n--) + tmp += RND(x); + return (tmp); } |