From 19e985fa26b2980a48f9c58aa776492e490bd9a0 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Fri, 22 Mar 2024 20:43:15 -0700
Subject: [PATCH] fix #K4123 - pair of u_init.c macros not used

W_MULTSTART and W_MULTEND were last used in nethack 2.3.
Time to finally Get rid of them.
---
 src/u_init.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/u_init.c b/src/u_init.c
index 910e32eea..5900675e7 100644
--- a/src/u_init.c
+++ b/src/u_init.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	u_init.c	$NHDT-Date: 1621131203 2021/05/16 02:13:23 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.75 $ */
+/* NetHack 3.7	u_init.c	$NHDT-Date: 1711165379 2024/03/23 03:42:59 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.106 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2017. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -166,8 +166,6 @@ static struct trobj Valkyrie[] = {
     { 0, 0, 0, 0, 0 }
 };
 static struct trobj Wizard[] = {
-#define W_MULTSTART 2
-#define W_MULTEND 6
     { QUARTERSTAFF, 1, WEAPON_CLASS, 1, 1 },
     { CLOAK_OF_MAGIC_RESISTANCE, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
@@ -1268,4 +1266,18 @@ ini_inv(struct trobj *trop)
     }
 }
 
+#undef UNDEF_TYP
+#undef UNDEF_SPE
+#undef UNDEF_BLESS
+#undef B_MAJOR
+#undef B_MINOR
+#undef C_AMMO
+#undef M_BOOK
+#undef RAN_BOW
+#undef RAN_TWO_ARROWS
+#undef RAN_ZERO_ARROWS
+#undef R_DAGGERS
+#undef S_ARROWS
+#undef T_DARTS
+
 /*u_init.c*/