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

B07004 camera breaks on shade

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.1
+1
View File
@@ -210,6 +210,7 @@ remove TIMED_DELAY from the features checked for version compatibility
rolling boulder hitting monster stuck in pit should stop even when mon survives rolling boulder hitting monster stuck in pit should stop even when mon survives
don't see chest trap gas colors while Blind don't see chest trap gas colors while Blind
adjust fruit name in potion juice messages if it has the form "foo of bar" adjust fruit name in potion juice messages if it has the form "foo of bar"
wielded camera passes harmlessly through shade
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/uhitm.c
+10 -5
View File
@@ -519,6 +519,7 @@ int thrown;
int wtype; int wtype;
struct obj *monwep; struct obj *monwep;
char yourbuf[BUFSZ]; char yourbuf[BUFSZ];
char *unconventional = (char *)0; /* substituted for word "attack" in msg */
wakeup(mon); wakeup(mon);
if(!obj) { /* attack with bare hands */ if(!obj) { /* attack with bare hands */
@@ -684,10 +685,13 @@ int thrown;
break; break;
#ifdef TOURIST #ifdef TOURIST
case EXPENSIVE_CAMERA: case EXPENSIVE_CAMERA:
You("succeed in destroying %s camera. Congratulations!", if (mdat != &mons[PM_SHADE]) {
shk_your(yourbuf, obj)); You("succeed in destroying %s camera. Congratulations!",
useup(obj); shk_your(yourbuf, obj));
return(TRUE); useup(obj);
return(TRUE);
} else unconventional = "camera";
break;
#endif #endif
case CORPSE: /* fixed by polder@cs.vu.nl */ case CORPSE: /* fixed by polder@cs.vu.nl */
if (touch_petrifies(&mons[obj->corpsenm])) { if (touch_petrifies(&mons[obj->corpsenm])) {
@@ -892,7 +896,8 @@ int thrown;
tmp = 0; tmp = 0;
if (mdat == &mons[PM_SHADE]) { if (mdat == &mons[PM_SHADE]) {
if (!hittxt) { if (!hittxt) {
Your("attack passes harmlessly through %s.", Your("%s passes harmlessly through %s.",
unconventional ? unconventional : "attack",
mon_nam(mon)); mon_nam(mon));
hittxt = TRUE; hittxt = TRUE;
} }