From ae9b236ee621937d2a949d2b8b91c5fcd9b66039 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 11 Mar 2023 15:12:02 -0500
Subject: [PATCH] a few more coordxy inconsistencies

---
 include/extern.h | 4 ++--
 src/dogmove.c    | 3 ++-
 src/steed.c      | 2 +-
 src/track.c      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/extern.h b/include/extern.h
index 9379dccef..1443013c2 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -2747,7 +2747,7 @@ extern boolean mount_steed(struct monst *, boolean);
 extern void exercise_steed(void);
 extern void kick_steed(void);
 extern void dismount_steed(int);
-extern void place_monster(struct monst *, int, int);
+extern void place_monster(struct monst *, coordxy, coordxy);
 extern boolean stucksteed(boolean);
 
 /* ### symbols.c ### */
@@ -2870,7 +2870,7 @@ extern struct obj *tt_oname(struct obj *);
 
 extern void initrack(void);
 extern void settrack(void);
-extern coord *gettrack(int, int);
+extern coord *gettrack(coordxy, coordxy);
 
 /* ### trap.c ### */
 
diff --git a/src/dogmove.c b/src/dogmove.c
index 20b989973..151d5d517 100644
--- a/src/dogmove.c
+++ b/src/dogmove.c
@@ -381,7 +381,8 @@ dog_hunger(struct monst *mtmp, struct edog *edog)
 static int
 dog_invent(struct monst *mtmp, struct edog *edog, int udist)
 {
-    int omx, omy, carryamt = 0;
+    coordxy omx, omy;
+    int carryamt = 0;
     struct obj *obj, *otmp;
 
     if (helpless(mtmp))
diff --git a/src/steed.c b/src/steed.c
index 99a7eb101..13971e8bd 100644
--- a/src/steed.c
+++ b/src/steed.c
@@ -833,7 +833,7 @@ stucksteed(boolean checkfeeding)
 }
 
 void
-place_monster(struct monst* mon, int x, int y)
+place_monster(struct monst* mon, coordxy x, coordxy y)
 {
     struct monst *othermon;
     const char *monnm, *othnm;
diff --git a/src/track.c b/src/track.c
index 6e5704588..b5ccd2d7f 100644
--- a/src/track.c
+++ b/src/track.c
@@ -31,7 +31,7 @@ settrack(void)
 }
 
 coord *
-gettrack(register int x, register int y)
+gettrack(coordxy x, coordxy y)
 {
     register int cnt, ndist;
     register coord *tc;