1 files changed, 22 insertions, 24 deletions

diff --git a/rogue/ring.c b/rogue/ring.c
index 8971f14c..321fd493 100644
--- a/rogue/ring.c
+++ b/rogue/ring.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ring.c,v 1.6 2003/08/07 09:37:39 agc Exp $	*/
+/*	$NetBSD: ring.c,v 1.7 2007/12/27 23:53:00 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)ring.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ring.c,v 1.6 2003/08/07 09:37:39 agc Exp $");
+__RCSID("$NetBSD: ring.c,v 1.7 2007/12/27 23:53:00 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -77,28 +77,28 @@ put_on_ring()
 	object *ring;
 
 	if (r_rings == 2) {
-		message("wearing two rings already", 0);
+		messagef(0, "wearing two rings already");
 		return;
 	}
 	if ((ch = pack_letter("put on what?", RING)) == CANCEL) {
 		return;
 	}
 	if (!(ring = get_letter_object(ch))) {
-		message("no such item.", 0);
+		messagef(0, "no such item.");
 		return;
 	}
 	if (!(ring->what_is & RING)) {
-		message("that's not a ring", 0);
+		messagef(0, "that's not a ring");
 		return;
 	}
 	if (ring->in_use_flags & (ON_LEFT_HAND | ON_RIGHT_HAND)) {
-		message("that ring is already being worn", 0);
+		messagef(0, "that ring is already being worn");
 		return;
 	}
 	if (r_rings == 1) {
 		ch = (rogue.left_ring ? 'r' : 'l');
 	} else {
-		message(left_or_right, 0);
+		messagef(0, "%s", left_or_right);
 		do {
 			ch = rgetchar();
 		} while ((ch != CANCEL) && (ch != 'l') && (ch != 'r') && (ch != '\n') &&
@@ -110,7 +110,7 @@ put_on_ring()
 	}
 	if (((ch == 'l') && rogue.left_ring)||((ch == 'r') && rogue.right_ring)) {
 		check_message();
-		message("there's already a ring on that hand", 0);
+		messagef(0, "there's already a ring on that hand");
 		return;
 	}
 	if (ch == 'l') {
@@ -120,8 +120,8 @@ put_on_ring()
 	}
 	ring_stats(1);
 	check_message();
-	get_desc(ring, desc);
-	message(desc, 0);
+	get_desc(ring, desc, sizeof(desc));
+	messagef(0, "%s", desc);
 	(void) reg_move();
 }
 
@@ -160,7 +160,7 @@ remove_ring()
 	} else if (!rogue.left_ring && rogue.right_ring) {
 		right = 1;
 	} else {
-		message(left_or_right, 0);
+		messagef(0, "%s", left_or_right);
 		do {
 			ch = rgetchar();
 		} while ((ch != CANCEL) && (ch != 'l') && (ch != 'r') &&
@@ -174,22 +174,21 @@ remove_ring()
 			if (rogue.left_ring) {
 				ring = rogue.left_ring;
 			} else {
-				message(no_ring, 0);
+				messagef(0, "%s", no_ring);
 			}
 		} else {
 			if (rogue.right_ring) {
 				ring = rogue.right_ring;
 			} else {
-				message(no_ring, 0);
+				messagef(0, "%s", no_ring);
 			}
 		}
 		if (ring->is_cursed) {
-			message(curse_message, 0);
+			messagef(0, "%s", curse_message);
 		} else {
 			un_put_on(ring);
-			(void) strcpy(buf, "removed ");
-			get_desc(ring, buf + 8);
-			message(buf, 0);
+			get_desc(ring, buf, sizeof(buf));
+			messagef(0, "removed %s", buf);
 			(void) reg_move();
 		}
 	}
@@ -257,23 +256,22 @@ inv_rings()
 	char buf[DCOLS];
 
 	if (r_rings == 0) {
-		message("not wearing any rings", 0);
+		messagef(0, "not wearing any rings");
 	} else {
 		if (rogue.left_ring) {
-			get_desc(rogue.left_ring, buf);
-			message(buf, 0);
+			get_desc(rogue.left_ring, buf, sizeof(buf));
+			messagef(0, "%s", buf);
 		}
 		if (rogue.right_ring) {
-			get_desc(rogue.right_ring, buf);
-			message(buf, 0);
+			get_desc(rogue.right_ring, buf, sizeof(buf));
+			messagef(0, "%s", buf);
 		}
 	}
 	if (wizard) {
-		sprintf(buf, "ste %d, r_r %d, e_r %d, r_t %d, s_s %d, a_s %d, reg %d, r_e %d, s_i %d, m_a %d, aus %d",
+		messagef(0, "ste %d, r_r %d, e_r %d, r_t %d, s_s %d, a_s %d, reg %d, r_e %d, s_i %d, m_a %d, aus %d",
 			stealthy, r_rings, e_rings, r_teleport, sustain_strength,
 			add_strength, regeneration, ring_exp, r_see_invisible,
 			maintain_armor, auto_search);
-		message(buf, 0);
 	}
 }