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

fix the homedir patch (the 2nd pass sholud use host_parms->userdir, not host_parms->basedir)

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@995 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-09-08 12:33:22 +00:00
parent fde94b8294
commit ee9f2c99de
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Misc/homedir_0.patch
View file

@ -1,12 +1,12 @@
initial experimental support for user directories, based on uhexen2 initial experimental support for user directories, based on uhexen2
and tyrquake: and tyrquake:
** against quakespasm svn revision 906. ** against quakespasm svn revision 994.
** on-the-fly game directory switching not supported yet. ** on-the-fly game directory switching not supported yet.
** minimally tested, needs more work. ** minimally tested, needs more work.
Index: Quake/sys_sdl_unix.c Index: Quake/sys_sdl_unix.c
=================================================================== ===================================================================
--- Quake/sys_sdl_unix.c (revision 906) --- Quake/sys_sdl_unix.c (revision 994)
+++ Quake/sys_sdl_unix.c (working copy) +++ Quake/sys_sdl_unix.c (working copy)
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
@ -26,8 +26,8 @@ Index: Quake/sys_sdl_unix.c
+#endif /* USE_PASSWORD_FILE */ +#endif /* USE_PASSWORD_FILE */
#if defined(SDL_FRAMEWORK) || defined(NO_SDL_CONFIG) #if defined(SDL_FRAMEWORK) || defined(NO_SDL_CONFIG)
#include <SDL/SDL.h> #if defined(USE_SDL2)
@@ -143,9 +148,43 @@ @@ -147,9 +152,43 @@ int Sys_FileTime (const char *path)
return -1; return -1;
} }
@ -74,7 +74,7 @@ Index: Quake/sys_sdl_unix.c
void Sys_mkdir (const char *path) void Sys_mkdir (const char *path)
Index: Quake/common.c Index: Quake/common.c
=================================================================== ===================================================================
--- Quake/common.c (revision 906) --- Quake/common.c (revision 994)
+++ Quake/common.c (working copy) +++ Quake/common.c (working copy)
@@ -1919,6 +1919,7 @@ static void COM_AddGameDirectory (const @@ -1919,6 +1919,7 @@ static void COM_AddGameDirectory (const
searchpath_t *search; searchpath_t *search;
@ -84,7 +84,7 @@ Index: Quake/common.c
q_strlcpy (com_gamedir, va("%s/%s", base, dir), sizeof(com_gamedir)); q_strlcpy (com_gamedir, va("%s/%s", base, dir), sizeof(com_gamedir));
@@ -1927,6 +1928,7 @@ static void COM_AddGameDirectory (const @@ -1927,6 +1928,7 @@ static void COM_AddGameDirectory (const
path_id = com_searchpaths->path_id << 1; path_id = com_searchpaths->path_id << 1;
else path_id = 1U; else path_id = 1U;
@ -96,7 +96,7 @@ Index: Quake/common.c
qspak = NULL; qspak = NULL;
else { else {
qboolean old = com_modified; qboolean old = com_modified;
+ if (been_here) base = host_parms->basedir; + if (been_here) base = host_parms->userdir;
q_snprintf (pakfile, sizeof(pakfile), "%s/quakespasm.pak", base); q_snprintf (pakfile, sizeof(pakfile), "%s/quakespasm.pak", base);
qspak = COM_LoadPackFile (pakfile); qspak = COM_LoadPackFile (pakfile);
com_modified = old; com_modified = old;