OSDN Git Service

Revert "Changed the order of the directories in init_file_paths to match what's in...
authorEric Branlund <ebranlund@fastmail.com>
Wed, 26 Aug 2020 16:48:49 +0000 (09:48 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Wed, 26 Aug 2020 16:48:49 +0000 (09:48 -0700)
This reverts commit 00d45514b753d19b181e5fb8a3b9ccd76eda9bbc.

src/init2.c

index b5efc37..e4f3134 100644 (file)
@@ -113,15 +113,16 @@ void init_file_paths(concptr libpath, concptr varpath)
 
        /*** Build the sub-directory names ***/
 
-       ANGBAND_DIR_APEX = string_make(format("%sapex", varpath));
-       ANGBAND_DIR_BONE = string_make(format("%sbone", varpath));
-       ANGBAND_DIR_DATA = string_make(format("%sdata", varpath));
        ANGBAND_DIR_EDIT = string_make(format("%sedit", libpath));
-       ANGBAND_DIR_SCRIPT = string_make(format("%sscript", libpath));
        ANGBAND_DIR_FILE = string_make(format("%sfile", libpath));
        ANGBAND_DIR_HELP = string_make(format("%shelp", libpath));
        ANGBAND_DIR_INFO = string_make(format("%sinfo", libpath));
        ANGBAND_DIR_PREF = string_make(format("%spref", libpath));
+       ANGBAND_DIR_SCRIPT = string_make(format("%sscript", libpath));
+       ANGBAND_DIR_XTRA = string_make(format("%sxtra", libpath));
+       ANGBAND_DIR_APEX = string_make(format("%sapex", varpath));
+       ANGBAND_DIR_BONE = string_make(format("%sbone", varpath));
+       ANGBAND_DIR_DATA = string_make(format("%sdata", varpath));
        ANGBAND_DIR_SAVE = string_make(format("%ssave", varpath));
 
 #ifdef PRIVATE_USER_PATH
@@ -171,8 +172,6 @@ void init_file_paths(concptr libpath, concptr varpath)
 
 #endif /* NeXT */
 
-
-       ANGBAND_DIR_XTRA = string_make(format("%sxtra", libpath));
 }