From b3d5218c9610a3d72501cd3257efe3ccf0071a15 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Sat, 5 Jan 2019 12:18:46 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?=
 =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/autopick.c | 194 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/src/autopick.c b/src/autopick.c
index dbe1a68da..ee5f8a0e8 100644
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -73,107 +73,107 @@
 
 #ifdef JP
 
-static char KEY_ALL[] = "すべての";
-static char KEY_UNAWARE[] = "未判明の";
-static char KEY_UNIDENTIFIED[] = "未鑑定の";
-static char KEY_IDENTIFIED[] = "鑑定済みの";
-static char KEY_STAR_IDENTIFIED[] = "*鑑定*済みの";
-static char KEY_COLLECTING[] = "収集中の";
-static char KEY_ARTIFACT[] = "アーティファクト";
-static char KEY_EGO[] = "エゴ";
-static char KEY_GOOD[] = "上質の";
-static char KEY_NAMELESS[] = "無銘の";
-static char KEY_AVERAGE[] = "並の";
-static char KEY_WORTHLESS[] = "無価値の";
-static char KEY_RARE[] = "レアな";
-static char KEY_COMMON[] = "ありふれた";
-static char KEY_BOOSTED[] = "ダイス目の違う";
-static char KEY_MORE_THAN[] =  "ダイス目";
-static char KEY_DICE[] =  "以上の";
-static char KEY_MORE_BONUS[] =  "修正値";
-static char KEY_MORE_BONUS2[] =  "以上の";
-static char KEY_WANTED[] = "賞金首の";
-static char KEY_UNIQUE[] = "ユニーク・モンスターの";
-static char KEY_HUMAN[] = "人間の";
-static char KEY_UNREADABLE[] = "読めない";
-static char KEY_REALM1[] = "第一領域の";
-static char KEY_REALM2[] = "第二領域の";
-static char KEY_FIRST[] = "1冊目の";
-static char KEY_SECOND[] = "2冊目の";
-static char KEY_THIRD[] = "3冊目の";
-static char KEY_FOURTH[] = "4冊目の";
-static char KEY_ITEMS[] = "アイテム";
-static char KEY_WEAPONS[] = "武器";
-static char KEY_FAVORITE_WEAPONS[] = "得意武器";
-static char KEY_ARMORS[] = "防具";
-static char KEY_MISSILES[] = "矢";
-static char KEY_DEVICES[] = "魔法アイテム";
-static char KEY_LIGHTS[] = "光源";
-static char KEY_JUNKS[] = "がらくた";
-static char KEY_CORPSES[] = "死体や骨";
-static char KEY_SPELLBOOKS[] = "魔法書";
-static char KEY_HAFTED[] = "鈍器";
-static char KEY_SHIELDS[] = "盾";
-static char KEY_BOWS[] = "弓";
-static char KEY_RINGS[] = "指輪";
-static char KEY_AMULETS[] = "アミュレット";
-static char KEY_SUITS[] = "鎧";
-static char KEY_CLOAKS[] = "クローク";
-static char KEY_HELMS[] = "兜";
-static char KEY_GLOVES[] = "籠手";
-static char KEY_BOOTS[] = "靴";
+static GAME_TEXT KEY_ALL[] = "すべての";
+static GAME_TEXT KEY_UNAWARE[] = "未判明の";
+static GAME_TEXT KEY_UNIDENTIFIED[] = "未鑑定の";
+static GAME_TEXT KEY_IDENTIFIED[] = "鑑定済みの";
+static GAME_TEXT KEY_STAR_IDENTIFIED[] = "*鑑定*済みの";
+static GAME_TEXT KEY_COLLECTING[] = "収集中の";
+static GAME_TEXT KEY_ARTIFACT[] = "アーティファクト";
+static GAME_TEXT KEY_EGO[] = "エゴ";
+static GAME_TEXT KEY_GOOD[] = "上質の";
+static GAME_TEXT KEY_NAMELESS[] = "無銘の";
+static GAME_TEXT KEY_AVERAGE[] = "並の";
+static GAME_TEXT KEY_WORTHLESS[] = "無価値の";
+static GAME_TEXT KEY_RARE[] = "レアな";
+static GAME_TEXT KEY_COMMON[] = "ありふれた";
+static GAME_TEXT KEY_BOOSTED[] = "ダイス目の違う";
+static GAME_TEXT KEY_MORE_THAN[] =  "ダイス目";
+static GAME_TEXT KEY_DICE[] =  "以上の";
+static GAME_TEXT KEY_MORE_BONUS[] =  "修正値";
+static GAME_TEXT KEY_MORE_BONUS2[] =  "以上の";
+static GAME_TEXT KEY_WANTED[] = "賞金首の";
+static GAME_TEXT KEY_UNIQUE[] = "ユニーク・モンスターの";
+static GAME_TEXT KEY_HUMAN[] = "人間の";
+static GAME_TEXT KEY_UNREADABLE[] = "読めない";
+static GAME_TEXT KEY_REALM1[] = "第一領域の";
+static GAME_TEXT KEY_REALM2[] = "第二領域の";
+static GAME_TEXT KEY_FIRST[] = "1冊目の";
+static GAME_TEXT KEY_SECOND[] = "2冊目の";
+static GAME_TEXT KEY_THIRD[] = "3冊目の";
+static GAME_TEXT KEY_FOURTH[] = "4冊目の";
+static GAME_TEXT KEY_ITEMS[] = "アイテム";
+static GAME_TEXT KEY_WEAPONS[] = "武器";
+static GAME_TEXT KEY_FAVORITE_WEAPONS[] = "得意武器";
+static GAME_TEXT KEY_ARMORS[] = "防具";
+static GAME_TEXT KEY_MISSILES[] = "矢";
+static GAME_TEXT KEY_DEVICES[] = "魔法アイテム";
+static GAME_TEXT KEY_LIGHTS[] = "光源";
+static GAME_TEXT KEY_JUNKS[] = "がらくた";
+static GAME_TEXT KEY_CORPSES[] = "死体や骨";
+static GAME_TEXT KEY_SPELLBOOKS[] = "魔法書";
+static GAME_TEXT KEY_HAFTED[] = "鈍器";
+static GAME_TEXT KEY_SHIELDS[] = "盾";
+static GAME_TEXT KEY_BOWS[] = "弓";
+static GAME_TEXT KEY_RINGS[] = "指輪";
+static GAME_TEXT KEY_AMULETS[] = "アミュレット";
+static GAME_TEXT KEY_SUITS[] = "鎧";
+static GAME_TEXT KEY_CLOAKS[] = "クローク";
+static GAME_TEXT KEY_HELMS[] = "兜";
+static GAME_TEXT KEY_GLOVES[] = "籠手";
+static GAME_TEXT KEY_BOOTS[] = "靴";
 
 #else 
 
-static char KEY_ALL[] = "all";
-static char KEY_UNAWARE[] = "unaware";
-static char KEY_UNIDENTIFIED[] = "unidentified";
-static char KEY_IDENTIFIED[] = "identified";
-static char KEY_STAR_IDENTIFIED[] = "*identified*";
-static char KEY_COLLECTING[] = "collecting";
-static char KEY_ARTIFACT[] = "artifact";
-static char KEY_EGO[] = "ego";
-static char KEY_GOOD[] = "good";
+static GAME_TEXT KEY_ALL[] = "all";
+static GAME_TEXT KEY_UNAWARE[] = "unaware";
+static GAME_TEXT KEY_UNIDENTIFIED[] = "unidentified";
+static GAME_TEXT KEY_IDENTIFIED[] = "identified";
+static GAME_TEXT KEY_STAR_IDENTIFIED[] = "*identified*";
+static GAME_TEXT KEY_COLLECTING[] = "collecting";
+static GAME_TEXT KEY_ARTIFACT[] = "artifact";
+static GAME_TEXT KEY_EGO[] = "ego";
+static GAME_TEXT KEY_GOOD[] = "good";
 static GAME_TEXT KEY_nameLESS[] = "nameless";
-static char KEY_AVERAGE[] = "average";
-static char KEY_WORTHLESS[] = "worthless";
-static char KEY_RARE[] = "rare";
-static char KEY_COMMON[] = "common";
-static char KEY_BOOSTED[] = "dice boosted";
-static char KEY_MORE_THAN[] =  "more than";
-static char KEY_DICE[] =  " dice";
-static char KEY_MORE_BONUS[] =  "more bonus than";
-static char KEY_MORE_BONUS2[] =  "";
-static char KEY_WANTED[] = "wanted";
-static char KEY_UNIQUE[] = "unique monster's";
-static char KEY_HUMAN[] = "human";
-static char KEY_UNREADABLE[] = "unreadable";
-static char KEY_REALM1[] = "first realm's";
-static char KEY_REALM2[] = "second realm's";
-static char KEY_FIRST[] = "first";
-static char KEY_SECOND[] = "second";
-static char KEY_THIRD[] = "third";
-static char KEY_FOURTH[] = "fourth";
-static char KEY_ITEMS[] = "items";
-static char KEY_WEAPONS[] = "weapons";
-static char KEY_FAVORITE_WEAPONS[] = "favorite weapons";
-static char KEY_ARMORS[] = "armors";
-static char KEY_MISSILES[] = "missiles";
-static char KEY_DEVICES[] = "magical devices";
-static char KEY_LIGHTS[] = "lights";
-static char KEY_JUNKS[] = "junks";
-static char KEY_CORPSES[] = "corpses or skeletons";
-static char KEY_SPELLBOOKS[] = "spellbooks";
-static char KEY_HAFTED[] = "hafted weapons";
-static char KEY_SHIELDS[] = "shields";
-static char KEY_BOWS[] = "bows";
-static char KEY_RINGS[] = "rings";
-static char KEY_AMULETS[] = "amulets";
-static char KEY_SUITS[] = "suits";
-static char KEY_CLOAKS[] = "cloaks";
-static char KEY_HELMS[] = "helms";
-static char KEY_GLOVES[] = "gloves";
-static char KEY_BOOTS[] = "boots";
+static GAME_TEXT KEY_AVERAGE[] = "average";
+static GAME_TEXT KEY_WORTHLESS[] = "worthless";
+static GAME_TEXT KEY_RARE[] = "rare";
+static GAME_TEXT KEY_COMMON[] = "common";
+static GAME_TEXT KEY_BOOSTED[] = "dice boosted";
+static GAME_TEXT KEY_MORE_THAN[] =  "more than";
+static GAME_TEXT KEY_DICE[] =  " dice";
+static GAME_TEXT KEY_MORE_BONUS[] =  "more bonus than";
+static GAME_TEXT KEY_MORE_BONUS2[] =  "";
+static GAME_TEXT KEY_WANTED[] = "wanted";
+static GAME_TEXT KEY_UNIQUE[] = "unique monster's";
+static GAME_TEXT KEY_HUMAN[] = "human";
+static GAME_TEXT KEY_UNREADABLE[] = "unreadable";
+static GAME_TEXT KEY_REALM1[] = "first realm's";
+static GAME_TEXT KEY_REALM2[] = "second realm's";
+static GAME_TEXT KEY_FIRST[] = "first";
+static GAME_TEXT KEY_SECOND[] = "second";
+static GAME_TEXT KEY_THIRD[] = "third";
+static GAME_TEXT KEY_FOURTH[] = "fourth";
+static GAME_TEXT KEY_ITEMS[] = "items";
+static GAME_TEXT KEY_WEAPONS[] = "weapons";
+static GAME_TEXT KEY_FAVORITE_WEAPONS[] = "favorite weapons";
+static GAME_TEXT KEY_ARMORS[] = "armors";
+static GAME_TEXT KEY_MISSILES[] = "missiles";
+static GAME_TEXT KEY_DEVICES[] = "magical devices";
+static GAME_TEXT KEY_LIGHTS[] = "lights";
+static GAME_TEXT KEY_JUNKS[] = "junks";
+static GAME_TEXT KEY_CORPSES[] = "corpses or skeletons";
+static GAME_TEXT KEY_SPELLBOOKS[] = "spellbooks";
+static GAME_TEXT KEY_HAFTED[] = "hafted weapons";
+static GAME_TEXT KEY_SHIELDS[] = "shields";
+static GAME_TEXT KEY_BOWS[] = "bows";
+static GAME_TEXT KEY_RINGS[] = "rings";
+static GAME_TEXT KEY_AMULETS[] = "amulets";
+static GAME_TEXT KEY_SUITS[] = "suits";
+static GAME_TEXT KEY_CLOAKS[] = "cloaks";
+static GAME_TEXT KEY_HELMS[] = "helms";
+static GAME_TEXT KEY_GLOVES[] = "gloves";
+static GAME_TEXT KEY_BOOTS[] = "boots";
 
 #endif /* JP */
 
-- 
2.11.0