From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 13 Jun 2005 18:48:54 +0000 (+0000)
Subject: (outid): Fix recovery from bad argument N.  Simplify.
X-Git-Tag: v4.2.21~42
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=9046ff0ad2d611b47bbccb76de0d257509624cc1

(outid): Fix recovery from bad argument N.  Simplify.
---

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index 710e8aeda..9c84549f7 100644
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -263,18 +263,15 @@ pr_hilite(s_char *buf)
 static void
 outid(struct player *pl, int n)
 {
-    s_char c;
-    s_char buf[3];
+    char buf[3];
+
+    if (CANT_HAPPEN(n > C_LAST))
+	n = C_DATA;
 
-    if (n > C_LAST) {
-	logerror("outid: %d not valid code\n", n);
-	return;
-    }
     if (n >= 10)
-	c = 'a' - 10 + n;
+	buf[0] = 'a' - 10 + n;
     else
-	c = '0' + n;
-    buf[0] = c;
+	buf[0] = '0' + n;
     buf[1] = ' ';
     buf[2] = '\0';
     io_puts(pl->iop, buf);