From c54149ef39bd16e834249cb6c50328c59a580a79 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Thu, 19 Feb 2004 21:03:57 +0000
Subject: [PATCH] (cons_choose): Clean up somewhat dirty use of union pointers
 that's not quite blessed by the standard and prone to trigger compiler
 warnings.

---
 src/lib/commands/cons.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c
index d0d38d6c..468b2b37 100644
--- a/src/lib/commands/cons.c
+++ b/src/lib/commands/cons.c
@@ -111,7 +111,6 @@ static int
 cons_choose(struct ltcomstr *ltcp)
 {
     s_char *p;
-    int (*dis)();
     struct lonstr *lp;
     struct trtstr *tp;
     s_char prompt[128];
@@ -148,7 +147,9 @@ cons_choose(struct ltcomstr *ltcp)
     if ((ltcp->num = onearg(player->argp[2], prompt)) < 0)
 	return RET_SYN;
     if (!ef_read(ltcp->type, ltcp->num, (caddr_t)&ltcp->u) ||
-	!(*dis) (ltcp->num, &ltcp->u)) {
+	!(ltcp->type == EF_TREATY
+	  ? distrea(ltcp->num, ltcp->u.t)
+	  : disloan(ltcp->num, ltcp->u.l))) {
 	pr("%s #%d is not being offered to you!\n", ltcp->Name, ltcp->num);
 	return RET_SYN;
     }