diff --git a/src/d_main.c b/src/d_main.c index 8384de07c..9891236e6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -138,7 +138,7 @@ char srb2home[256] = "."; char srb2path[256] = "."; boolean usehome = true; const char *pandf = "%s" PATHSEP "%s"; -static char addonsdir[MAX_WADPATH]; +char addonsdir[MAX_WADPATH]; // // EVENT HANDLING diff --git a/src/d_main.h b/src/d_main.h index 75a8e4b25..0b4f6f19d 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -29,6 +29,7 @@ extern char srb2home[256]; //Alam: My Home extern boolean usehome; //Alam: which path? extern const char *pandf; //Alam: how to path? extern char srb2path[256]; //Alam: SRB2's Home +extern char addonsdir[MAX_WADPATH]; // Where addons are stored // the infinite loop of D_SRB2Loop() called from win_main for windows version void D_SRB2Loop(void) FUNCNORETURN; diff --git a/src/filesrch.c b/src/filesrch.c index 9db81ad37..5ec98babc 100644 --- a/src/filesrch.c +++ b/src/filesrch.c @@ -310,13 +310,13 @@ closedir (DIR * dirp) } #endif -static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"}, +static CV_PossibleValue_t addons_cons_t[] = {{0, "Addons"}, #if 1 {1, "HOME"}, {2, "RINGRACERS"}, #endif {3, "CUSTOM"}, {0, NULL}}; -consvar_t cv_addons_option = CVAR_INIT ("addons_option", "Default", CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange); +consvar_t cv_addons_option = CVAR_INIT ("addons_option", "Addons", CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange); consvar_t cv_addons_folder = CVAR_INIT ("addons_folder", "", CV_SAVE, NULL, NULL); static CV_PossibleValue_t addons_md5_cons_t[] = {{0, "Name"}, {1, "Contents"}, {0, NULL}}; diff --git a/src/k_menufunc.c b/src/k_menufunc.c index 191542ca7..14ca1a179 100644 --- a/src/k_menufunc.c +++ b/src/k_menufunc.c @@ -6842,7 +6842,7 @@ void M_Addons(INT32 choice) #if 1 if (cv_addons_option.value == 0) - pathname = usehome ? srb2home : srb2path; + pathname = addonsdir; else if (cv_addons_option.value == 1) pathname = srb2home; else if (cv_addons_option.value == 2)