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

\#therecmdmenu #name monster

Browse Source 
Implement naming an adjacent monster with #therecmdmenu.

Also plug a memory leak using item-action name or call on objects.
This commit is contained in:
PatR
2022-05-15 11:01:44 -07:00
parent 3a0a92764a
commit 4d9c568a8e
2 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/cmd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 cmd.c $NHDT-Date: 1651279805 2022/04/30 00:50:05 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.561 $ */ /* NetHack 3.7 cmd.c $NHDT-Date: 1652637694 2022/05/15 18:01:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.563 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -4561,6 +4561,7 @@ enum menucmd {
MCMD_REMOVE_SADDLE, MCMD_REMOVE_SADDLE,
MCMD_APPLY_SADDLE, MCMD_APPLY_SADDLE,
MCMD_TALK, MCMD_TALK,
MCMD_NAME,
MCMD_QUAFF, MCMD_QUAFF,
MCMD_DIP, MCMD_DIP,
@@ -4594,7 +4595,8 @@ mcmd_addmenu(winid win, int act, const char *txt)
/* TODO: fixed letters for the menu entries? */ /* TODO: fixed letters for the menu entries? */
any = cg.zeroany; any = cg.zeroany;
any.a_int = act; any.a_int = act;
add_menu(win, &nul_glyphinfo, &any, '\0', 0, ATR_NONE, txt, MENU_ITEMFLAGS_NONE); add_menu(win, &nul_glyphinfo, &any, '\0', 0, ATR_NONE, txt,
MENU_ITEMFLAGS_NONE);
} }
/* command menu entries when targeting self */ /* command menu entries when targeting self */
@@ -4685,7 +4687,11 @@ there_cmd_menu_self(winid win, int x, int y, int *act UNUSED)
/* add entries to there_cmd_menu, when x,y is next to hero */ /* add entries to there_cmd_menu, when x,y is next to hero */
static int static int
there_cmd_menu_next2u(winid win, int x, int y, int mod, int *act) there_cmd_menu_next2u(
winid win,
int x, int y,
int mod,
int *act)
{ {
int K = 0; int K = 0;
char buf[BUFSZ]; char buf[BUFSZ];
@@ -4756,15 +4762,12 @@ there_cmd_menu_next2u(winid win, int x, int y, int mod, int *act)
Sprintf(buf, "Talk to %s", mon_nam(mtmp)); Sprintf(buf, "Talk to %s", mon_nam(mtmp));
mcmd_addmenu(win, MCMD_TALK, buf), ++K; mcmd_addmenu(win, MCMD_TALK, buf), ++K;
} }
#if 0
if (mtmp) { if (mtmp) {
Sprintf(buf, "%s %s", mon_nam(mtmp), Sprintf(buf, "%s %s",
!has_mname(mtmp) ? "Name" : "Rename"), ++K; !MGIVENNAME(mtmp) ? "Name" : "Rename",
/* need a way to pass mtmp or <ux+dx,uy+dy>to an 'int f()' function mon_nam(mtmp));
as well as reorganizinging do_mname() to use that function */ mcmd_addmenu(win, MCMD_NAME, buf), ++K;
add_herecmd_menuitem(win, XXX(), buf);
} }
#endif
if (mtmp || glyph_is_invisible(glyph_at(x, y))) { if (mtmp || glyph_is_invisible(glyph_at(x, y))) {
Sprintf(buf, "Attack %s", mtmp ? mon_nam(mtmp) : "unseen creature"); Sprintf(buf, "Attack %s", mtmp ? mon_nam(mtmp) : "unseen creature");
@@ -4797,7 +4800,11 @@ there_cmd_menu_far(winid win, xchar x, xchar y, int mod)
} }
static int static int
there_cmd_menu_common(winid win, xchar x UNUSED, xchar y UNUSED, int mod, int *act UNUSED) there_cmd_menu_common(
winid win,
xchar x UNUSED, xchar y UNUSED,
int mod,
int *act UNUSED)
{ {
int K = 0; int K = 0;
@@ -4813,6 +4820,7 @@ static char
there_cmd_menu(int x, int y, int mod) there_cmd_menu(int x, int y, int mod)
{ {
winid win; winid win;
struct obj *otmp;
char ch = '\0'; char ch = '\0';
int npick = 0, K = 0; int npick = 0, K = 0;
menu_item *picks = (menu_item *) 0; menu_item *picks = (menu_item *) 0;
@@ -4873,16 +4881,16 @@ there_cmd_menu(int x, int y, int mod)
cmdq_add_dir(dx, dy, 0); cmdq_add_dir(dx, dy, 0);
break; break;
case MCMD_LOCK_DOOR: case MCMD_LOCK_DOOR:
{ otmp = carrying(SKELETON_KEY);
struct obj *otmp = carrying(SKELETON_KEY); if (!otmp)
if (!otmp) otmp = carrying(LOCK_PICK); otmp = carrying(LOCK_PICK);
if (!otmp) otmp = carrying(CREDIT_CARD); if (!otmp)
if (otmp) { otmp = carrying(CREDIT_CARD);
cmdq_add_ec(doapply); if (otmp) {
cmdq_add_key(otmp->invlet); cmdq_add_ec(doapply);
cmdq_add_dir(dx, dy, 0); cmdq_add_key(otmp->invlet);
cmdq_add_key('y'); /* "Lock it?" */ cmdq_add_dir(dx, dy, 0);
} cmdq_add_key('y'); /* "Lock it?" */
} }
break; break;
case MCMD_UNTRAP_DOOR: case MCMD_UNTRAP_DOOR:
@@ -4923,14 +4931,10 @@ there_cmd_menu(int x, int y, int mod)
cmdq_add_key('y'); /* "Do you want to remove the saddle ..." */ cmdq_add_key('y'); /* "Do you want to remove the saddle ..." */
break; break;
case MCMD_APPLY_SADDLE: case MCMD_APPLY_SADDLE:
{ if ((otmp = carrying(SADDLE)) != 0) {
struct obj *otmp = carrying(SADDLE); cmdq_add_ec(doapply);
cmdq_add_key(otmp->invlet);
if (otmp) { cmdq_add_dir(dx, dy, 0);
cmdq_add_ec(doapply);
cmdq_add_key(otmp->invlet);
cmdq_add_dir(dx, dy, 0);
}
} }
break; break;
case MCMD_ATTACK_NEXT2U: case MCMD_ATTACK_NEXT2U:
@@ -4940,6 +4944,11 @@ there_cmd_menu(int x, int y, int mod)
cmdq_add_ec(dotalk); cmdq_add_ec(dotalk);
cmdq_add_dir(dx, dy, 0); cmdq_add_dir(dx, dy, 0);
break; break;
case MCMD_NAME:
cmdq_add_ec(docallcmd);
cmdq_add_key('m'); /* name a monster */
cmdq_add_dir(dx, dy, 0); /* getpos() will use u.ux+dx,u.uy+dy */
break;
case MCMD_QUAFF: case MCMD_QUAFF:
cmdq_add_ec(dodrink); cmdq_add_ec(dodrink);
cmdq_add_key('y'); /* "Drink from the fountain?" */ cmdq_add_key('y'); /* "Drink from the fountain?" */

26
src/do_name.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 do_name.c $NHDT-Date: 1646870842 2022/03/10 00:07:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.239 $ */ /* NetHack 3.7 do_name.c $NHDT-Date: 1652637698 2022/05/15 18:01:38 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.249 $ */
/* 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. */
@@ -684,6 +684,7 @@ getpos(coord *ccp, boolean force, const char *goal)
NHKF_GETPOS_VALID_NEXT, NHKF_GETPOS_VALID_NEXT,
NHKF_GETPOS_VALID_PREV NHKF_GETPOS_VALID_PREV
}; };
struct _cmd_queue cq, *cmdq;
char pick_chars[6]; char pick_chars[6];
char mMoOdDxX[13]; char mMoOdDxX[13];
int result = 0; int result = 0;
@@ -699,6 +700,21 @@ getpos(coord *ccp, boolean force, const char *goal)
int dx, dy; int dx, dy;
boolean rushrun = FALSE; boolean rushrun = FALSE;
/* temporary? if we have a queued direction, return the adjacent spot
in that direction */
if ((cmdq = cmdq_pop()) != 0) {
cq = *cmdq;
free((genericptr_t) cmdq);
if (cq.typ == CMDQ_DIR && !cq.dirz) {
ccp->x = u.ux + cq.dirx;
ccp->y = u.uy + cq.diry;
} else {
cmdq_clear();
result = -1;
}
return result;
}
for (i = 0; i < SIZE(pick_chars_def); i++) for (i = 0; i < SIZE(pick_chars_def); i++)
pick_chars[i] = g.Cmd.spkeys[pick_chars_def[i].nhkf]; pick_chars[i] = g.Cmd.spkeys[pick_chars_def[i].nhkf];
pick_chars[SIZE(pick_chars_def)] = '\0'; pick_chars[SIZE(pick_chars_def)] = '\0';
@@ -1424,14 +1440,16 @@ docallcmd(void)
winid win; winid win;
anything any; anything any;
menu_item *pick_list = 0; menu_item *pick_list = 0;
struct _cmd_queue *cmdq; struct _cmd_queue cq, *cmdq;
char ch = 0; char ch = 0;
/* if player wants a,b,c instead of i,o when looting, do that here too */ /* if player wants a,b,c instead of i,o when looting, do that here too */
boolean abc = flags.lootabc; boolean abc = flags.lootabc;
if ((cmdq = cmdq_pop()) != 0) { if ((cmdq = cmdq_pop()) != 0) {
if (cmdq->typ == CMDQ_KEY) cq = *cmdq;
ch = cmdq->key; free((genericptr_t) cmdq);
if (cq.typ == CMDQ_KEY)
ch = cq.key;
else else
cmdq_clear(); cmdq_clear();
goto docallcmd; goto docallcmd;