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

Fix mainwads-dependent calculations

Browse source 
- sounds.pk3 was being considered a mainwad in some spots due to use of <= instead of <
- fileneeded material was manually skipping over base musicwads when it didn't have to
This commit is contained in:
toaster 2025-09-18 12:36:34 +01:00
parent 4b81be037a
commit 1517ba4d89
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -4639,10 +4639,10 @@ static void Command_ListWADS_f(void)
nameonly(tempname = va("%s", wadfiles[i]->filename)); nameonly(tempname = va("%s", wadfiles[i]->filename));
if (!i) if (!i)
CONS_Printf("\x82 IWAD\x80: %s\n", tempname); CONS_Printf("\x82 IWAD\x80: %s\n", tempname);
else if (i <= mainwads) else if (i < mainwads)
CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname); CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
else if (!wadfiles[i]->important) else if (!wadfiles[i]->important)
CONS_Printf("\x86 %c %.2d: %s\n", ((i <= mainwads + musicwads) ? '*' : ' '), i, tempname); CONS_Printf("\x86 %c %.2d: %s\n", ((i < mainwads + musicwads) ? '*' : ' '), i, tempname);
else else
CONS_Printf(" %.2d: %s\n", i, tempname); CONS_Printf(" %.2d: %s\n", i, tempname);
} }

8
src/d_netfil.c
View file

@ -163,10 +163,10 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
#ifdef DEVELOP #ifdef DEVELOP
i = 0; i = 0;
#else #else
i = mainwads + 1; i = mainwads + musicwads;
#endif #endif
for (; i < numwadfiles; i++) //mainwads+1, otherwise we start on the first mainwad for (; i < numwadfiles; i++) //mainwads+musicwads, otherwise we start on the first mainwad
{ {
// If it has only music/sound lumps, don't put it in the list // If it has only music/sound lumps, don't put it in the list
if (!wadfiles[i]->important) if (!wadfiles[i]->important)
@ -197,7 +197,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
/* don't send mainwads!! */ /* don't send mainwads!! */
#ifdef DEVELOP #ifdef DEVELOP
if (i <= mainwads) if (i < mainwads)
filestatus += (2 << 4); filestatus += (2 << 4);
#endif #endif
@ -565,7 +565,7 @@ INT32 CL_CheckFiles(void)
#ifdef DEVELOP #ifdef DEVELOP
j = 0; j = 0;
#else #else
j = mainwads + 1; j = mainwads + musicwads;
#endif #endif
for (i = 0; i < fileneedednum || j < numwadfiles;) for (i = 0; i < fileneedednum || j < numwadfiles;)
{ {

2
src/r_textures.cpp
View file

@ -1293,7 +1293,7 @@ Rloadtextures (INT32 i, INT32 w)
} }
INT32 sizeLimit = 2048; INT32 sizeLimit = 2048;
if (w <= mainwads) if (w < mainwads)
{ {
// TODO: we ran out of time to do this properly. // TODO: we ran out of time to do this properly.
// 4096 limit on textures may be incompatible with some older graphics cards (circa 2005-2008?). // 4096 limit on textures may be incompatible with some older graphics cards (circa 2005-2008?).