From f794d7449f8185d3b08b5e3063eb78ba734e2f5c Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Tue, 14 Jan 2020 00:08:43 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20'#ifndef=20JP'=20=E3=82=92?=
 =?utf8?q?=20'#ifdef=20JP/#else'=E3=81=AB=E5=B7=AE=E3=81=97=E6=9B=BF?=
 =?utf8?q?=E3=81=88=20/=20Changed=20pre-processor=20'#ifndef=20JP'=20to=20?=
 =?utf8?q?'#ifdef=20JP/#else'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd/cmd-activate.c |  3 ++-
 src/cmd/cmd-dump.c     |  4 ++--
 src/cmd/cmd-dump.h     |  3 ++-
 src/files.c            |  3 ++-
 src/main-win.c         |  8 ++++++--
 src/monster-status.c   |  4 +++-
 src/monster1.c         | 31 +++++++++++++++++++++----------
 src/mspells1.c         |  8 ++++++--
 src/mspells2.c         |  8 ++++++--
 src/object-flavor.c    | 12 +++++++++---
 src/object2.c          |  4 +++-
 src/player-status.c    |  4 +++-
 src/quest.c            |  3 ++-
 src/spells1.c          |  4 +++-
 src/targeting.c        |  3 ++-
 src/wizard1.c          |  3 ++-
 16 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index e4ec4070c..14fa59840 100644
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -549,7 +549,8 @@ void exe_activate(player_type *user_ptr, INVENTORY_IDX item)
 					{
 						char buf[80];
 						concptr t;
-#ifndef JP
+#ifdef JP
+#else
 						bool quote = FALSE;
 #endif
 
diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index ceca7de0f..8a2bb4c1a 100644
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -367,8 +367,8 @@ static void close_auto_dump(void)
 }
 
 
-#ifndef JP
-
+#ifdef JP
+#else
 /*!
  * @brief Return suffix of ordinal number
  * @param num number
diff --git a/src/cmd/cmd-dump.h b/src/cmd/cmd-dump.h
index f31e89fa3..c2e6f86dc 100644
--- a/src/cmd/cmd-dump.h
+++ b/src/cmd/cmd-dump.h
@@ -45,7 +45,8 @@
 
 
 /* cmd4.c */
-#ifndef JP
+#ifdef JP
+#else
 extern concptr get_ordinal_number_suffix(int num);
 #endif
 extern errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note);
diff --git a/src/files.c b/src/files.c
index 8ca87fe09..b83e83bf1 100644
--- a/src/files.c
+++ b/src/files.c
@@ -5954,7 +5954,8 @@ void print_tomb(player_type *dead_ptr)
 	center_string(buf, dead_ptr->name);
 	put_str(buf, 6, 11);
 
-#ifndef JP
+#ifdef JP
+#else
 	center_string(buf, "the");
 	put_str(buf, 7, 11);
 #endif
diff --git a/src/main-win.c b/src/main-win.c
index f9d281150..e798f29cc 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -3379,7 +3379,9 @@ static void setup_menus(void)
 		MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
 	EnableMenuItem(hm, IDM_OPTIONS_SOUND,
 		MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-#ifndef JP
+#ifdef JP
+#else
+
 	EnableMenuItem(hm, IDM_OPTIONS_SAVER,
 		MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
 #endif
@@ -3408,7 +3410,9 @@ static void setup_menus(void)
 		(arg_sound ? MF_CHECKED : MF_UNCHECKED));
 	CheckMenuItem(hm, IDM_OPTIONS_BG,
 		(use_bg ? MF_CHECKED : MF_UNCHECKED));
-#ifndef JP
+#ifdef JP
+#else
+
 	CheckMenuItem(hm, IDM_OPTIONS_SAVER,
 		(hwndSaver ? MF_CHECKED : MF_UNCHECKED));
 #endif
diff --git a/src/monster-status.c b/src/monster-status.c
index 85eb59d35..6837b4225 100644
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -744,7 +744,9 @@ static void process_monsters_mtimed_aux(player_type *target_ptr, MONSTER_IDX m_i
 		if (is_seen(m_ptr))
 		{
 			GAME_TEXT m_name[MAX_NLEN];
-#ifndef JP
+#ifdef JP
+#else
+
 			char m_poss[80];
 
 			/* Acquire the monster possessive */
diff --git a/src/monster1.c b/src/monster1.c
index 123a5db91..cd6e98399 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -523,7 +523,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			hooked_roff(format(_("%^sは", "%^s "), wd_he[msex]));
 			old = TRUE;
 		}
-#ifndef JP
+#ifdef JP
+#else
 		hooked_roff("moves");
 #endif
 
@@ -740,7 +741,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			{
 				hooked_roff(_("少なくとも", " at the least"));
 			}
-#ifndef JP
+#ifdef JP
+#else
 			hooked_roff(" contain ");
 #endif			
 			for(n = 0; n < A_MAX; n++)
@@ -1655,7 +1657,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 		/* Intro */
 		hooked_roff(format(
 			_("%^sは", "%^s may carry"), wd_he[msex]));
-#ifndef JP
+#ifdef JP
+#else
 		/* No "n" needed */
 		sin = FALSE;
 #endif
@@ -1668,7 +1671,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 		if (n == 1)
 		{
 			hooked_roff(_("一つの", " a"));
-#ifndef JP
+#ifdef JP
+#else
 			sin = TRUE;
 #endif
 		}
@@ -1698,7 +1702,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 		else if (flags1 & RF1_DROP_GOOD)
 		{
 			p = _("上質な", " good");
-#ifndef JP
+#ifdef JP
+#else
 			sin = FALSE;
 #endif
 		}
@@ -1713,7 +1718,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 		if (drop_item)
 		{
 			/* Handle singular "an" */
-#ifndef JP
+#ifdef JP
+#else
 			if (sin) hooked_roff("n");
 			sin = FALSE;
 #endif
@@ -1723,7 +1729,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			hooked_roff(
 				_("アイテム", " object"));
 
-#ifndef JP
+#ifdef JP
+#else
 			if (n != 1) hooked_roff("s");
 #endif
 
@@ -1734,7 +1741,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 		/* Treasures */
 		if (drop_gold)
 		{
-#ifndef JP
+#ifdef JP
+#else
 			/* Cancel prefix */
 			if (!p) sin = FALSE;
 
@@ -1746,7 +1754,8 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			/* Dump "treasure(s)" */
 			if (p) hooked_roff(p);
 			hooked_roff(_("財宝", " treasure"));
-#ifndef JP
+#ifdef JP
+#else
 			if (n != 1) hooked_roff("s");
 #endif
 
@@ -2018,7 +2027,9 @@ void roff_top(MONRACE_IDX r_idx)
 	/* Reset the cursor */
 	Term_gotoxy(0, 0);
 
-#ifndef JP
+#ifdef JP
+#else
+
 	/* A title (use "The" for non-uniques) */
 	if (!(r_ptr->flags1 & RF1_UNIQUE))
 	{
diff --git a/src/mspells1.c b/src/mspells1.c
index de3d44c0e..0f14f0c51 100644
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1343,7 +1343,9 @@ static bool adjacent_grid_check(player_type *target_ptr, monster_type *m_ptr, PO
  */
 bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr)
 {
-#ifndef JP
+#ifdef JP
+#else
+
 	char m_poss[80];
 #endif
 	/* Extract the "see-able-ness" */
@@ -1637,7 +1639,9 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr)
 	GAME_TEXT m_name[MAX_NLEN];
 	monster_desc(m_name, m_ptr, 0x00);
 
-#ifndef JP
+#ifdef JP
+#else
+
 	/* Get the monster possessive ("his"/"her"/"its") */
 	monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
diff --git a/src/mspells2.c b/src/mspells2.c
index 326c4f0c1..91fef78af 100644
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -267,7 +267,9 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx)
 	GAME_TEXT m_name[160];
 	GAME_TEXT t_name[160];
 
-#ifndef JP
+#ifdef JP
+#else
+
 	char m_poss[160];
 #endif
 
@@ -661,7 +663,9 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx)
 	/* Get the monster name (or "it") */
 	monster_desc(m_name, m_ptr, 0x00);
 
-#ifndef JP
+#ifdef JP
+#else
+
 	/* Get the monster possessive ("his"/"her"/"its") */
 	monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
diff --git a/src/object-flavor.c b/src/object-flavor.c
index 318955161..67a522249 100644
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -1007,7 +1007,9 @@ static flag_insc_table flag_insc_sust[] =
  */
 static char *inscribe_flags_aux(flag_insc_table *fi_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE], bool kanji, char *ptr)
 {
-#ifndef JP
+#ifdef JP
+#else
+
 	(void)kanji;
 #endif
 
@@ -2102,7 +2104,9 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode)
 			kindname = "";
 		}
 
-#ifndef JP
+#ifdef JP
+#else
+
 		/* Pluralizer */
 		else if (*s == '~')
 		{
@@ -2672,7 +2676,9 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode)
 			else if (have_flag(flgs, TR_BLOWS))
 			{
 				t = object_desc_str(t, _("攻撃", " attack"));
-#ifndef JP
+#ifdef JP
+#else
+
 				if (ABS(o_ptr->pval) != 1) t = object_desc_chr(t, 's');
 #endif
 			}
diff --git a/src/object2.c b/src/object2.c
index 37818fd7d..74396fcf7 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -4195,7 +4195,9 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan
 	bool flag = FALSE;
 	bool done = FALSE;
 
-#ifndef JP
+#ifdef JP
+#else
+
 	/* Extract plural */
 	bool plural = (j_ptr->number != 1);
 #endif
diff --git a/src/player-status.c b/src/player-status.c
index f39d41cad..428044dcb 100644
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5275,7 +5275,9 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
 
 		get_mon_num_prep(NULL, NULL);
 
-#ifndef JP
+#ifdef JP
+#else
+
 		if (!(r_ptr->flags1 & RF1_UNIQUE))
 			sprintf(m_name, "%s %s", (is_a_vowel(desc[0]) ? "an" : "a"), desc);
 		else
diff --git a/src/quest.c b/src/quest.c
index 593d3bf1c..a2aac0b50 100644
--- a/src/quest.c
+++ b/src/quest.c
@@ -356,7 +356,8 @@ void quest_discovery(QUEST_IDX q_idx)
 
 	if (q_num != 1)
 	{
-#ifndef JP
+#ifdef JP
+#else
 		plural_aux(name);
 #endif
 		msg_format(_("注意しろ！この階は%d体の%sによって守られている！", "Be warned, this level is guarded by %d %s!"), q_num, name);
diff --git a/src/spells1.c b/src/spells1.c
index 19205069a..46bee927c 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -796,7 +796,9 @@ static bool project_o(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI
 
 		concptr note_kill = NULL;
 
-#ifndef JP
+#ifdef JP
+#else
+
 		/* Get the "plural"-ness */
 		bool plural = (o_ptr->number > 1);
 #endif
diff --git a/src/targeting.c b/src/targeting.c
index a995f61fa..51f778200 100644
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -943,7 +943,8 @@ static char target_set_aux(player_type *subject_ptr, POSITION y, POSITION x, BIT
 	{
 		s2 = _("の入口", "");
 	}
-#ifndef JP
+#ifdef JP
+#else
 	else if (have_flag(f_ptr->flags, FF_FLOOR) ||
 		have_flag(f_ptr->flags, FF_TOWN) ||
 		have_flag(f_ptr->flags, FF_SHALLOW) ||
diff --git a/src/wizard1.c b/src/wizard1.c
index 3dcf9074e..5d05178dc 100644
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -2067,7 +2067,8 @@ static void spoil_mon_info(concptr fname)
 		}
 		else
 		{
-#ifndef JP
+#ifdef JP
+#else
 			spoil_out("The ");
 #endif
 		}
-- 
2.11.0