自動拾いファイルはpicktype-<name>.prfとpicktype.prfの両方があるとき、

名前付きの方だけを読むようにした。
自動拾いエディタとの関係もコンシステントになる。

diff --git a/src/cmd4.c b/src/cmd4.c
index c07d1ec..0ca1ec0 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -2405,7 +2405,7 @@ void do_cmd_pref(void)
 void do_cmd_pickpref(void)
 {
        char buf[80];
-       errr err = -1; 
+       errr err;
        int i;
 
 #ifdef JP
@@ -2424,8 +2424,10 @@ void do_cmd_pickpref(void)
 #else
        sprintf(buf, "pickpref-%s.prf", player_name);
 #endif
-       if( process_pickpref_file(buf) == 0 ){
-               err = 0;
+       err = process_pickpref_file(buf);
+
+       if(err == 0)
+       {
 #ifdef JP
                msg_format("%s¤òÆɤ߹þ¤ß¤Þ¤·¤¿¡£", buf);
 #else
@@ -2434,20 +2436,27 @@ void do_cmd_pickpref(void)
        }
 
        /* ¶¦Ä̤ÎÀßÄê¥Õ¥¡¥¤¥ëÆɤ߹þ¤ß */
+
+       /* Process 'pick????.prf' if 'pick????-<name>.prf' doesn't exist */
+       if (0 > err)
+       {
 #ifdef JP
-       if( process_pickpref_file("picktype.prf") == 0 )
+               err = process_pickpref_file("picktype.prf");
 #else
-       if( process_pickpref_file("pickpref.prf") == 0 )
+               err = process_pickpref_file("pickpref.prf");
 #endif
-       {
-               err = 0;
+
+               if(err == 0)
+               {
 #ifdef JP
-               msg_print("picktype.prf¤òÆɤ߹þ¤ß¤Þ¤·¤¿¡£");
+                       msg_print("picktype.prf¤òÆɤ߹þ¤ß¤Þ¤·¤¿¡£");
 #else
-               msg_print("loaded 'pickpref.prf'.");
+                       msg_print("loaded 'pickpref.prf'.");
 #endif
+               }
        }
 
+
 #ifdef JP
        if(err) msg_print("¼«Æ°½¦¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£");
 #else

diff --git a/src/dungeon.c b/src/dungeon.c
index 6d33547..17da5ab 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -6065,6 +6065,7 @@ msg_print("
 static void load_all_pref_files(void)
 {
        char buf[1024];
+       errr err;
 
        /* Access the "user" pref file */
        sprintf(buf, "user.prf");
@@ -6101,12 +6102,18 @@ static void load_all_pref_files(void)
 #else
         sprintf(buf, "pickpref-%s.prf", player_base);
 #endif
-       process_pickpref_file(buf);
+
+       err = process_pickpref_file(buf);
+
+       /* Process 'pick????.prf' if 'pick????-<name>.prf' doesn't exist */
+       if (0 > err)
+       {
 #ifdef JP
-       process_pickpref_file("picktype.prf");
+               process_pickpref_file("picktype.prf");
 #else
-       process_pickpref_file("pickpref.prf");
+               process_pickpref_file("pickpref.prf");
 #endif
+       }
 
        /* Access the "realm 1" pref file */
        if (p_ptr->realm1 != REALM_NONE)