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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-06-05 08:08:32 -04:00
parent 6dd7dfa66c b982e6c526
commit bfc4445537
33 changed files with 542 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/hack.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 hack.c $NHDT-Date: 1559313320 2019/05/31 14:35:20 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.212 $ */
/* NetHack 3.6 hack.c $NHDT-Date: 1559664951 2019/06/04 16:15:51 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.213 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -2900,8 +2900,16 @@ const char *msg_override;
g.nomovemsg = msg_override;
else if (!g.nomovemsg)
g.nomovemsg = You_can_move_again;
if (*g.nomovemsg)
if (*g.nomovemsg) {
pline("%s", g.nomovemsg);
/* follow "you survived that attempt on your life" with a message
about current form if it's not the default; primarily for
life-saving while turning into green slime but is also a reminder
if life-saved while poly'd and Unchanging (explore or wizard mode
declining to die since can't be both Unchanging and Lifesaved) */
if (Upolyd && !strncmpi(g.nomovemsg, "You survived that ", 18))
You("are %s", an(mons[u.umonnum].mname)); /* (ignore Hallu) */
}
g.nomovemsg = 0;
u.usleep = 0;
g.multi_reason = NULL;