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

1
include/extern.h
View File

@@ -416,6 +416,7 @@ E void NDECL(save_currentstate);
#endif
E void FDECL(u_collide_m, (struct monst *));
E void FDECL(goto_level, (d_level *, BOOLEAN_P, BOOLEAN_P, BOOLEAN_P));
E void NDECL(maybe_lvltport_feedback);
E void FDECL(schedule_goto, (d_level *, BOOLEAN_P, BOOLEAN_P, int,
const char *, const char *));
E void NDECL(deferred_goto);

1
include/flag.h
View File

@@ -219,7 +219,6 @@ struct instance_flags {
int failing_untrap; /* move_into_trap() -> spoteffects() -> dotrap() */
int in_lava_effects; /* hack for Boots_off() */
int last_msg; /* indicator of last message player saw */
int no_glow; /* controls see_monster()'s Sting_effects() */
int override_ID; /* true to force full identification of objects */
int parse_config_file_src; /* hack for parse_config_line() */
int purge_monsters; /* # of dead monsters still on fmon list */