thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'addons-menu-addons-folder' into 'master'

Browse source 
Go to addons folder by default in addons menu

Closes #373

See merge request KartKrew/Kart!853
This commit is contained in:
Sal 2023-01-05 20:51:28 +00:00
commit b46caf4a7a
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -138,7 +138,7 @@ char srb2home[256] = ".";
char srb2path[256] = "."; char srb2path[256] = ".";
boolean usehome = true; boolean usehome = true;
const char *pandf = "%s" PATHSEP "%s"; const char *pandf = "%s" PATHSEP "%s";
static char addonsdir[MAX_WADPATH]; char addonsdir[MAX_WADPATH];
// //
// EVENT HANDLING // EVENT HANDLING

1
src/d_main.h
View file

@ -29,6 +29,7 @@ extern char srb2home[256]; //Alam: My Home
extern boolean usehome; //Alam: which path? extern boolean usehome; //Alam: which path?
extern const char *pandf; //Alam: how to path? extern const char *pandf; //Alam: how to path?
extern char srb2path[256]; //Alam: SRB2's Home 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 // the infinite loop of D_SRB2Loop() called from win_main for windows version
void D_SRB2Loop(void) FUNCNORETURN; void D_SRB2Loop(void) FUNCNORETURN;

6
src/filesrch.c
View file

@ -310,13 +310,13 @@ closedir (DIR * dirp)
} }
#endif #endif
static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"}, static CV_PossibleValue_t addons_cons_t[] = {{0, "Addons"},
#if 1 #if 1
{1, "HOME"}, {2, "RINGRACERS"}, {1, "HOME"}, {2, "IWAD"},
#endif #endif
{3, "CUSTOM"}, {0, NULL}}; {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); 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}}; static CV_PossibleValue_t addons_md5_cons_t[] = {{0, "Name"}, {1, "Contents"}, {0, NULL}};

2
src/k_menufunc.c
View file

@ -6857,7 +6857,7 @@ void M_Addons(INT32 choice)
#if 1 #if 1
if (cv_addons_option.value == 0) if (cv_addons_option.value == 0)
pathname = usehome ? srb2home : srb2path; pathname = addonsdir;
else if (cv_addons_option.value == 1) else if (cv_addons_option.value == 1)
pathname = srb2home; pathname = srb2home;
else if (cv_addons_option.value == 2) else if (cv_addons_option.value == 2)