From 05a561caa697fc4fddf53df8289071fd5f1d0d25 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 22 Mar 2020 17:25:57 +0900
Subject: [PATCH] [Refactor] #40236 Moved get_ordinal_number_suffix() from
 cmd-dump.c to write-diary.c

---
 src/character-dump.c |  1 +
 src/cmd/cmd-dump.c   | 25 -------------------------
 src/cmd/cmd-dump.h   |  4 ----
 src/io/write-diary.c | 25 +++++++++++++++++++++++++
 src/io/write-diary.h |  4 ++++
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/character-dump.c b/src/character-dump.c
index 6d2810880..d33fec2fc 100644
--- a/src/character-dump.c
+++ b/src/character-dump.c
@@ -14,6 +14,7 @@
 #include "cmd/cmd-dump.h"
 #include "io/special-class-dump.h"
 #include "io/player-status-dump.h"
+#include "io/write-diary.h"
 #include "avatar.h"
 
 /*!
diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 8c25d0921..306201cba 100644
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -90,31 +90,6 @@ static SYMBOL_CODE char_idx_feat[F_LIT_MAX];
 // Encode the screen colors
 static char hack[17] = "dwsorgbuDWvyRGBU";
 
-#ifdef JP
-#else
-/*!
- * @brief Return suffix of ordinal number
- * @param num number
- * @return pointer of suffix string.
- */
-concptr get_ordinal_number_suffix(int num)
-{
-	num = ABS(num) % 100;
-	switch (num % 10)
-	{
-	case 1:
-		return (num == 11) ? "th" : "st";
-	case 2:
-		return (num == 12) ? "th" : "nd";
-	case 3:
-		return (num == 13) ? "th" : "rd";
-	default:
-		return "th";
-	}
-}
-#endif
-
-
 /*!
  * @brief 日記のタイトル表記と内容出力
  * @param creature_ptr プレーヤーへの参照ポインタ
diff --git a/src/cmd/cmd-dump.h b/src/cmd/cmd-dump.h
index 76476cb46..0f4d1179b 100644
--- a/src/cmd/cmd-dump.h
+++ b/src/cmd/cmd-dump.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#ifdef JP
-#else
-extern concptr get_ordinal_number_suffix(int num);
-#endif
 extern void do_cmd_diary(player_type *creature_ptr);
 extern void do_cmd_redraw(player_type *creature_ptr);
 extern void do_cmd_player_status(player_type *creature_ptr);
diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index da61f0a90..70c92b8f3 100644
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -15,6 +15,31 @@
 // todo *抹殺* したい…
 bool write_level;
 
+#ifdef JP
+#else
+/*!
+ * @brief Return suffix of ordinal number
+ * @param num number
+ * @return pointer of suffix string.
+ */
+concptr get_ordinal_number_suffix(int num)
+{
+	num = ABS(num) % 100;
+	switch (num % 10)
+	{
+	case 1:
+		return (num == 11) ? "th" : "st";
+	case 2:
+		return (num == 12) ? "th" : "nd";
+	case 3:
+		return (num == 13) ? "th" : "rd";
+	default:
+		return "th";
+	}
+}
+#endif
+
+
 /*!
  * todo files.c に移すことも検討する？
  * @brief 日記ファイルを開く
diff --git a/src/io/write-diary.h b/src/io/write-diary.h
index f5ac78954..8a3396c06 100644
--- a/src/io/write-diary.h
+++ b/src/io/write-diary.h
@@ -46,4 +46,8 @@
 
 extern bool write_level;
 
+#ifdef JP
+#else
+concptr get_ordinal_number_suffix(int num);
+#endif
 errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note);
-- 
2.11.0