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

Simplify the web destruction func

Browse Source
This commit is contained in:
Pasi Kallinen
2016-04-22 22:47:43 +03:00
parent 117334b20e
commit c5aa0ff368
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/trap.c
View File

@@ -794,7 +794,6 @@ struct obj *objchn, *saddle;
}
/* monster or you go through and possibly destroy a web.
mtmp == NULL == you.
return TRUE if could go through. */
boolean
mu_maybe_destroy_web(mtmp, domsg, trap)
@@ -802,12 +801,10 @@ struct monst *mtmp;
boolean domsg;
struct trap *trap;
{
boolean isyou = !mtmp;
struct permonst *mptr = isyou ? youmonst.data : mtmp->data;
boolean gelcube = isyou ? (u.umonnum == PM_GELATINOUS_CUBE)
: (mptr == &mons[PM_GELATINOUS_CUBE]);
boolean isyou = (mtmp == &youmonst);
struct permonst *mptr = mtmp->data;
if (amorphous(mptr) || is_whirly(mptr) || flaming(mptr)
|| unsolid(mptr) || gelcube) {
|| unsolid(mptr) || mptr == &mons[PM_GELATINOUS_CUBE]) {
xchar x = trap->tx;
xchar y = trap->ty;
if (flaming(mptr) || acidic(mptr)) {
@@ -1243,7 +1240,7 @@ unsigned trflags;
case WEB: /* Our luckless player has stumbled into a web. */
feeltrap(trap);
if (mu_maybe_destroy_web(NULL, webmsgok, trap))
if (mu_maybe_destroy_web(&youmonst, webmsgok, trap))
break;
if (webmaker(youmonst.data)) {
if (webmsgok)