From 84e7d0704483ce39bbdeacd5e676168db6fa664f Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 19 Oct 1997 16:56:41 +0000 Subject: WARNsify... --- hack/hack.search.c | 199 +++++++++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 89 deletions(-) (limited to 'hack/hack.search.c') 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 #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); } -- cgit v1.2.3-56-ge451