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

do_mname bit

Browse Source 
Couple of tweaks I made to do_mname() while investigating the tty
autodescribe wrapping issue.
This commit is contained in:
PatR
2019-06-12 18:04:00 -07:00
parent 1ad2415315
commit a336caf461
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/do_name.c
+5 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 do_name.c $NHDT-Date: 1560161806 2019/06/10 10:16:46 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.147 $ */ /* NetHack 3.6 do_name.c $NHDT-Date: 1560387831 2019/06/13 01:03:51 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.148 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1119,7 +1119,7 @@ char *monnambuf, *usrbuf;
STATIC_OVL void STATIC_OVL void
do_mname() do_mname()
{ {
char buf[BUFSZ] = DUMMY, monnambuf[BUFSZ], qbuf[QBUFSZ]; char buf[BUFSZ], monnambuf[BUFSZ], qbuf[QBUFSZ];
coord cc; coord cc;
int cx, cy; int cx, cy;
struct monst *mtmp = 0; struct monst *mtmp = 0;
@@ -1131,9 +1131,9 @@ do_mname()
cc.x = u.ux; cc.x = u.ux;
cc.y = u.uy; cc.y = u.uy;
if (getpos(&cc, FALSE, "the monster you want to name") < 0 if (getpos(&cc, FALSE, "the monster you want to name") < 0
|| (cx = cc.x) < 0) || !isok(cc.x, cc.y))
return; return;
cy = cc.y; cx = cc.x, cy = cc.y;
if (cx == u.ux && cy == u.uy) { if (cx == u.ux && cy == u.uy) {
if (u.usteed && canspotmon(u.usteed)) { if (u.usteed && canspotmon(u.usteed)) {
@@ -1158,6 +1158,7 @@ do_mname()
/* special case similar to the one in lookat() */ /* special case similar to the one in lookat() */
Sprintf(qbuf, "What do you want to call %s?", Sprintf(qbuf, "What do you want to call %s?",
distant_monnam(mtmp, ARTICLE_THE, monnambuf)); distant_monnam(mtmp, ARTICLE_THE, monnambuf));
buf[0] = '\0';
getlin(qbuf, buf); getlin(qbuf, buf);
if (!*buf || *buf == '\033') if (!*buf || *buf == '\033')
return; return;