ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add better directions/error for missing default pk3 files

Browse source
This commit is contained in:
Zack Middleton 2024-01-21 11:37:44 -06:00
parent a575c1c710
commit 814e1755f5
1 changed files with 91 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
code/qcommon/files.c
View file

@ -3452,6 +3452,64 @@ static void FS_Startup( const char *gameName )
} }
#ifndef STANDALONE #ifndef STANDALONE
/*
===================
FS_AppendUserFriendlyPakList
===================
*/
static void FS_AppendUserFriendlyPakList( char *buf, size_t bufsize, int foundPakFiles, int numPakFiles )
{
int missingCount = 0;
int missingIndex = 0;
int missingMin = numPakFiles;
int missingMax = 0;
qboolean missingConsecutive = qtrue;
int i;
for ( i = 0; i < numPakFiles; i++ ) {
if ( foundPakFiles & ( 1 << i ) ) {
continue;
}
missingCount++;
if ( missingMin > i ) {
missingMin = i;
}
if ( missingMax < i ) {
missingMax = i;
}
if ( i > missingMin && ( foundPakFiles & ( 1<< ( i - 1 ) ) ) ) {
missingConsecutive = qfalse;
}
}
if ( missingConsecutive && missingMax >= missingMin + 2 ) {
Q_strcat( buf, bufsize,
va( " \"pak%d.pk3\" through \"pak%d.pk3\"",
missingMin, missingMax ) );
} else {
for ( i = 0; i < numPakFiles; i++ ) {
if ( foundPakFiles & (1<<i) ) {
continue;
}
if ( missingIndex > 0 && missingCount > 2 ) {
Q_strcat( buf, bufsize, "," );
}
if ( missingIndex == missingCount - 1 && missingCount > 1 ) {
Q_strcat( buf, bufsize, " and" );
}
Q_strcat( buf, bufsize, va( " \"pak%d.pk3\"", i ) );
missingIndex++;
}
}
}
/* /*
=================== ===================
FS_CheckPak0 FS_CheckPak0
@ -3600,24 +3658,24 @@ static void FS_CheckPak0( void )
} }
} }
if(!com_standalone->integer && (foundPak & ((1<<NUM_ID_PAKS)-1)) != ((1<<NUM_ID_PAKS)-1))
if(!com_standalone->integer && (foundPak & 0x1ff) != 0x1ff)
{ {
char errorText[MAX_STRING_CHARS] = ""; char errorText[MAX_STRING_CHARS] = "";
if((foundPak & 0x01) != 0x01)
{
Q_strcat(errorText, sizeof(errorText), Q_strcat(errorText, sizeof(errorText),
"\"pak0.pk3\" is missing. Please copy it " "Quake 3 data files are missing. Please copy");
"from your legitimate Q3 CDROM. ");
} FS_AppendUserFriendlyPakList(errorText, sizeof(errorText), foundPak, NUM_ID_PAKS);
if((foundPak & 0x1fe) != 0x1fe)
{
Q_strcat(errorText, sizeof(errorText), Q_strcat(errorText, sizeof(errorText),
"Point Release files are missing. Please " va(" from the \"%s\" directory in your Quake 3 install or CD-ROM to:\n\n"
"re-install the 1.32 point release. "); "%s%c%s%c\n\n", BASEGAME, fs_basepath->string, PATH_SEP, BASEGAME, PATH_SEP));
}
Q_strcat(errorText, sizeof(errorText),
"Quake 3 must be purchased to legitimately obtain pak0. "
"Quake 3 1.32 point release files (pak1 through pak8) "
"are freely available at:\n\n"
"https://ioquake3.org/extras/patch-data/\n\n");
Q_strcat(errorText, sizeof(errorText), Q_strcat(errorText, sizeof(errorText),
va("Also check that your ioq3 executable is in " va("Also check that your ioq3 executable is in "
@ -3627,23 +3685,29 @@ static void FS_CheckPak0( void )
Com_Error(ERR_FATAL, "%s", errorText); Com_Error(ERR_FATAL, "%s", errorText);
} }
if(!com_standalone->integer && foundTA && (foundTA & 0x0f) != 0x0f) if(!com_standalone->integer && foundTA && (foundTA & ((1<<NUM_TA_PAKS)-1)) != ((1<<NUM_TA_PAKS)-1))
{ {
char errorText[MAX_STRING_CHARS] = ""; char errorText[MAX_STRING_CHARS] = "";
if((foundTA & 0x01) != 0x01)
{
Com_sprintf(errorText, sizeof(errorText),
"\"" BASETA "%cpak0.pk3\" is missing. Please copy it "
"from your legitimate Quake 3 Team Arena CDROM. ", PATH_SEP);
}
if((foundTA & 0x0e) != 0x0e)
{
Q_strcat(errorText, sizeof(errorText), Q_strcat(errorText, sizeof(errorText),
"Team Arena Point Release files are missing. Please " "Quake 3 Team Arena data files are missing. Please copy");
"re-install the latest Team Arena point release.");
} FS_AppendUserFriendlyPakList(errorText, sizeof(errorText), foundTA, NUM_TA_PAKS);
Q_strcat(errorText, sizeof(errorText),
va(" from the \"%s\" directory in your Quake 3 Team Arena install or CD-ROM to:\n\n"
"%s%c%s%c\n\n", BASETA, fs_basepath->string, PATH_SEP, BASETA, PATH_SEP));
Q_strcat(errorText, sizeof(errorText),
"Quake 3 Team Arena must be purchased to legitimately obtain pak0. "
"Quake 3 Team Arena point release files (pak1 through pak3) "
"are freely available at:\n\n"
"https://ioquake3.org/extras/patch-data/\n\n");
Q_strcat(errorText, sizeof(errorText),
va("Also check that your ioq3 executable is in "
"the correct place and that every file "
"in the \"%s\" directory is present and readable", BASETA));
Com_Error(ERR_FATAL, "%s", errorText); Com_Error(ERR_FATAL, "%s", errorText);
} }