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

some coordxy follow-up

Browse Source 
Return a couple of variables that actually held a direction back
to int from coordxy.

bhit() takes int params instead of coordxy.

boomhit() takes int params instead of coordxy.

xytod() renamed to xytodir(), and takes int params (promotion will handle
coordxy params).

dtoxy(coord *, int) renamed to dirtocoord(coord *, int).
This commit is contained in:
nhmall
2026-02-11 09:40:25 -05:00
parent db36ee35de
commit fcd9f5468c
12 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cmd.c
View File

@@ -3615,7 +3615,7 @@ rhack(int key)
/* convert an x,y pair into a direction code */
int
xytod(coordxy x, coordxy y)
xytodir(int x, int y)
{
int dd;
@@ -3627,7 +3627,7 @@ xytod(coordxy x, coordxy y)
/* convert a direction code into an x,y pair */
void
dtoxy(coord *cc, int dd)
dirtocoord(coord *cc, int dd)
{
if (dd > DIR_ERR && dd < N_DIRS_Z) {
cc->x = xdir[dd];
@@ -3733,7 +3733,7 @@ getdir(const char *s)
if (cmdq) {
if (cmdq->typ == CMDQ_DIR) {
if (!cmdq->dirz) {
dirsym = gc.Cmd.dirchars[xytod(cmdq->dirx, cmdq->diry)];
dirsym = gc.Cmd.dirchars[xytodir(cmdq->dirx, cmdq->diry)];
} else {
dirsym = gc.Cmd.dirchars[(cmdq->dirz > 0) ? DIR_DOWN
: DIR_UP];
@@ -4501,7 +4501,7 @@ act_on_act(
cmdq_add_dir(CQ_CANNED, dx, dy, 0);
break;
case MCMD_MOVE_DIR:
dir = xytod(dx, dy);
dir = xytodir(dx, dy);
cmdq_add_ec(CQ_CANNED, move_funcs[dir][MV_WALK]);
break;
case MCMD_RIDE:
@@ -4523,7 +4523,7 @@ act_on_act(
}
break;
case MCMD_ATTACK_NEXT2U:
dir = xytod(dx, dy);
dir = xytodir(dx, dy);
cmdq_add_ec(CQ_CANNED, move_funcs[dir][MV_WALK]);
break;
case MCMD_TALK:
@@ -4633,7 +4633,7 @@ there_cmd_menu(coordxy x, coordxy y, int mod)
if (!K) {
/* no menu options, try to move */
if (next2u(x, y) && test_move(u.ux, u.uy, dx, dy, TEST_MOVE)) {
int dir = xytod(dx, dy);
int dir = xytodir(dx, dy);
cmdq_add_ec(CQ_CANNED, move_funcs[dir][MV_WALK]);
} else if (flags.travelcmd) {
@@ -4727,7 +4727,7 @@ domouseaction(void)
/* directional commands */
dir = xytod(x, y);
dir = xytodir(x, y);
if (!m_at(u.ux + x, u.uy + y)
&& !test_move(u.ux, u.uy, x, y, TEST_MOVE)) {
if (IS_DOOR(levl[u.ux + x][u.uy + y].typ)) {
@@ -4766,7 +4766,7 @@ domouseaction(void)
cmdq_add_ec(CQ_CANNED, donull);
return ECMD_OK;
}
dir = xytod(x, y);
dir = xytodir(x, y);
}
/* move, attack, etc. */