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

simplify streamlined act_on_act()

Browse Source 
More PR #777:  there's no need for there_cmd_menu() to pass absolute
<x,y> instead of <dx,dy> for a couple of actions.  Those actions can
reconstruct <x,y> by adding <dx,dy> to <u.ux,u.uy>.
This commit is contained in:
PatR
2022-06-13 11:30:59 -07:00
parent 778eb2603d
commit c4c6c3d73a
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cmd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 cmd.c $NHDT-Date: 1655120485 2022/06/13 11:41:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.573 $ */ /* NetHack 3.7 cmd.c $NHDT-Date: 1655145035 2022/06/13 18:30:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.574 $ */
/* 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. */
@@ -4927,15 +4927,15 @@ there_cmd_menu_common(
static void static void
act_on_act( act_on_act(
int act, /* action */ int act, /* action */
int dx, int dy) /* delta to adjacent spot (except for couple of cases) */ int dx, int dy) /* delta to adjacent spot (farther for couple of cases) */
{ {
struct obj *otmp; struct obj *otmp;
int dir; int dir;
switch (act) { switch (act) {
case MCMD_TRAVEL: case MCMD_TRAVEL:
iflags.travelcc.x = u.tx = dx; /* caller passed x via dx */ iflags.travelcc.x = u.tx = u.ux + dx;
iflags.travelcc.y = u.ty = dy; /* and y via dy */ iflags.travelcc.y = u.ty = u.uy + dy;
cmdq_add_ec(dotravel_target); cmdq_add_ec(dotravel_target);
break; break;
case MCMD_THROW_OBJ: case MCMD_THROW_OBJ:
@@ -5065,8 +5065,8 @@ act_on_act(
cmdq_add_ec(dolook); cmdq_add_ec(dolook);
break; break;
case MCMD_LOOK_AT: case MCMD_LOOK_AT:
g.clicklook_cc.x = dx; /* caller passed x via dx */ g.clicklook_cc.x = u.ux + dx;
g.clicklook_cc.y = dy; /* and y via dy */ g.clicklook_cc.y = u.uy + dy;
cmdq_add_ec(doclicklook); cmdq_add_ec(doclicklook);
break; break;
case MCMD_UNTRAP_HERE: case MCMD_UNTRAP_HERE:
@@ -5085,8 +5085,6 @@ act_on_act(
} }
} }
#define act_needs_xy(act) ((act) == MCMD_TRAVEL || (act) == MCMD_LOOK_AT)
/* offer choice of actions to perform at adjacent location <x,y> */ /* offer choice of actions to perform at adjacent location <x,y> */
static char static char
there_cmd_menu(int x, int y, int mod) there_cmd_menu(int x, int y, int mod)
@@ -5124,8 +5122,7 @@ there_cmd_menu(int x, int y, int mod)
ch = '\0'; ch = '\0';
} else if (K == 1 && act != MCMD_NOTHING) { } else if (K == 1 && act != MCMD_NOTHING) {
destroy_nhwindow(win); destroy_nhwindow(win);
if (act_needs_xy(act))
dx = x, dy = y;
act_on_act(act, dx, dy); act_on_act(act, dx, dy);
return '\0'; return '\0';
} else { } else {
@@ -5138,17 +5135,12 @@ there_cmd_menu(int x, int y, int mod)
act = picks->item.a_int; act = picks->item.a_int;
free((genericptr_t) picks); free((genericptr_t) picks);
/* most actions want <dx,dy> but a few want absolute <x,y> */
if (act_needs_xy(act))
dx = x, dy = y;
act_on_act(act, dx, dy); act_on_act(act, dx, dy);
return '\0'; return '\0';
} }
return ch; return ch;
} }
#undef act_needs_xy
static char static char
here_cmd_menu(void) here_cmd_menu(void)
{ {