B07004 camera breaks on shade

This commit is contained in:
nethack.allison
2002-08-20 00:03:17 +00:00
parent 379ffe2461
commit 6578eb1884
2 changed files with 11 additions and 5 deletions

View File

@@ -519,6 +519,7 @@ int thrown;
int wtype;
struct obj *monwep;
char yourbuf[BUFSZ];
char *unconventional = (char *)0; /* substituted for word "attack" in msg */
wakeup(mon);
if(!obj) { /* attack with bare hands */
@@ -684,10 +685,13 @@ int thrown;
break;
#ifdef TOURIST
case EXPENSIVE_CAMERA:
You("succeed in destroying %s camera. Congratulations!",
shk_your(yourbuf, obj));
useup(obj);
return(TRUE);
if (mdat != &mons[PM_SHADE]) {
You("succeed in destroying %s camera. Congratulations!",
shk_your(yourbuf, obj));
useup(obj);
return(TRUE);
} else unconventional = "camera";
break;
#endif
case CORPSE: /* fixed by polder@cs.vu.nl */
if (touch_petrifies(&mons[obj->corpsenm])) {
@@ -892,7 +896,8 @@ int thrown;
tmp = 0;
if (mdat == &mons[PM_SHADE]) {
if (!hittxt) {
Your("attack passes harmlessly through %s.",
Your("%s passes harmlessly through %s.",
unconventional ? unconventional : "attack",
mon_nam(mon));
hittxt = TRUE;
}