From 07a7b103ff02881c6aebe066bf59707d6be75d59 Mon Sep 17 00:00:00 2001 From: habu Date: Wed, 20 Feb 2013 13:04:40 +0000 Subject: [PATCH] Fix a bug of rumor code Duplicated messages were displayed in some cases. --- src/xtra2.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/xtra2.c b/src/xtra2.c index 4bd12d2ad..64f7a09bf 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -6346,7 +6346,7 @@ void display_rumor(bool ex) { char *zz[4]; cptr rumor_msg = NULL; - cptr rumor_eff = NULL; + cptr rumor_eff_format = NULL; char fullname[1024] = ""; if (tokenize(Rumor + 2, 3, zz, TOKENIZE_CHECKQUOTE) == 3) @@ -6409,11 +6409,7 @@ void display_rumor(bool ex) if (!max_dlv[d_idx]) { max_dlv[d_idx] = d_ptr->mindepth; -#ifdef JP - rumor_eff = format("%s¤Ëµ¢´Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¡£", fullname); -#else - rumor_eff = format("You can recall to %s.", fullname); -#endif + rumor_eff_format = _("%s¤Ëµ¢´Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¡£", "You can recall to %s."); } } else if (strcmp(zz[0], "TOWN") == 0) @@ -6433,20 +6429,16 @@ void display_rumor(bool ex) if ((t_idx != SECRET_TOWN) && !(p_ptr->visit & visit)) { p_ptr->visit |= visit; -#ifdef JP - rumor_eff = format("%s¤Ë¹Ô¤Ã¤¿¤³¤È¤¬¤¢¤ëµ¤¤¬¤¹¤ë¡£", fullname); -#else - rumor_eff = format("You feel you have been to %s.", fullname); -#endif + rumor_eff_format = _("%s¤Ë¹Ô¤Ã¤¿¤³¤È¤¬¤¢¤ëµ¤¤¬¤¹¤ë¡£", "You feel you have been to %s."); } } rumor_msg = rumor_bind_name(zz[2], fullname); msg_print(rumor_msg); - if (rumor_eff) + if (rumor_eff_format) { msg_print(NULL); - msg_print(rumor_eff); + msg_format(rumor_eff_format, fullname); } err = FALSE; } -- 2.11.0