diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-06-26 20:37:17 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-06-27 07:41:43 +0200 |
| commit | 143808187704f8feec1b71f4e1c9a4b7efb1d9d6 (patch) | |
| tree | 2d09fb2dd3ccb7a96aeb2c8dcf016cd0ef2f8b78 | |
| parent | d5d256b84fb6112960a37b3944c85b6b2bcf1125 (diff) | |
Remove unused ANGBAND_DIR_{SCPT,PATCH}
| -rw-r--r-- | src/externs.h | 3 | ||||
| -rw-r--r-- | src/init2.cc | 10 | ||||
| -rw-r--r-- | src/modules.cc | 5 | ||||
| -rw-r--r-- | src/variable.cc | 12 |
4 files changed, 1 insertions, 29 deletions
diff --git a/src/externs.h b/src/externs.h index ad4bece5..ea4b68b7 100644 --- a/src/externs.h +++ b/src/externs.h @@ -438,8 +438,6 @@ extern cptr ANGBAND_DIR_INFO; extern cptr ANGBAND_DIR_MODULES; extern cptr ANGBAND_DIR_NOTE; extern cptr ANGBAND_DIR_SAVE; -extern cptr ANGBAND_DIR_SCPT; -extern cptr ANGBAND_DIR_PATCH; extern cptr ANGBAND_DIR_PREF; extern cptr ANGBAND_DIR_USER; extern cptr ANGBAND_DIR_XTRA; @@ -2243,7 +2241,6 @@ extern void init_lua_init(void); extern void status_main(); /* modules.c */ -extern void module_reset_dir(cptr dir, cptr new_path); extern cptr force_module; extern bool_ select_module(void); extern bool_ module_savefile_loadable(cptr savefile_mod); diff --git a/src/init2.cc b/src/init2.cc index b809910e..4d458561 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -88,9 +88,7 @@ void init_file_paths(char *path) string_free(ANGBAND_DIR_MODULES); string_free(ANGBAND_DIR_NOTE); string_free(ANGBAND_DIR_SAVE); - string_free(ANGBAND_DIR_SCPT); string_free(ANGBAND_DIR_PREF); - string_free(ANGBAND_DIR_PATCH); string_free(ANGBAND_DIR_USER); string_free(ANGBAND_DIR_XTRA); @@ -160,14 +158,6 @@ void init_file_paths(char *path) ANGBAND_DIR_MODULES = string_make(path); /* Build a path name */ - strcpy(tail, "patch"); - ANGBAND_DIR_PATCH = string_make(path); - - /* Build a path name */ - strcpy(tail, "scpt"); - ANGBAND_DIR_SCPT = string_make(path); - - /* Build a path name */ strcpy(tail, "pref"); ANGBAND_DIR_PREF = string_make(path); diff --git a/src/modules.cc b/src/modules.cc index 12cc7de0..edfc2ee2 100644 --- a/src/modules.cc +++ b/src/modules.cc @@ -24,7 +24,7 @@ static void module_reset_dir_aux(cptr *dir, cptr new_path) quit(format("Unable to create module dir %s\n", *dir)); } -void module_reset_dir(cptr dir, cptr new_path) +static void module_reset_dir(cptr dir, cptr new_path) { cptr *d = 0; char buf[1025]; @@ -36,8 +36,6 @@ void module_reset_dir(cptr dir, cptr new_path) if (!strcmp(dir, "file")) d = &ANGBAND_DIR_FILE; if (!strcmp(dir, "help")) d = &ANGBAND_DIR_HELP; if (!strcmp(dir, "info")) d = &ANGBAND_DIR_INFO; - if (!strcmp(dir, "scpt")) d = &ANGBAND_DIR_SCPT; - if (!strcmp(dir, "patch")) d = &ANGBAND_DIR_PATCH; if (!strcmp(dir, "pref")) d = &ANGBAND_DIR_PREF; if (!strcmp(dir, "xtra")) d = &ANGBAND_DIR_XTRA; if (!strcmp(dir, "user")) d = &ANGBAND_DIR_USER; @@ -157,7 +155,6 @@ static void init_module(module_type *module_ptr) module_reset_dir("help", dir); module_reset_dir("note", dir); module_reset_dir("save", dir); - module_reset_dir("scpt", dir); module_reset_dir("user", dir); module_reset_dir("pref", dir); } diff --git a/src/variable.cc b/src/variable.cc index e6feeaf6..579d3fd9 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -928,12 +928,6 @@ cptr ANGBAND_DIR_INFO; cptr ANGBAND_DIR_MODULES; /* - * Patches, contains one subdir per patch with a patch.lua file - * in it and a patch_init() function in it - */ -cptr ANGBAND_DIR_PATCH; - -/* * Textual template files for the plot files (ascii) * These files are portable between platforms */ @@ -946,12 +940,6 @@ cptr ANGBAND_DIR_NOTE; cptr ANGBAND_DIR_SAVE; /* - * Scripts. - * These files are portable between platforms - */ -cptr ANGBAND_DIR_SCPT; - -/* * Default "preference" files (ascii) * These files are rarely portable between platforms */ |