fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-19 02:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@945 af15c1b1-3010-417e-b628-4374ebc0bcbd

Browse source
This commit is contained in:
sezero 2014-08-01 11:15:58 +00:00
parent 87ea0aa428
commit 55a53448bd
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
quakespasm/Quake/host_cmd.c
View file

@ -289,7 +289,7 @@ void ExtraMaps_Init (void)
continue; continue;
while ((dir_t = readdir(dir_p)) != NULL) while ((dir_t = readdir(dir_p)) != NULL)
{ {
if (!strstr(dir_t->d_name, ".bsp") && !strstr(dir_t->d_name, ".BSP")) if (q_strcasecmp(COM_FileGetExtension(dir_t->d_name), "bsp") != 0)
continue; continue;
COM_StripExtension(dir_t->d_name, mapname, sizeof(mapname)); COM_StripExtension(dir_t->d_name, mapname, sizeof(mapname));
ExtraMaps_Add (mapname); ExtraMaps_Add (mapname);
@ -302,7 +302,7 @@ void ExtraMaps_Init (void)
{ //don't list standard id maps { //don't list standard id maps
for (i = 0, pak = search->pack; i < pak->numfiles; i++) for (i = 0, pak = search->pack; i < pak->numfiles; i++)
{ {
if (strstr(pak->files[i].name, ".bsp")) if (!strcmp(COM_FileGetExtension(pak->files[i].name), "bsp"))
{ {
if (pak->files[i].filelen > 32*1024) if (pak->files[i].filelen > 32*1024)
{ // don't list files under 32k (ammo boxes etc) { // don't list files under 32k (ammo boxes etc)
@ -404,8 +404,7 @@ void Modlist_Init (void)
{ {
DIR *dir_p, *mod_dir_p; DIR *dir_p, *mod_dir_p;
struct dirent *dir_t, *mod_dir_t; struct dirent *dir_t, *mod_dir_t;
qboolean progs_found, pak_found; char dir_string[MAX_OSPATH], mod_string[MAX_OSPATH];
char dir_string[MAX_OSPATH], mod_dir_string[MAX_OSPATH];
q_snprintf (dir_string, sizeof(dir_string), "%s/", com_basedir); q_snprintf (dir_string, sizeof(dir_string), "%s/", com_basedir);
dir_p = opendir(dir_string); dir_p = opendir(dir_string);
@ -414,30 +413,25 @@ void Modlist_Init (void)
while ((dir_t = readdir(dir_p)) != NULL) while ((dir_t = readdir(dir_p)) != NULL)
{ {
if ((strcmp(dir_t->d_name, ".") == 0) || (strcmp(dir_t->d_name, "..") == 0)) if (!strcmp(dir_t->d_name, ".") || !strcmp(dir_t->d_name, ".."))
continue; continue;
q_snprintf(mod_dir_string, sizeof(mod_dir_string), "%s%s/", dir_string, dir_t->d_name); q_snprintf(mod_string, sizeof(mod_string), "%s%s/", dir_string, dir_t->d_name);
mod_dir_p = opendir(mod_dir_string); mod_dir_p = opendir(mod_string);
if (mod_dir_p == NULL) if (mod_dir_p == NULL)
continue; continue;
progs_found = false;
pak_found = false;
// find progs.dat and pak file(s) // find progs.dat and pak file(s)
while ((mod_dir_t = readdir(mod_dir_p)) != NULL) while ((mod_dir_t = readdir(mod_dir_p)) != NULL)
{ {
if ((strcmp(mod_dir_t->d_name, ".") == 0) || (strcmp(mod_dir_t->d_name, "..") == 0)) if (!q_strcasecmp(mod_dir_t->d_name, "progs.dat")) {
continue; Modlist_Add(dir_t->d_name);
if (q_strcasecmp(mod_dir_t->d_name, "progs.dat") == 0)
progs_found = true;
if (strstr(mod_dir_t->d_name, ".pak") || strstr(mod_dir_t->d_name, ".PAK"))
pak_found = true;
if (progs_found || pak_found)
break; break;
} }
closedir(mod_dir_p); if (!q_strcasecmp(COM_FileGetExtension(mod_dir_t->d_name), "pak")) {
if (!progs_found && !pak_found)
continue;
Modlist_Add(dir_t->d_name); Modlist_Add(dir_t->d_name);
break;
}
}
closedir(mod_dir_p);
} }
closedir(dir_p); closedir(dir_p);