diff options
author | Mike Swanson | 2015-08-29 12:05:26 -0700 |
---|---|---|
committer | Mike Swanson | 2015-08-29 16:18:34 -0700 |
commit | 4b865a2a162023b7a7cdb8c7eba16af9c447ec9b (patch) | |
tree | 58b2a706b7026655448fecbcf419246775a38b8c /src | |
parent | dab45778b03b2d3a1b113c5d9116e2060d4d210a (diff) | |
download | chocolate-doom-4b865a2a162023b7a7cdb8c7eba16af9c447ec9b.tar.gz chocolate-doom-4b865a2a162023b7a7cdb8c7eba16af9c447ec9b.tar.bz2 chocolate-doom-4b865a2a162023b7a7cdb8c7eba16af9c447ec9b.zip |
d_iwad: change "gogcom_collectors_edition" to "root_path"
Diffstat (limited to 'src')
-rw-r--r-- | src/d_iwad.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d_iwad.c b/src/d_iwad.c index 5f938c79..b413c010 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -144,7 +144,7 @@ static registry_value_t uninstall_values[] = // Values installed by the GOG.com and Collector's Edition versions -static registry_value_t gogcom_collectors_edition_values[] = +static registry_value_t root_path_keys[] = { // Doom Collector's Edition @@ -181,7 +181,7 @@ static registry_value_t gogcom_collectors_edition_values[] = // Subdirectories of the above install path, where IWADs are installed. -static char *gogcom_collectors_edition_subdirs[] = +static char *root_path_subdirs[] = { ".", "Doom2", @@ -301,27 +301,27 @@ static void CheckUninstallStrings(void) // Check for GOG.com and Doom: Collector's Edition -static void CheckGOGcomCollectorsEdition(void) +static void CheckInstallRootPaths(void) { unsigned int i; - for (i=0; i<arrlen(gogcom_collectors_edition_values); ++i) + for (i=0; i<arrlen(root_path_keys); ++i) { char *install_path; char *subpath; unsigned int j; - install_path = GetRegistryString(&gogcom_collectors_edition_values[i]); + install_path = GetRegistryString(&root_path_keys[i]); if (install_path == NULL) { continue; } - for (j=0; j<arrlen(gogcom_collectors_edition_subdirs); ++j) + for (j=0; j<arrlen(root_path_subdirs); ++j) { subpath = M_StringJoin(install_path, DIR_SEPARATOR_S, - gogcom_collectors_edition_subdirs[j], NULL); + root_path_subdirs[j], NULL); AddIWADDir(subpath); } @@ -670,7 +670,7 @@ static void BuildIWADDirList(void) // Search the registry and find where IWADs have been installed. CheckUninstallStrings(); - CheckGOGcomCollectorsEdition(); + CheckInstallRootPaths(); CheckSteamEdition(); CheckDOSDefaults(); |