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

re-diff'ed the user directories patch

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@422 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2011-02-18 14:00:13 +00:00
parent 2d53581117
commit e5a1b9100f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Misc/homedir_0.patch
View file

@ -1,14 +1,14 @@
support for user directories, based on a patch by Piotr Szymaniak. support for user directories, based on a patch by Piotr Szymaniak.
** against quakespasm svn revision 392. ** against quakespasm svn revision 411.
** in alpha state, minimally tested. ** in alpha state, minimally tested.
** on-the-fly game directory changes not supported yet. ** on-the-fly game directory changes not supported yet.
** needs more work. ** needs more work.
Index: Quake/common.c Index: Quake/common.c
=================================================================== ===================================================================
--- Quake/common.c (revision 392) --- Quake/common.c (revision 411)
+++ Quake/common.c (working copy) +++ Quake/common.c (working copy)
@@ -1825,32 +1825,36 @@ pack_t *COM_LoadPackFile (const char *pa @@ -1844,32 +1844,36 @@ pack_t *COM_LoadPackFile (const char *pa
COM_AddGameDirectory -- johnfitz -- modified based on topaz's tutorial COM_AddGameDirectory -- johnfitz -- modified based on topaz's tutorial
================= =================
*/ */
@ -49,7 +49,7 @@ Index: Quake/common.c
pak = COM_LoadPackFile (pakfile); pak = COM_LoadPackFile (pakfile);
if (!pak) if (!pak)
break; break;
@@ -1860,6 +1864,14 @@ void COM_AddGameDirectory (const char *d @@ -1879,6 +1883,14 @@ void COM_AddGameDirectory (const char *d
search->next = com_searchpaths; search->next = com_searchpaths;
com_searchpaths = search; com_searchpaths = search;
} }
@ -64,7 +64,7 @@ Index: Quake/common.c
} }
#if defined(USE_QS_CONBACK) #if defined(USE_QS_CONBACK)
@@ -1896,6 +1908,10 @@ void COM_InitFilesystem (void) //johnfit @@ -1915,6 +1927,10 @@ void COM_InitFilesystem (void) //johnfit
{ {
int i, j; int i, j;
@ -75,7 +75,7 @@ Index: Quake/common.c
i = COM_CheckParm ("-basedir"); i = COM_CheckParm ("-basedir");
if (i && i < com_argc-1) if (i && i < com_argc-1)
strcpy (com_basedir, com_argv[i + 1]); strcpy (com_basedir, com_argv[i + 1]);
@@ -1910,8 +1926,7 @@ void COM_InitFilesystem (void) //johnfit @@ -1929,8 +1945,7 @@ void COM_InitFilesystem (void) //johnfit
} }
// start up with GAMENAME by default (id1) // start up with GAMENAME by default (id1)
@ -85,7 +85,7 @@ Index: Quake/common.c
#if defined(USE_QS_CONBACK) #if defined(USE_QS_CONBACK)
if (!fitzmode) if (!fitzmode)
@@ -1925,17 +1940,17 @@ void COM_InitFilesystem (void) //johnfit @@ -1944,17 +1959,17 @@ void COM_InitFilesystem (void) //johnfit
com_nummissionpacks = 0; com_nummissionpacks = 0;
if (COM_CheckParm ("-rogue")) if (COM_CheckParm ("-rogue"))
{ {
@ -106,7 +106,7 @@ Index: Quake/common.c
com_nummissionpacks++; com_nummissionpacks++;
} }
//johnfitz //johnfitz
@@ -1944,7 +1959,7 @@ void COM_InitFilesystem (void) //johnfit @@ -1963,7 +1978,7 @@ void COM_InitFilesystem (void) //johnfit
if (i && i < com_argc-1) if (i && i < com_argc-1)
{ {
com_modified = true; com_modified = true;