nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

teleporting monster while swallowed

Browse Source 
if player teleports a monster while swallowed on a noteleport level, the
player should not teleport along with the monster
This commit is contained in:
cohrs
2002-02-02 06:43:53 +00:00
parent 16193dc518
commit 957e96a48a
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes33.2
+2
View File
@@ -414,6 +414,8 @@ eggs, potions & other breakables may break when they fall down stairs
hurtling via grappling hook does not apply effects of destination location hurtling via grappling hook does not apply effects of destination location
consider vortexes to be nonliving consider vortexes to be nonliving
dragons have scales, not fur dragons have scales, not fur
if player teleports a monster while swallowed on a noteleport level, the
player should not teleport along with the monster
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/teleport.c
+11 -8
View File
@@ -1147,14 +1147,17 @@ boolean give_feedback;
if (give_feedback) if (give_feedback)
pline("%s resists your magic!", Monnam(mtmp)); pline("%s resists your magic!", Monnam(mtmp));
return FALSE; return FALSE;
} else { } else if (level.flags.noteleport && u.uswallow && mtmp == u.ustuck) {
if (is_rider(mtmp->data) && rn2(13) && if (give_feedback)
enexto(&cc, u.ux, u.uy, mtmp->data)) You("are no longer inside %s!", mon_nam(mtmp));
rloc_to(mtmp, cc.x, cc.y); unstuck(mtmp);
else rloc(mtmp);
rloc(mtmp); } else if (is_rider(mtmp->data) && rn2(13) &&
return TRUE; enexto(&cc, u.ux, u.uy, mtmp->data))
} rloc_to(mtmp, cc.x, cc.y);
else
rloc(mtmp);
return TRUE;
} }
/*teleport.c*/ /*teleport.c*/