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

display effect bits

Browse Source
This commit is contained in:
nhmall
2019-06-09 08:08:50 -04:00
parent 5f676aa56c
commit f1f085c7fd
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/display.c
+3 -1
View File
@@ -1080,7 +1080,9 @@ int x, y, tg;
int i, glyph[2]; int i, glyph[2];
glyph[0] = tg; glyph[0] = tg;
glyph[1] = glyph_at(x, y); glyph[1] = (level.flags.hero_memory)
? levl[x][y].glyph
: back_to_glyph(x, y);
for (i = 0; i < 15; i++) { for (i = 0; i < 15; i++) {
show_glyph(x, y, glyph[i % 2]); show_glyph(x, y, glyph[i % 2]);
flush_screen(1); flush_screen(1);
src/read.c
+4 -7
View File
@@ -2522,7 +2522,7 @@ create_particular_creation(d)
struct _create_particular_data *d; struct _create_particular_data *d;
{ {
struct permonst *whichpm = NULL; struct permonst *whichpm = NULL;
int i, saveglyph, firstchoice = NON_PM; int i, flashglyph, firstchoice = NON_PM;
struct monst *mtmp; struct monst *mtmp;
boolean madeany = FALSE, doflash = FALSE; boolean madeany = FALSE, doflash = FALSE;
@@ -2553,6 +2553,7 @@ struct _create_particular_data *d;
/* otherwise try again */ /* otherwise try again */
continue; continue;
} }
flashglyph = mon_to_glyph(mtmp, rn2_on_display_rng);
/* 'is_FOO()' ought to be called 'always_FOO()' */ /* 'is_FOO()' ought to be called 'always_FOO()' */
if (d->fem != -1 && !is_male(mtmp->data) && !is_female(mtmp->data)) if (d->fem != -1 && !is_male(mtmp->data) && !is_female(mtmp->data))
mtmp->female = d->fem; /* ignored for is_neuter() */ mtmp->female = d->fem; /* ignored for is_neuter() */
@@ -2570,20 +2571,16 @@ struct _create_particular_data *d;
} }
if (d->invisible) { if (d->invisible) {
int mx = mtmp->mx, my = mtmp->my; int mx = mtmp->mx, my = mtmp->my;
saveglyph = glyph_at(mx, my);
mon_set_minvis(mtmp); mon_set_minvis(mtmp);
if (does_block(mx, my, &levl[mx][my])) if (does_block(mx, my, &levl[mx][my]))
block_point(mx, my); block_point(mx, my);
else else
unblock_point(mx, my); unblock_point(mx, my);
if (saveglyph == glyph_at(mx, my))
saveglyph = mon_to_glyph(mtmp, rn2_on_display_rng);
doflash = TRUE; doflash = TRUE;
} }
if (d->hidden && is_hider(mtmp->data)) { if (d->hidden && is_hider(mtmp->data)) {
saveglyph = glyph_at(mtmp->mx, mtmp->my);
mtmp->mundetected = 1; mtmp->mundetected = 1;
newsym(mtmp->mx, mtmp->my);
doflash = TRUE; doflash = TRUE;
} }
if (d->sleeping) if (d->sleeping)
@@ -2591,7 +2588,7 @@ struct _create_particular_data *d;
if (doflash) { if (doflash) {
if (wizard && cansee(mtmp->mx, mtmp->my)) if (wizard && cansee(mtmp->mx, mtmp->my))
if (!canseemon(mtmp) && !sensemon(mtmp)) if (!canseemon(mtmp) && !sensemon(mtmp))
flash_glyph_at(mtmp->mx, mtmp->my, saveglyph); flash_glyph_at(mtmp->mx, mtmp->my, flashglyph);
} }
madeany = TRUE; madeany = TRUE;
/* in case we got a doppelganger instead of what was asked /* in case we got a doppelganger instead of what was asked