return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
boolean in_sight = canseemon(mtmp) || (mtmp == u.usteed);
if (is_flyer(mtmp->data))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
/* stepped on a squeaky board */
if (in_sight) {
if (!Deaf) {
/* wake up nearby monsters */
wake_nearto(mtmp->mx, mtmp->my, 40);
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
int dmg = d(2, 4);
if ((Levitation || Flying) && !forcetrap)
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
feeltrap(trap);
if (amorphous(g.youmonst.data) || is_whirly(g.youmonst.data)
|| unsolid(g.youmonst.data)) {
pline("%s bear trap closes harmlessly through you.",
A_Your[trap->madeby_u]);
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
if (!u.usteed && g.youmonst.data->msize <= MZ_SMALL) {
pline("%s bear trap closes harmlessly over you.",
A_Your[trap->madeby_u]);
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
set_utrap((unsigned) rn1(4, 4), TT_BEARTRAP);
if (u.usteed) {
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
}
}
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
/* KMH -- You can't escape the Sokoban level traps */
if (!Sokoban && (Levitation || (Flying && !plunged)))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
feeltrap(trap);
if (!Sokoban && is_clinger(g.youmonst.data) && !plunged) {
if (trap->tseen) {
ttype == SPIKED_PIT ? "full of spikes " : "");
You("don't fall in!");
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
if (!Sokoban) {
char verbbuf[BUFSZ];
seetrap(trap);
pline("%s doesn't fall into the pit.", Monnam(mtmp));
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
if (!inescapable)
- return Trap_No_Effect; /* avoids trap */
+ return Trap_Effect_Finished; /* avoids trap */
fallverb = "is dragged"; /* sokoban pit */
}
if (!passes_walls(mptr))
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
seetrap(trap); /* normally done in fall_through */
impossible("dotrap: %ss cannot exist on this level.",
trapname(trap->ttyp, TRUE));
- return Trap_No_Effect; /* don't activate it after all */
+ return Trap_Effect_Finished; /* don't activate it after all */
}
fall_through(TRUE, (trflags & TOOKPLUNGE));
} else {
if (!Can_fall_thru(&u.uz)) {
impossible("mintrap: %ss cannot exist on this level.",
trapname(tt, TRUE));
- return Trap_No_Effect; /* don't activate it after all */
+ return Trap_Effect_Finished; /* don't activate it after all */
}
if (is_flyer(mptr) || is_floater(mptr) || mptr == &mons[PM_WUMPUS]
|| (mtmp->wormno && count_wsegs(mtmp) > 5)
pline("%s doesn't fall through the hole.",
Monnam(mtmp));
}
- return Trap_No_Effect; /* inescapable = FALSE; */
+ return Trap_Effect_Finished; /* inescapable = FALSE; */
}
if (inescapable) { /* sokoban hole */
if (in_sight) {
seetrap(trap);
}
} else
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
return trapeffect_level_telep(mtmp, trap, trflags);
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
mtele_trap(mtmp, trap, in_sight);
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
if (mlev_res)
return mlev_res;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
feeltrap(trap);
if (mu_maybe_destroy_web(&g.youmonst, webmsgok, trap))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
if (webmaker(g.youmonst.data)) {
if (webmsgok)
pline(trap->madeby_u ? "You take a walk on your web."
: "There is a spider web here.");
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
if (webmsgok) {
char verbbuf[BUFSZ];
str = 17;
} else {
reset_utrap(FALSE);
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
webmsgok = FALSE; /* mintrap printed the messages */
struct permonst *mptr = mtmp->data;
if (webmaker(mptr))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
if (mu_maybe_destroy_web(mtmp, in_sight, trap))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
tear_web = FALSE;
switch (monsndx(mptr)) {
case PM_OWLBEAR: /* Eric Backus */
}
return mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
} else {
/* monsters don't trigger statue traps */
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
u.uen = (u.uenmax += 2);
if (u.uenmax > u.uenpeak)
u.uenpeak = u.uenmax;
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
} else {
domagictrap();
}
if (!rn2(21))
return trapeffect_fire_trap(mtmp, trap, trflags);
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
}
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
seetrap(trap);
}
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
if ((Levitation || Flying) && !forcetrap) {
if (!already_seen && rn2(3))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
feeltrap(trap);
pline("%s %s in a pile of soil below you.",
already_seen ? "There is" : "You discover",
trap->madeby_u ? "the trigger of your mine" : "a trigger");
if (already_seen && rn2(3))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
pline("KAABLAMM!!! %s %s%s off!",
forcebungle ? "Your inept attempt sets"
: "The air currents set",
static boolean recursive_mine = FALSE;
if (recursive_mine)
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
feeltrap(trap);
pline("KAABLAMM!!! You triggered %s land mine!",
a_your[trap->madeby_u]);
xchar tx = trap->tx, ty = trap->ty;
if (rn2(3))
- return Trap_No_Effect; /* monsters usually don't set it off */
+ return Trap_Effect_Finished; /* monsters usually don't set it off */
if (is_flyer(mptr)) {
boolean already_seen = trap->tseen;
seetrap(trap);
}
if (rn2(3))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
if (in_sight) {
newsym(mtmp->mx, mtmp->my);
pline_The("air currents set %s off!",
}
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
return trapkilled ? Trap_Killed_Mon : mtmp->mtrapped;
}
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
} else {
return trapeffect_level_telep(mtmp, trap, trflags);
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
}
}
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
static int
(mtmp == &g.youmonst) ? "You" : "Some monster",
trap->ttyp);
}
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
void
boolean trapkilled, steedhit;
if (!steed || !trap)
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
tt = trap->ttyp;
steed->mx = u.ux;
steed->my = u.uy;
case ARROW_TRAP:
if (!otmp) {
impossible("steed hit by non-existent arrow?");
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
trapkilled = thitm(8, steed, otmp, 0, FALSE);
steedhit = TRUE;
case DART_TRAP:
if (!otmp) {
impossible("steed hit by non-existent dart?");
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
}
trapkilled = thitm(7, steed, otmp, 0, FALSE);
steedhit = TRUE;
|| (tt == HOLE && !mindless(mptr)))) {
/* it has been in such a trap - perhaps it escapes */
if (rn2(4))
- return Trap_No_Effect;
+ return Trap_Effect_Finished;
} else {
mtmp->mtrapseen |= (1 << (tt - 1));
}
projects / nethack / commitdiff