Begin converting QS engine to CPP
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
allow plain files to override files inside a PAK -- Sander van Dijk.
|
||||
|
||||
diff --git a/Quake/common.c b/Quake/common.c
|
||||
index c80450f..6074711 100644
|
||||
--- a/Quake/common.c
|
||||
+++ b/Quake/common.c
|
||||
@@ -2107,13 +2107,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
|
||||
else path_id = 1U;
|
||||
|
||||
_add_path:
|
||||
- // add the directory to the search path
|
||||
- search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
|
||||
- search->path_id = path_id;
|
||||
- q_strlcpy (search->filename, com_gamedir, sizeof(search->filename));
|
||||
- search->next = com_searchpaths;
|
||||
- com_searchpaths = search;
|
||||
-
|
||||
// add any pak files in the format pak0.pak pak1.pak, ...
|
||||
for (i = 0; ; i++)
|
||||
{
|
||||
@@ -2145,6 +2138,13 @@ _add_path:
|
||||
if (!pak) break;
|
||||
}
|
||||
|
||||
+ // add the directory to the search path -- moved here from before the pakX.pak loop -- svdijk.
|
||||
+ search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
|
||||
+ search->path_id = path_id;
|
||||
+ q_strlcpy (search->filename, com_gamedir, sizeof(search->filename));
|
||||
+ search->next = com_searchpaths;
|
||||
+ com_searchpaths = search;
|
||||
+
|
||||
if (!been_here && host_parms->userdir != host_parms->basedir)
|
||||
{
|
||||
been_here = true;
|
||||
Reference in New Issue
Block a user