lib/edit/以下のファイル名から、"_j"を削除。

diff --git a/lib/edit/Makefile.am b/lib/edit/Makefile.am
index 569dc1a..c26d9a3 100644 (file)
--- a/lib/edit/Makefile.am
+++ b/lib/edit/Makefile.am
@@ -1,22 +1,22 @@
 ## Makefile.am -- Process this file with automake to process Makefile.in
 
 angband_files = \
-       a_info_j.txt d_info_j.txt e_info_j.txt f_info_j.txt \
-       k_info_j.txt misc_j.txt \
-       q0000001_j.txt q0000002_j.txt q0000003_j.txt q0000004_j.txt \
-       q0000005_j.txt q0000006_j.txt q0000007_j.txt q0000019_j.txt \
-       q0000020_j.txt q0000021_j.txt q0000022_j.txt q0000023_j.txt \
-       q0000027_j.txt \
-       q0000028_j.txt q00000ms_j.txt q000chao_j.txt q000dekn_j.txt \
-       q000eric_j.txt q000lyeh_j.txt q000natu_j.txt q000sorc_j.txt \
-       q00water_j.txt q0clone0_j.txt q0fields_j.txt q0thief1_j.txt \
-       q0thief2_j.txt q0willow_j.txt q_info_j.txt q_oberon_j.txt \
-       q_pref_j.txt q_random_j.txt q_serpen_j.txt q_warg_j.txt \
-       qdarkelf_j.txt qhaunted_j.txt r_info_j.txt t0000001_j.txt \
-       t0000002_j.txt t0000003_j.txt t0000004_j.txt t0000005_j.txt \
-       t0000006_j.txt t_basic_j.txt t_info_j.txt t_lite_j.txt \
-       t_pref_j.txt v_info_j.txt w_info_j.txt \
-       m_info_j.txt s_info_j.txt
+       a_info.txt d_info.txt e_info.txt f_info.txt \
+       k_info.txt misc.txt \
+       q0000001.txt q0000002.txt q0000003.txt q0000004.txt \
+       q0000005.txt q0000006.txt q0000007.txt q0000019.txt \
+       q0000020.txt q0000021.txt q0000022.txt q0000023.txt \
+       q0000027.txt \
+       q0000028.txt q00000ms.txt q000chao.txt q000dekn.txt \
+       q000eric.txt q000lyeh.txt q000natu.txt q000sorc.txt \
+       q00water.txt q0clone0.txt q0fields.txt q0thief1.txt \
+       q0thief2.txt q0willow.txt q_info.txt q_oberon.txt \
+       q_pref.txt q_random.txt q_serpen.txt q_warg.txt \
+       qdarkelf.txt qhaunted.txt r_info.txt t0000001.txt \
+       t0000002.txt t0000003.txt t0000004.txt t0000005.txt \
+       t0000006.txt t_basic.txt t_info.txt t_lite.txt \
+       t_pref.txt v_info.txt w_info.txt \
+       m_info.txt s_info.txt
 
 EXTRA_DIST = \
   $(angband_files)

diff --git a/lib/edit/a_info_j.txt b/lib/edit/a_info.txt
similarity index 100%
rename from lib/edit/a_info_j.txt
rename to lib/edit/a_info.txt

diff --git a/lib/edit/d_info_j.txt b/lib/edit/d_info.txt
similarity index 100%
rename from lib/edit/d_info_j.txt
rename to lib/edit/d_info.txt

diff --git a/lib/edit/e_info_j.txt b/lib/edit/e_info.txt
similarity index 100%
rename from lib/edit/e_info_j.txt
rename to lib/edit/e_info.txt

diff --git a/lib/edit/f_info_j.txt b/lib/edit/f_info.txt
similarity index 100%
rename from lib/edit/f_info_j.txt
rename to lib/edit/f_info.txt

diff --git a/lib/edit/k_info_j.txt b/lib/edit/k_info.txt
similarity index 100%
rename from lib/edit/k_info_j.txt
rename to lib/edit/k_info.txt

diff --git a/lib/edit/m_info_j.txt b/lib/edit/m_info.txt
similarity index 100%
rename from lib/edit/m_info_j.txt
rename to lib/edit/m_info.txt

diff --git a/lib/edit/misc_j.txt b/lib/edit/misc.txt
similarity index 100%
rename from lib/edit/misc_j.txt
rename to lib/edit/misc.txt

diff --git a/lib/edit/q0000001_j.txt b/lib/edit/q0000001.txt
similarity index 100%
rename from lib/edit/q0000001_j.txt
rename to lib/edit/q0000001.txt

diff --git a/lib/edit/q0000002_j.txt b/lib/edit/q0000002.txt
similarity index 100%
rename from lib/edit/q0000002_j.txt
rename to lib/edit/q0000002.txt

diff --git a/lib/edit/q0000003_j.txt b/lib/edit/q0000003.txt
similarity index 100%
rename from lib/edit/q0000003_j.txt
rename to lib/edit/q0000003.txt

diff --git a/lib/edit/q0000004_j.txt b/lib/edit/q0000004.txt
similarity index 100%
rename from lib/edit/q0000004_j.txt
rename to lib/edit/q0000004.txt

diff --git a/lib/edit/q0000005_j.txt b/lib/edit/q0000005.txt
similarity index 100%
rename from lib/edit/q0000005_j.txt
rename to lib/edit/q0000005.txt

diff --git a/lib/edit/q0000006_j.txt b/lib/edit/q0000006.txt
similarity index 100%
rename from lib/edit/q0000006_j.txt
rename to lib/edit/q0000006.txt

diff --git a/lib/edit/q0000007_j.txt b/lib/edit/q0000007.txt
similarity index 100%
rename from lib/edit/q0000007_j.txt
rename to lib/edit/q0000007.txt

diff --git a/lib/edit/q0000019_j.txt b/lib/edit/q0000019.txt
similarity index 100%
rename from lib/edit/q0000019_j.txt
rename to lib/edit/q0000019.txt

diff --git a/lib/edit/q0000020_j.txt b/lib/edit/q0000020.txt
similarity index 100%
rename from lib/edit/q0000020_j.txt
rename to lib/edit/q0000020.txt

diff --git a/lib/edit/q0000021_j.txt b/lib/edit/q0000021.txt
similarity index 100%
rename from lib/edit/q0000021_j.txt
rename to lib/edit/q0000021.txt

diff --git a/lib/edit/q0000022_j.txt b/lib/edit/q0000022.txt
similarity index 100%
rename from lib/edit/q0000022_j.txt
rename to lib/edit/q0000022.txt

diff --git a/lib/edit/q0000023_j.txt b/lib/edit/q0000023.txt
similarity index 100%
rename from lib/edit/q0000023_j.txt
rename to lib/edit/q0000023.txt

diff --git a/lib/edit/q0000027_j.txt b/lib/edit/q0000027.txt
similarity index 100%
rename from lib/edit/q0000027_j.txt
rename to lib/edit/q0000027.txt

diff --git a/lib/edit/q0000028_j.txt b/lib/edit/q0000028.txt
similarity index 100%
rename from lib/edit/q0000028_j.txt
rename to lib/edit/q0000028.txt

diff --git a/lib/edit/q00000ms_j.txt b/lib/edit/q00000ms.txt
similarity index 100%
rename from lib/edit/q00000ms_j.txt
rename to lib/edit/q00000ms.txt

diff --git a/lib/edit/q000chao_j.txt b/lib/edit/q000chao.txt
similarity index 100%
rename from lib/edit/q000chao_j.txt
rename to lib/edit/q000chao.txt

diff --git a/lib/edit/q000dekn_j.txt b/lib/edit/q000dekn.txt
similarity index 100%
rename from lib/edit/q000dekn_j.txt
rename to lib/edit/q000dekn.txt

diff --git a/lib/edit/q000eric_j.txt b/lib/edit/q000eric.txt
similarity index 100%
rename from lib/edit/q000eric_j.txt
rename to lib/edit/q000eric.txt

diff --git a/lib/edit/q000lyeh_j.txt b/lib/edit/q000lyeh.txt
similarity index 100%
rename from lib/edit/q000lyeh_j.txt
rename to lib/edit/q000lyeh.txt

diff --git a/lib/edit/q000natu_j.txt b/lib/edit/q000natu.txt
similarity index 100%
rename from lib/edit/q000natu_j.txt
rename to lib/edit/q000natu.txt

diff --git a/lib/edit/q000sorc_j.txt b/lib/edit/q000sorc.txt
similarity index 100%
rename from lib/edit/q000sorc_j.txt
rename to lib/edit/q000sorc.txt

diff --git a/lib/edit/q00water_j.txt b/lib/edit/q00water.txt
similarity index 100%
rename from lib/edit/q00water_j.txt
rename to lib/edit/q00water.txt

diff --git a/lib/edit/q0clone0_j.txt b/lib/edit/q0clone0.txt
similarity index 100%
rename from lib/edit/q0clone0_j.txt
rename to lib/edit/q0clone0.txt

diff --git a/lib/edit/q0fields_j.txt b/lib/edit/q0fields.txt
similarity index 100%
rename from lib/edit/q0fields_j.txt
rename to lib/edit/q0fields.txt

diff --git a/lib/edit/q0thief1_j.txt b/lib/edit/q0thief1.txt
similarity index 100%
rename from lib/edit/q0thief1_j.txt
rename to lib/edit/q0thief1.txt

diff --git a/lib/edit/q0thief2_j.txt b/lib/edit/q0thief2.txt
similarity index 100%
rename from lib/edit/q0thief2_j.txt
rename to lib/edit/q0thief2.txt

diff --git a/lib/edit/q0willow_j.txt b/lib/edit/q0willow.txt
similarity index 100%
rename from lib/edit/q0willow_j.txt
rename to lib/edit/q0willow.txt

diff --git a/lib/edit/q_info_j.txt b/lib/edit/q_info.txt
similarity index 72%
rename from lib/edit/q_info_j.txt
rename to lib/edit/q_info.txt
index 0acf7ec..5c900d9 100644 (file)
--- a/lib/edit/q_info_j.txt
+++ b/lib/edit/q_info.txt
@@ -1,140 +1,140 @@
-# File: q_info_j.txt
+# File: q_info.txt
 
 # Includes all the quest files
 
 # Quest feature preferences
-%:q_pref_j.txt
+%:q_pref.txt
 
 # Thieves Hideout
 ?:[EQU $QUEST_NUMBER 1]
-%:q0000001_j.txt
+%:q0000001.txt
 
 # Sever
 ?:[EQU $QUEST_NUMBER 2]
-%:q0000002_j.txt
+%:q0000002.txt
 
 # Druid Shop
 ?:[EQU $QUEST_NUMBER 3]
-%:q0000003_j.txt
+%:q0000003.txt
 
 # Vault
 ?:[EQU $QUEST_NUMBER 4]
-%:q0000004_j.txt
+%:q0000004.txt
 
 # Tower
 ?:[EQU $QUEST_NUMBER 5]
-%:q0000005_j.txt
+%:q0000005.txt
 
 # Tower part 2
 ?:[EQU $QUEST_NUMBER 6]
-%:q0000006_j.txt
+%:q0000006.txt
 
 # Tower part 3
 ?:[EQU $QUEST_NUMBER 7]
-%:q0000007_j.txt
+%:q0000007.txt
 
 # Oberon
 ?:[EQU $QUEST_NUMBER 8]
-%:q_oberon_j.txt
+%:q_oberon.txt
 
 # Serpent of Chaos
 ?:[EQU $QUEST_NUMBER 9]
-%:q_serpen_j.txt
+%:q_serpen.txt
 
 # Node of Sorcery
 ?:[EQU $QUEST_NUMBER 10]
-%:q000sorc_j.txt
+%:q000sorc.txt
 
 # Node of Chaos
 ?:[EQU $QUEST_NUMBER 11]
-%:q000chao_j.txt
+%:q000chao.txt
 
 # Node of Nature
 ?:[EQU $QUEST_NUMBER 12]
-%:q000natu_j.txt
+%:q000natu.txt
 
 # Quest #13 is still unfinished
 
 # Warg problem
 ?:[EQU $QUEST_NUMBER 14]
-%:q_warg_j.txt
+%:q_warg.txt
 
 # Eric's Stronghold
 ?:[EQU $QUEST_NUMBER 15]
-%:q000eric_j.txt
+%:q000eric.txt
 
 # Assault on Montsalvat
 ?:[EQU $QUEST_NUMBER 16]
-%:q000dekn_j.txt
+%:q000dekn.txt
 
 # The City beneath the Sea
 #?:[EQU $QUEST_NUMBER 17]
-#%:q000lyeh_j.txt
+#%:q000lyeh.txt
 
 # Water Cave
 ?:[EQU $QUEST_NUMBER 18]
-%:q00water_j.txt
+%:q00water.txt
 
 # Doom Quest 1
 ?:[EQU $QUEST_NUMBER 19]
-%:q0000019_j.txt
+%:q0000019.txt
 
 # Vapor Quest
 ?:[EQU $QUEST_NUMBER 20]
-%:q0000020_j.txt
+%:q0000020.txt
 
 # Doom Quest 2
 ?:[EQU $QUEST_NUMBER 21]
-%:q0000021_j.txt
+%:q0000021.txt
 
 # Orc Camp
 ?:[EQU $QUEST_NUMBER 22]
-%:q0000022_j.txt
+%:q0000022.txt
 
 # Spawning Pits
 ?:[EQU $QUEST_NUMBER 23]
-%:q0000023_j.txt
+%:q0000023.txt
 
 # The Rise and Fall of Micro$oft
 ?:[EQU $QUEST_NUMBER 24]
-%:q00000ms_j.txt
+%:q00000ms.txt
 
 # Haunted House
 ?:[EQU $QUEST_NUMBER 25]
-%:qhaunted_j.txt
+%:qhaunted.txt
 
 # Killing Fields
 ?:[EQU $QUEST_NUMBER 26]
-%:q0fields_j.txt
+%:q0fields.txt
 
 # The Old Castle
 ?:[EQU $QUEST_NUMBER 27]
-%:q0000027_j.txt
+%:q0000027.txt
 
 # Royal Crypt
 ?:[EQU $QUEST_NUMBER 28]
-%:q0000028_j.txt
+%:q0000028.txt
 
 # The Mimic's Treasure
 ?:[EQU $QUEST_NUMBER 29]
-%:q0thief1_j.txt
+%:q0thief1.txt
 
 # Tengu and Death Swords
 ?:[EQU $QUEST_NUMBER 30]
-%:q0thief2_j.txt
+%:q0thief2.txt
 
 # Old Man Willow Quest
 ?:[EQU $QUEST_NUMBER 31]
-%:q0willow_j.txt
+%:q0willow.txt
 
 # Dark Elven Lords Quest
 ?:[EQU $QUEST_NUMBER 32]
-%:qdarkelf_j.txt
+%:qdarkelf.txt
 
 # The Cloning Pits
 ?:[EQU $QUEST_NUMBER 33]
-%:q0clone0_j.txt
+%:q0clone0.txt
 
 # Random quests (always adressed with number 40)
 ?:[EQU $QUEST_NUMBER 40]
-%:q_random_j.txt
+%:q_random.txt

diff --git a/lib/edit/q_oberon_j.txt b/lib/edit/q_oberon.txt
similarity index 100%
rename from lib/edit/q_oberon_j.txt
rename to lib/edit/q_oberon.txt

diff --git a/lib/edit/q_pref_j.txt b/lib/edit/q_pref.txt
similarity index 100%
rename from lib/edit/q_pref_j.txt
rename to lib/edit/q_pref.txt

diff --git a/lib/edit/q_random_j.txt b/lib/edit/q_random.txt
similarity index 100%
rename from lib/edit/q_random_j.txt
rename to lib/edit/q_random.txt

diff --git a/lib/edit/q_serpen_j.txt b/lib/edit/q_serpen.txt
similarity index 100%
rename from lib/edit/q_serpen_j.txt
rename to lib/edit/q_serpen.txt

diff --git a/lib/edit/q_warg_j.txt b/lib/edit/q_warg.txt
similarity index 100%
rename from lib/edit/q_warg_j.txt
rename to lib/edit/q_warg.txt

diff --git a/lib/edit/qdarkelf_j.txt b/lib/edit/qdarkelf.txt
similarity index 100%
rename from lib/edit/qdarkelf_j.txt
rename to lib/edit/qdarkelf.txt

diff --git a/lib/edit/qhaunted_j.txt b/lib/edit/qhaunted.txt
similarity index 100%
rename from lib/edit/qhaunted_j.txt
rename to lib/edit/qhaunted.txt

diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info.txt
similarity index 100%
rename from lib/edit/r_info_j.txt
rename to lib/edit/r_info.txt

diff --git a/lib/edit/s_info_j.txt b/lib/edit/s_info.txt
similarity index 100%
rename from lib/edit/s_info_j.txt
rename to lib/edit/s_info.txt

diff --git a/lib/edit/t0000001_j.txt b/lib/edit/t0000001.txt
similarity index 100%
rename from lib/edit/t0000001_j.txt
rename to lib/edit/t0000001.txt

diff --git a/lib/edit/t0000002_j.txt b/lib/edit/t0000002.txt
similarity index 100%
rename from lib/edit/t0000002_j.txt
rename to lib/edit/t0000002.txt

diff --git a/lib/edit/t0000003_j.txt b/lib/edit/t0000003.txt
similarity index 100%
rename from lib/edit/t0000003_j.txt
rename to lib/edit/t0000003.txt

diff --git a/lib/edit/t0000004_j.txt b/lib/edit/t0000004.txt
similarity index 100%
rename from lib/edit/t0000004_j.txt
rename to lib/edit/t0000004.txt

diff --git a/lib/edit/t0000005_j.txt b/lib/edit/t0000005.txt
similarity index 100%
rename from lib/edit/t0000005_j.txt
rename to lib/edit/t0000005.txt

diff --git a/lib/edit/t0000006_j.txt b/lib/edit/t0000006.txt
similarity index 100%
rename from lib/edit/t0000006_j.txt
rename to lib/edit/t0000006.txt

diff --git a/lib/edit/t_basic_j.txt b/lib/edit/t_basic.txt
similarity index 100%
rename from lib/edit/t_basic_j.txt
rename to lib/edit/t_basic.txt

diff --git a/lib/edit/t_info_j.txt b/lib/edit/t_info.txt
similarity index 67%
rename from lib/edit/t_info_j.txt
rename to lib/edit/t_info.txt
index c53d3d4..c5a8bf4 100644 (file)
--- a/lib/edit/t_info_j.txt
+++ b/lib/edit/t_info.txt
@@ -1,36 +1,36 @@
-# File: t_info_j.txt
+# File: t_info.txt
 
 # Includes the town definitions
 
 # Preferences for the town features
-%:t_pref_j.txt
+%:t_pref.txt
 
 # Town 1
 ?:[AND [EQU $TOWN 1] [EQU $WILDERNESS LITE] ]
-%:t_lite_j.txt
+%:t_lite.txt
 ?:[AND [EQU $TOWN 1] [EQU $WILDERNESS NORMAL] ]
-%:t0000001_j.txt
+%:t0000001.txt
 ?:[AND [EQU $TOWN 1] [EQU $WILDERNESS NONE] ]
-%:t_basic_j.txt
+%:t_basic.txt
 ?:1
 
 # Town 2
 ?:[EQU $TOWN 2]
-%:t0000002_j.txt
+%:t0000002.txt
 
 # Town 3
 ?:[EQU $TOWN 3]
-%:t0000003_j.txt
+%:t0000003.txt
 
 # Town 4
 ?:[EQU $TOWN 4]
-%:t0000004_j.txt
+%:t0000004.txt
 
 # Town 5
 ?:[EQU $TOWN 5]
-%:t0000005_j.txt
+%:t0000005.txt
 
 # Town 6
 ?:[EQU $TOWN 6]
-%:t0000006_j.txt
+%:t0000006.txt
 

diff --git a/lib/edit/t_lite_j.txt b/lib/edit/t_lite.txt
similarity index 100%
rename from lib/edit/t_lite_j.txt
rename to lib/edit/t_lite.txt

diff --git a/lib/edit/t_pref_j.txt b/lib/edit/t_pref.txt
similarity index 100%
rename from lib/edit/t_pref_j.txt
rename to lib/edit/t_pref.txt

diff --git a/lib/edit/v_info_j.txt b/lib/edit/v_info.txt
similarity index 100%
rename from lib/edit/v_info_j.txt
rename to lib/edit/v_info.txt

diff --git a/lib/edit/w_info_j.txt b/lib/edit/w_info.txt
similarity index 100%
rename from lib/edit/w_info_j.txt
rename to lib/edit/w_info.txt

diff --git a/src/birth.c b/src/birth.c
index 552546c..a189359 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -3406,7 +3406,7 @@ static void init_dungeon_quests(int number_of_quests)
        init_flags = INIT_ASSIGN;
        p_ptr->inside_quest = MIN_RANDOM_QUEST;
 
-       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
        p_ptr->inside_quest = 0;
 
@@ -3470,13 +3470,13 @@ static void init_dungeon_quests(int number_of_quests)
        init_flags = INIT_ASSIGN;
        p_ptr->inside_quest = QUEST_OBERON;
 
-       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
        quest[QUEST_OBERON].status = QUEST_STATUS_TAKEN;
 
        p_ptr->inside_quest = QUEST_SERPENT;
 
-       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
        quest[QUEST_SERPENT].status = QUEST_STATUS_TAKEN;
        p_ptr->inside_quest = 0;

diff --git a/src/bldg.c b/src/bldg.c
index a18f073..8c20d92 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2858,7 +2858,7 @@ static void get_questinfo(int questnum)
        /* Get the quest text */
        init_flags = INIT_SHOW_TEXT | INIT_ASSIGN;
 
-process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
        /* Reset the old quest number */
        p_ptr->inside_quest = old_quest;

diff --git a/src/cmd4.c b/src/cmd4.c
index 8d7e77b..77f7ad0 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -244,7 +244,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                /* Get the quest text */
                init_flags = INIT_ASSIGN;
 
-               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                /* Reset the old quest number */
                p_ptr->inside_quest = old_quest;
@@ -7113,7 +7113,7 @@ static void do_cmd_knowledge_quests(void)
                        /* Get the quest text */
                        init_flags = INIT_SHOW_TEXT;
 
-                       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                        /* Reset the old quest number */
                        p_ptr->inside_quest = old_quest;
@@ -7285,7 +7285,7 @@ sprintf(rand_tmp_str,"%s (%d 
                                /* Get the quest */
                                init_flags = INIT_ASSIGN;
 
-                               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                                /* Reset the old quest number */
                                p_ptr->inside_quest = old_quest;
@@ -7366,7 +7366,7 @@ sprintf(rand_tmp_str,"%s (%d 
                                /* Get the quest text */
                                init_flags = INIT_ASSIGN;
 
-                               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                                /* Reset the old quest number */
                                p_ptr->inside_quest = old_quest;
@@ -7473,7 +7473,7 @@ static void do_cmd_knowledge_home(void)
        char o_name[MAX_NLEN];
        cptr            paren = ")";
 
-       process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
+       process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);

diff --git a/src/dungeon.c b/src/dungeon.c
index 17f6786..c52d264 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -6611,12 +6611,12 @@ prt("
        {
                /* Init the wilderness */
 
-process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
+               process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
                /* Init the town */
                init_flags = INIT_ONLY_BUILDINGS;
 
-process_dungeon_file("t_info_j.txt", 0, 0, MAX_HGT, MAX_WID);
+               process_dungeon_file("t_info.txt", 0, 0, MAX_HGT, MAX_WID);
 
        }
 

diff --git a/src/files.c b/src/files.c
index e604c78..993a6e6 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -3846,7 +3846,7 @@ void display_player(int mode)
                                        /* Bewere that INIT_ASSIGN resets the cur_num. */
                                        init_flags = INIT_ASSIGN;
 
-                                       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                                       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
 #ifdef JP
                                        sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢¥¯¥¨¥¹¥È¡Ö%s¡×¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", quest[p_ptr->inside_quest].name, p_ptr->died_from);
@@ -3886,7 +3886,7 @@ void display_player(int mode)
                                        /* Get the quest text */
                                        init_flags = INIT_SHOW_TEXT;
 
-                                       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                                       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
 #ifdef JP
                                        sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ ¥¯¥¨¥¹¥È¡Ö%s¡×¤ò¿ë¹ÔÃæ¤À¡£", quest[p_ptr->inside_quest].name);
@@ -4200,7 +4200,7 @@ errr make_character_dump(FILE *fff)
                                /* Get the quest */
                                init_flags = INIT_ASSIGN;
 
-                               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                                /* Reset the old quest number */
                                p_ptr->inside_quest = old_quest;
@@ -4281,7 +4281,7 @@ errr make_character_dump(FILE *fff)
                                /* Get the quest text */
                                init_flags = INIT_ASSIGN;
 
-                               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                                /* Reset the old quest number */
                                p_ptr->inside_quest = old_quest;
@@ -4719,7 +4719,7 @@ fprintf(fff, "  [ 
        /* Add an empty line */
        fprintf(fff, "\n\n");
 
-       process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
+       process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
        /* Print all homes in the different towns */
        st_ptr = &town[1].store[STORE_HOME];

diff --git a/src/generate.c b/src/generate.c
index 3d2a4c2..a740f91 100644 (file)
--- a/src/generate.c
+++ b/src/generate.c
@@ -1355,7 +1355,7 @@ static void quest_gen(void)
 
        init_flags = INIT_CREATE_DUNGEON | INIT_ASSIGN;
 
-process_dungeon_file("q_info_j.txt", 0, 0, MAX_HGT, MAX_WID);
+       process_dungeon_file("q_info.txt", 0, 0, MAX_HGT, MAX_WID);
 }
 
 /* Make a real level */

diff --git a/src/init2.c b/src/init2.c
index 3b16e6a..bc381fb 100644 (file)
--- a/src/init2.c
+++ b/src/init2.c
@@ -452,7 +452,7 @@ static errr init_info(cptr filename, header *head,
        {
 #ifdef CHECK_MODIFICATION_TIME
 
-               err = check_modification_date(fd, format("%s_j.txt", filename));
+               err = check_modification_date(fd, format("%s.txt", filename));
 
 #endif /* CHECK_MODIFICATION_TIME */
 
@@ -485,14 +485,14 @@ static errr init_info(cptr filename, header *head,
 
                /* Build the filename */
 
-               path_build(buf, sizeof(buf), ANGBAND_DIR_EDIT, format("%s_j.txt", filename));
+               path_build(buf, sizeof(buf), ANGBAND_DIR_EDIT, format("%s.txt", filename));
 
                /* Open the file */
                fp = my_fopen(buf, "r");
 
                /* Parse it */
 #ifdef JP
-               if (!fp) quit(format("'%s_j.txt'¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£", filename));
+               if (!fp) quit(format("'%s.txt'¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£", filename));
 #else
                if (!fp) quit(format("Cannot open '%s.txt' file.", filename));
 #endif
@@ -514,13 +514,13 @@ static errr init_info(cptr filename, header *head,
                        oops = ((err > 0) ? err_str[err] : "̤ÃΤÎ");
 
                        /* Oops */
-                       msg_format("'%s_j.txt'¥Õ¥¡¥¤¥ë¤Î %d ¹ÔÌܤ˥¨¥é¡¼¡£", filename, error_line);
+                       msg_format("'%s.txt'¥Õ¥¡¥¤¥ë¤Î %d ¹ÔÌܤ˥¨¥é¡¼¡£", filename, error_line);
                        msg_format("¥ì¥³¡¼¥É %d ¤Ï '%s' ¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£", error_idx, oops);
                        msg_format("¹½Ê¸ '%s'¡£", buf);
                        msg_print(NULL);
 
                        /* Quit */
-                       quit(format("'%s_j.txt'¥Õ¥¡¥¤¥ë¤Ë¥¨¥é¡¼", filename));
+                       quit(format("'%s.txt'¥Õ¥¡¥¤¥ë¤Ë¥¨¥é¡¼", filename));
 #else
                        /* Error string */
                        oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "unknown");
@@ -1385,7 +1385,7 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] =
 static errr init_misc(void)
 {
        /* Initialize the values */
-       process_dungeon_file("misc_j.txt", 0, 0, 0, 0);
+       process_dungeon_file("misc.txt", 0, 0, 0, 0);
 
        return 0;
 }

diff --git a/src/load.c b/src/load.c
index 99a42b6..f26751b 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -2600,7 +2600,7 @@ note(format("
                                                        init_flags = INIT_ASSIGN;
                                                        p_ptr->inside_quest = i;
 
-                                                       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                                                       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
                                                        p_ptr->inside_quest = old_inside_quest;
                                                }
                                        }

diff --git a/src/wild.c b/src/wild.c
index bd38974..53f7661 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -541,7 +541,7 @@ static void generate_area(int y, int x, bool border, bool corner)
                else
                        init_flags = INIT_CREATE_DUNGEON;
 
-               process_dungeon_file("t_info_j.txt", 0, 0, MAX_HGT, MAX_WID);
+               process_dungeon_file("t_info.txt", 0, 0, MAX_HGT, MAX_WID);
 
                if (!corner && !border) p_ptr->visit |= (1L << (p_ptr->town_num - 1));
        }
@@ -651,7 +651,7 @@ void wilderness_gen(void)
 
        /* Init the wilderness */
 
-       process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
+       process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
        x = p_ptr->wilderness_x;
        y = p_ptr->wilderness_y;
@@ -874,7 +874,7 @@ void wilderness_gen_small()
        }
 
        /* Init the wilderness */
-       process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
+       process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
        /* Fill the map */
        for (i = 0; i < max_wild_x; i++)