thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'addons-repair' into 'master'

Browse source 
Addons repair

Closes ring-racers#177 and ring-racers#172

See merge request kart-krew-dev/ring-racers-internal!2966
This commit is contained in:
Eidolon 2025-10-21 19:39:47 -05:00
commit 5b0351524f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -4484,7 +4484,7 @@ static void Command_Addfile(void)
} }
// Add file on your client directly if it is trivial, or you aren't in a netgame. // Add file on your client directly if it is trivial, or you aren't in a netgame.
if (!(netgame || multiplayer) || musiconly) if (!netgame || musiconly)
{ {
P_AddWadFile(fn); P_AddWadFile(fn);
addedfiles[numfilesadded++] = fn; addedfiles[numfilesadded++] = fn;

2
src/menus/options-data-advanced-addon.c
View file

@ -28,7 +28,7 @@ menuitem_t OPTIONS_DataAdvancedAddon[] =
{IT_STRING | IT_CVAR, "Matching", "Set where to check for the text pattern when looking up addons via name.", {IT_STRING | IT_CVAR, "Matching", "Set where to check for the text pattern when looking up addons via name.",
NULL, {.cvar = &cv_addons_search_type}, 0, 0}, NULL, {.cvar = &cv_addons_search_type}, 0, 0},
{IT_STRING | IT_CVAR, "Case Sensitivity", "Set whether to consider the case when searching for addons..", {IT_STRING | IT_CVAR, "Case Sensitivity", "Set whether to consider the case when searching for addons.",
NULL, {.cvar = &cv_addons_search_case}, 0, 0}, NULL, {.cvar = &cv_addons_search_case}, 0, 0},
}; };

6
src/w_wad.cpp
View file

@ -2535,12 +2535,12 @@ int W_VerifyNMUSlumps(const char *filename, FILE *handle, boolean exit_on_error)
&& stricmp(&filename[strlen(filename) - 4], ".lua")) && stricmp(&filename[strlen(filename) - 4], ".lua"))
{ {
status = W_VerifyWAD(handle, NMUSlist, false); status = W_VerifyWAD(handle, NMUSlist, false);
// repair file handle in this specific case
fseek(handle, 0, SEEK_SET);
} }
} }
// repair file handle so we don't have to open a new one
fseek(handle, 0, SEEK_SET);
if (status == -1) if (status == -1)
W_InitFileError(filename, exit_on_error); W_InitFileError(filename, exit_on_error);