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

re-diff'ed the user directories patch. at least it actually applies now.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@302 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-08-29 11:15:21 +00:00
parent f17e534519
commit 5468657170
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Misc/homedir_0.patch
View file

@ -4,14 +4,14 @@ against quakespasm svn revision 97.
Index: Quake/common.c Index: Quake/common.c
=================================================================== ===================================================================
--- Quake/common.c (revision 97) --- Quake/common.c (revision 301)
+++ Quake/common.c (working copy) +++ Quake/common.c (working copy)
@@ -1776,25 +1776,27 @@ @@ -1778,25 +1778,27 @@
COM_AddGameDirectory -- johnfitz -- modified based on topaz's tutorial COM_AddGameDirectory -- johnfitz -- modified based on topaz's tutorial
================= =================
*/ */
-void COM_AddGameDirectory (char *dir) -void COM_AddGameDirectory (const char *dir)
+void COM_AddGameDirectory (char *base, char *dir) +void COM_AddGameDirectory (const char *base, const char *dir)
{ {
int i; int i;
searchpath_t *search; searchpath_t *search;
@ -24,7 +24,7 @@ Index: Quake/common.c
+ strcpy(com_gamedir, va("%s/%s", base, dir)); + strcpy(com_gamedir, va("%s/%s", base, dir));
// add the directory to the search path // add the directory to the search path
search = Z_Malloc(sizeof(searchpath_t)); search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
- strcpy (search->filename, dir); - strcpy (search->filename, dir);
+ strcpy (search->filename, com_gamedir); + strcpy (search->filename, com_gamedir);
search->next = com_searchpaths; search->next = com_searchpaths;
@ -38,7 +38,7 @@ Index: Quake/common.c
pak = COM_LoadPackFile (pakfile); pak = COM_LoadPackFile (pakfile);
if (!pak) if (!pak)
break; break;
@@ -1837,7 +1839,12 @@ @@ -1839,7 +1841,12 @@
{ {
int i, j; int i, j;
searchpath_t *search; searchpath_t *search;
@ -51,7 +51,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]);
@@ -1852,8 +1859,8 @@ @@ -1854,8 +1861,8 @@
} }
// start up with GAMENAME by default (id1) // start up with GAMENAME by default (id1)
@ -62,7 +62,7 @@ Index: Quake/common.c
if (!fitzmode) if (!fitzmode)
{ /* QuakeSpasm customization: */ { /* QuakeSpasm customization: */
@@ -1865,17 +1872,20 @@ @@ -1867,17 +1874,20 @@
com_nummissionpacks = 0; com_nummissionpacks = 0;
if (COM_CheckParm ("-rogue")) if (COM_CheckParm ("-rogue"))
{ {
@ -86,7 +86,7 @@ Index: Quake/common.c
com_nummissionpacks++; com_nummissionpacks++;
} }
//johnfitz //johnfitz
@@ -1884,9 +1894,14 @@ @@ -1886,9 +1896,14 @@
if (i && i < com_argc-1) if (i && i < com_argc-1)
{ {
com_modified = true; com_modified = true;