mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
Merge branch 'full-file-list' into 'master'
Disable downloading and check md5 of mainwads (maps.pk3, patch.pk3, etc.) in netgames See merge request KartKrew/Kart!490
This commit is contained in:
commit
1285812b84
1 changed files with 19 additions and 3 deletions
|
|
@ -161,10 +161,16 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
|
||||||
char wadfilename[MAX_WADPATH] = "";
|
char wadfilename[MAX_WADPATH] = "";
|
||||||
UINT8 filestatus;
|
UINT8 filestatus;
|
||||||
|
|
||||||
for (i = mainwads+1; i < numwadfiles; i++) //mainwads+1, otherwise we start on the first mainwad
|
#ifdef DEVELOP
|
||||||
|
i = 0;
|
||||||
|
#else
|
||||||
|
i = mainwads + 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
for (; i < numwadfiles; i++) //mainwads+1, 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 (i > mainwads && !wadfiles[i]->important)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (firstfile)
|
if (firstfile)
|
||||||
|
|
@ -276,11 +282,16 @@ boolean CL_CheckDownloadable(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Downloading locally disabled
|
// Downloading locally disabled
|
||||||
|
#if 0
|
||||||
if (!dlstatus && M_CheckParm("-nodownload"))
|
if (!dlstatus && M_CheckParm("-nodownload"))
|
||||||
dlstatus = 3;
|
dlstatus = 3;
|
||||||
|
|
||||||
if (!dlstatus)
|
if (!dlstatus)
|
||||||
return true;
|
return true;
|
||||||
|
#else
|
||||||
|
if (!dlstatus)
|
||||||
|
dlstatus = 3;
|
||||||
|
#endif
|
||||||
|
|
||||||
// not downloadable, put reason in console
|
// not downloadable, put reason in console
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
|
||||||
|
|
@ -489,7 +500,12 @@ INT32 CL_CheckFiles(void)
|
||||||
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
||||||
|
|
||||||
// Check in already loaded files
|
// Check in already loaded files
|
||||||
for (j = mainwads+1; wadfiles[j]; j++)
|
#ifdef DEVELOP
|
||||||
|
j = 0;
|
||||||
|
#else
|
||||||
|
j = mainwads + 1;
|
||||||
|
#endif
|
||||||
|
for (; wadfiles[j]; j++)
|
||||||
{
|
{
|
||||||
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
|
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
|
||||||
if (!stricmp(wadfilename, fileneeded[i].filename) &&
|
if (!stricmp(wadfilename, fileneeded[i].filename) &&
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue