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

Sting vs level teleport revisted

Browse Source 
This reverses all of c67f1dd710
except for the fixes37.0 entry and does a better job in a cleaner
fashion.  If Sting is going to start glowing and "you materialize
on a different level" is pending, give the materialize message
before the glowing message.  Otherwise handle both stop-glowing
and/or you-materialize in the normal fashion.
This commit is contained in:
PatR
2020-04-27 10:49:34 -07:00
parent c67f1dd710
commit c17301a75c
5 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/display.c
View File

@@ -1296,18 +1296,12 @@ see_monsters()
new_warn_obj_cnt++;
}
/* message sequencing: when changing levels via level teleport,
the start-glow/stop-glow message from Sting_effects() would come
too soon so we suppress it for docrt() -> see_monsters() then
reenable it and call see_monsters() a second time */
if (!iflags.no_glow) {
/*
* Make Sting glow blue or stop glowing if required.
*/
if (new_warn_obj_cnt != g.warn_obj_cnt) {
Sting_effects(new_warn_obj_cnt);
g.warn_obj_cnt = new_warn_obj_cnt;
}
/*
* Make Sting glow blue or stop glowing if required.
*/
if (new_warn_obj_cnt != g.warn_obj_cnt) {
Sting_effects(new_warn_obj_cnt);
g.warn_obj_cnt = new_warn_obj_cnt;
}
/* when mounted, hero's location gets caught by monster loop */