From 0b33410848aeb35caf3379d801193563db88c588 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 26 Aug 2020 09:48:49 -0700 Subject: [PATCH] Revert "Changed the order of the directories in init_file_paths to match what's in the For2.2.2-Refactoring-Cocoa2 branch (which used the ordering from PHO's patch)." This reverts commit 00d45514b753d19b181e5fb8a3b9ccd76eda9bbc. --- src/init2.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/init2.c b/src/init2.c index b5efc37ad..e4f313418 100644 --- a/src/init2.c +++ b/src/init2.c @@ -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)); } -- 2.11.0