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

patch reversal - figurines (was egg hatching message bug)

Browse Source 
The fix was directed at figurines; report was actually for eggs.
This commit is contained in:
nethack.allison
2003-11-30 12:33:53 +00:00
parent b56641dc2e
commit 331ecb8b5c
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.3
View File

@@ -96,7 +96,6 @@ when you're asleep you shouldn't "notice" monsters that have become undetected
must be able to reach floor in order to use stethoscope on corpse or statue must be able to reach floor in order to use stethoscope on corpse or statue
fix a few coordinate (y,y) -> (x,y) typos in apply.c, mon.c, and wizard.c fix a few coordinate (y,y) -> (x,y) typos in apply.c, mon.c, and wizard.c
killing a long worm on a drawbridge could produce a panic killing a long worm on a drawbridge could produce a panic
suppress "it" and adjust message when you see a figurine transform, then hide
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

39
src/apply.c
View File

@@ -1705,44 +1705,22 @@ long timeout;
cansee_spot = cansee(cc.x, cc.y); cansee_spot = cansee(cc.x, cc.y);
mtmp = make_familiar(figurine, cc.x, cc.y, TRUE); mtmp = make_familiar(figurine, cc.x, cc.y, TRUE);
if (mtmp) { if (mtmp) {
char hidebuf[BUFSZ]; Sprintf(monnambuf, "%s",a_monnam(mtmp));
struct obj *mshelter;
/*
* We're suppressing "it" here because if
* the monster ends up undetected, the "it"
* makes no sense since monnambuf is only
* used in "You see <mon>" type messages.
*
* It has been suggested that it might be
* better to have the transformed figurine
* monster wait until the next turn before
* hiding, but that is currently not implemented.
*/
Sprintf(monnambuf, "%s",
x_monnam(mtmp, ARTICLE_A, (char *)0,
SUPPRESS_IT, FALSE));
if (mtmp->mundetected) {
if ((mshelter = level.objects[mtmp->mx][mtmp->my]) != 0)
Sprintf(hidebuf, " and %s under %s",
locomotion(mtmp->data, "crawl"), doname(mshelter));
else
Strcpy(hidebuf, " and hide");
} else hidebuf[0] = '\0';
switch (figurine->where) { switch (figurine->where) {
case OBJ_INVENT: case OBJ_INVENT:
if (Blind) if (Blind)
You_feel("%s %s from your pack!", something, You_feel("%s %s from your pack!", something,
locomotion(mtmp->data,"drop")); locomotion(mtmp->data,"drop"));
else else
You("see %s %s out of your pack%s!", You("see %s %s out of your pack!",
monnambuf, locomotion(mtmp->data,"drop"), hidebuf); monnambuf,
locomotion(mtmp->data,"drop"));
break; break;
case OBJ_FLOOR: case OBJ_FLOOR:
if (cansee_spot && !silent) { if (cansee_spot && !silent) {
You("suddenly see a figurine transform into %s%s!", You("suddenly see a figurine transform into %s!",
monnambuf, hidebuf); monnambuf);
redraw = TRUE; /* update figurine's map location */ redraw = TRUE; /* update figurine's map location */
} }
break; break;
@@ -1760,9 +1738,8 @@ long timeout;
Strcpy(carriedby, "empty water"); Strcpy(carriedby, "empty water");
else else
Strcpy(carriedby, "thin air"); Strcpy(carriedby, "thin air");
You("see %s %s out of %s%s!", monnambuf, You("see %s %s out of %s!", monnambuf,
locomotion(mtmp->data, "drop"), carriedby, locomotion(mtmp->data, "drop"), carriedby);
hidebuf);
} }
break; break;
#if 0 #if 0