Remove ANGBAND_DIR_APEX since it's not used any more

9 files changed, 7 insertions, 48 deletions

diff --git a/src/config.h b/src/config.h
index 7c1cf1d7..20463a62 100644
--- a/src/config.h
+++ b/src/config.h
@@ -236,11 +236,9 @@
 #if defined(MACH_O_CARBON)
 #define PRIVATE_USER_PATH "~/Library/Application Support/ToME"
 #define PRIVATE_USER_PATH_DATA
-#define PRIVATE_USER_PATH_APEX
 #define PRIVATE_USER_PATH_MODULES
 #else
 #define PRIVATE_USER_PATH "~/.tome"
-#define PRIVATE_USER_PATH_APEX
 #endif
 
 /*
diff --git a/src/externs.h b/src/externs.h
index 2bd48d10..1e5b71f4 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -445,7 +445,6 @@ extern cptr ANGBAND_SYS;
 extern cptr ANGBAND_KEYBOARD;
 extern cptr ANGBAND_GRAF;
 extern cptr ANGBAND_DIR;
-extern cptr ANGBAND_DIR_APEX;
 extern cptr ANGBAND_DIR_CORE;
 extern cptr ANGBAND_DIR_DNGN;
 extern cptr ANGBAND_DIR_DATA;
diff --git a/src/files.c b/src/files.c
index ee3bc86c..01f55d7e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -5036,7 +5036,7 @@ void display_scores(int from, int to)
 	char buf[1024];
 
 	/* Build the filename */
-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
+	path_build(buf, 1024, ANGBAND_DIR_USER, "scores.raw");
 
 	/* Open the binary high score file, for reading */
 	highscore_fd = fd_open(buf, O_RDONLY);
@@ -5108,7 +5108,7 @@ void show_highclass(int building)
 	}
 
 	/* Build the filename */
-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
+	path_build(buf, 1024, ANGBAND_DIR_USER, "scores.raw");
 
 	/* Open file */
 	highscore_fd = fd_open(buf, O_RDONLY);
@@ -5199,7 +5199,7 @@ void race_score(int race_num)
 	prt(tmp_str, 5, 3);
 
 	/* Build the filename */
-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
+	path_build(buf, 1024, ANGBAND_DIR_USER, "scores.raw");
 
 	/* Open the highscore file */
 	highscore_fd = fd_open(buf, O_RDONLY);
@@ -5636,7 +5636,7 @@ void close_game(void)
 
 
 	/* Build the filename */
-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
+	path_build(buf, 1024, ANGBAND_DIR_USER, "scores.raw");
 
 	/* Open the high score file, for reading/writing */
 	highscore_fd = fd_open(buf, O_RDWR);
diff --git a/src/init2.c b/src/init2.c
index 1e5ff17f..977e6d1a 100644
--- a/src/init2.c
+++ b/src/init2.c
@@ -74,7 +74,6 @@ void init_file_paths(char *path)
 	string_free(ANGBAND_DIR);
 
 	/* Free the sub-paths */
-	string_free(ANGBAND_DIR_APEX);
 	string_free(ANGBAND_DIR_CORE);
 	string_free(ANGBAND_DIR_DNGN);
 	string_free(ANGBAND_DIR_DATA);
@@ -126,10 +125,6 @@ void init_file_paths(char *path)
 	/*** Build the sub-directory names ***/
 
 	/* Build a path name */
-	strcpy(tail, "apex");
-	ANGBAND_DIR_APEX = string_make(path);
-
-	/* Build a path name */
 	strcpy(tail, "core");
 	ANGBAND_DIR_CORE = string_make(path);
 
@@ -186,9 +181,6 @@ void init_file_paths(char *path)
 #ifdef PRIVATE_USER_PATH_MODULES
 		ANGBAND_DIR_MODULES = string_make(user_path);
 #endif
-#ifdef PRIVATE_USER_PATH_APEX
-		ANGBAND_DIR_APEX = string_make(user_path);
-#endif
 #ifdef PRIVATE_USER_PATH_DATA
 		{
 		char user_path_data[1024];
@@ -2608,7 +2600,7 @@ void init_angband(void)
 	/*** Verify (or create) the "high score" file ***/
 
 	/* Build the filename */
-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
+	path_build(buf, 1024, ANGBAND_DIR_USER, "scores.raw");
 
 	/* Attempt to open the high score file */
 	fd = fd_open(buf, O_RDONLY);
diff --git a/src/main-crb.c b/src/main-crb.c
index a4a1a742..0877bec6 100644
--- a/src/main-crb.c
+++ b/src/main-crb.c
@@ -531,9 +531,6 @@ static bool_ check_create_user_dir(void)
 #ifdef PRIVATE_USER_PATH_DATA
 	char datapath[1024];
 #endif
-#ifdef PRIVATE_USER_PATH_APEX
-	char apexpath[1024];
-#endif
 
 	/* Get an absolute path from the filename */
 	path_parse(dirpath, 1024, PRIVATE_USER_PATH);
@@ -545,10 +542,6 @@ static bool_ check_create_user_dir(void)
 	strcpy(datapath, versionpath);
 	strcat(datapath, "/data");
 #endif
-#ifdef PRIVATE_USER_PATH_APEX
-	strcpy(apexpath, versionpath);
-	strcat(apexpath, "/apex");
-#endif
 
 	return /* don't forget, the dirpath muts come first */
 	       private_check_user_directory(dirpath) &&
@@ -556,9 +549,6 @@ static bool_ check_create_user_dir(void)
 #ifdef PRIVATE_USER_PATH_DATA
 	       private_check_user_directory(datapath) &&
 #endif
-#ifdef PRIVATE_USER_PATH_APEX
-	       private_check_user_directory(apexpath) &&
-#endif
 	       private_check_user_directory(savepath);
 }
 
@@ -4825,8 +4815,7 @@ static void menu(long mc)
 					}
 
 					/* Build the pathname of the score file */
-					path_build(buf, sizeof(buf), ANGBAND_DIR_APEX,
-					           "scores.raw");
+					path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "scores.raw");
 
 					/* Hack - open the score file for reading */
 					highscore_fd = fd_open(buf, O_RDONLY);
diff --git a/src/main-win.c b/src/main-win.c
index 92a2a775..1498672d 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -2952,7 +2952,7 @@ ofn.lStructSize = sizeof(OPENFILENAME);
 			}
 
 			/* Build the pathname of the score file */
-			path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw");
+			path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "scores.raw");
 
 			/* Hack - open the score file for reading */
 			highscore_fd = fd_open(buf, O_RDONLY);
@@ -4136,7 +4136,6 @@ static void init_stuff(void)
 
 	/*** Validate the paths to ensure we have a working install ***/
 
-	validate_dir(ANGBAND_DIR_APEX);
 	validate_dir(ANGBAND_DIR_DATA);
 	validate_dir(ANGBAND_DIR_EDIT);
 	validate_dir(ANGBAND_DIR_FILE);
diff --git a/src/main.c b/src/main.c
index 8dc87a2a..6bd2b154 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,13 +163,6 @@ static void change_path(cptr info)
 	/* Analyze */
 	switch (tolower(info[0]))
 	{
-	case 'a':
-		{
-			string_free(ANGBAND_DIR_APEX);
-			ANGBAND_DIR_APEX = string_make(s + 1);
-			break;
-		}
-
 	case 'f':
 		{
 			string_free(ANGBAND_DIR_FILE);
diff --git a/src/modules.c b/src/modules.c
index 60128f79..0c9250eb 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -32,7 +32,6 @@ void module_reset_dir(cptr dir, cptr new_path)
 	cptr *d = 0;
 	char buf[1025];
 
-	if (!strcmp(dir, "apex")) d = &ANGBAND_DIR_APEX;
 	if (!strcmp(dir, "core")) d = &ANGBAND_DIR_CORE;
 	if (!strcmp(dir, "dngn")) d = &ANGBAND_DIR_DNGN;
 	if (!strcmp(dir, "data")) d = &ANGBAND_DIR_DATA;
@@ -48,9 +47,6 @@ void module_reset_dir(cptr dir, cptr new_path)
 	if (!strcmp(dir, "note")) d = &ANGBAND_DIR_NOTE;
 	if (!strcmp(dir, "cmov")) d = &ANGBAND_DIR_CMOV;
 	if (
-#ifdef PRIVATE_USER_PATH_APEX
-	    !strcmp(dir, "apex") ||
-#endif
 	    !strcmp(dir, "user") ||
 	    !strcmp(dir, "note") ||
 	    !strcmp(dir, "cmov"))
@@ -158,7 +154,6 @@ static void init_module(module_type *module_ptr)
 	/* Set up module directories? */
 	cptr dir = module_ptr->meta.module_dir;
 	if (dir) {
-		module_reset_dir("apex", dir);
 		module_reset_dir("core", dir);
 		module_reset_dir("data", dir);
 		module_reset_dir("dngn", dir);
diff --git a/src/variable.c b/src/variable.c
index af89fdcf..c7874c50 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -943,12 +943,6 @@ cptr ANGBAND_GRAF = "old";
 cptr ANGBAND_DIR;
 
 /*
- * High score files (binary)
- * These files may be portable between platforms
- */
-cptr ANGBAND_DIR_APEX;
-
-/*
  * Core lua system
  * These files are portable between platforms
  */