fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 15:31:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

re-diff'ed some of the extra patches.

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@725 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2012-09-15 20:11:47 +00:00
parent cd58415774
commit 105d394b75
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Misc/homedir_0.patch
View file

@ -1,11 +1,11 @@
support for user directories, based on uhexen2 and tyrquake:
** against quakespasm svn revision 588.
** against quakespasm svn revision 725.
** on-the-fly game directory switching not supported yet.
** minimally tested, needs more work.
Index: Quake/sys_sdl_unix.c
===================================================================
--- Quake/sys_sdl_unix.c (revision 588)
--- Quake/sys_sdl_unix.c (revision 699)
+++ Quake/sys_sdl_unix.c (working copy)
@@ -20,6 +20,8 @@
@ -24,9 +24,9 @@ Index: Quake/sys_sdl_unix.c
+#include <pwd.h>
+#endif /* USE_PASSWORD_FILE */
#include "SDL.h"
@@ -139,9 +144,43 @@
#if defined(SDL_FRAMEWORK) || defined(NO_SDL_CONFIG)
#include <SDL/SDL.h>
@@ -143,9 +148,43 @@
return -1;
}
@ -73,9 +73,9 @@ Index: Quake/sys_sdl_unix.c
void Sys_mkdir (const char *path)
Index: Quake/common.c
===================================================================
--- Quake/common.c (revision 588)
--- Quake/common.c (revision 658)
+++ Quake/common.c (working copy)
@@ -1846,32 +1846,34 @@ pack_t *COM_LoadPackFile (const char *pa
@@ -1854,32 +1854,34 @@ pack_t *COM_LoadPackFile (const char *pa
COM_AddGameDirectory -- johnfitz -- modified based on topaz's tutorial
=================
*/
@ -114,7 +114,7 @@ Index: Quake/common.c
pak = COM_LoadPackFile (pakfile);
if (!pak)
break;
@@ -1881,6 +1883,14 @@ static void COM_AddGameDirectory (const
@@ -1889,6 +1891,14 @@ static void COM_AddGameDirectory (const
search->next = com_searchpaths;
com_searchpaths = search;
}
@ -129,7 +129,7 @@ Index: Quake/common.c
}
#if defined(USE_QS_CONBACK)
@@ -1935,8 +1945,7 @@ void COM_InitFilesystem (void) //johnfit
@@ -1943,8 +1953,7 @@ void COM_InitFilesystem (void) //johnfit
}
// start up with GAMENAME by default (id1)
@ -139,7 +139,7 @@ Index: Quake/common.c
#if defined(USE_QS_CONBACK)
if (!fitzmode)
@@ -1950,17 +1959,17 @@ void COM_InitFilesystem (void) //johnfit
@@ -1958,17 +1967,17 @@ void COM_InitFilesystem (void) //johnfit
com_nummissionpacks = 0;
if (COM_CheckParm ("-rogue"))
{
@ -160,7 +160,7 @@ Index: Quake/common.c
com_nummissionpacks++;
}
//johnfitz
@@ -1969,7 +1978,7 @@ void COM_InitFilesystem (void) //johnfit
@@ -1977,7 +1986,7 @@ void COM_InitFilesystem (void) //johnfit
if (i && i < com_argc-1)
{
com_modified = true;

10
Misc/quake_retexturing_project.patch
View file

@ -1,7 +1,7 @@
Index: Quake/gl_model.c
===================================================================
--- Quake/gl_model.c (revision 588)
--- Quake/gl_model.c (revision 676)
+++ Quake/gl_model.c (working copy)
@@ -387,6 +387,8 @@ void Mod_LoadTextures (lump_t *l)
extern byte *hunk_base;
@ -85,9 +85,9 @@ Index: Quake/gl_model.c
if (!data)
Index: Quake/gl_rmain.c
===================================================================
--- Quake/gl_rmain.c (revision 588)
--- Quake/gl_rmain.c (revision 660)
+++ Quake/gl_rmain.c (working copy)
@@ -102,6 +102,7 @@
@@ -100,6 +100,7 @@
cvar_t r_nolerp_list = {"r_nolerp_list", "progs/flame.mdl,progs/flame2.mdl,progs/braztall.mdl,progs/brazshrt.mdl,progs/longtrch.mdl,progs/flame_pyre.mdl,progs/v_saw.mdl,progs/v_xfist.mdl,progs/h2stuff/newfire.mdl", CVAR_NONE};
extern cvar_t r_vfog;
//johnfitz
@ -97,7 +97,7 @@ Index: Quake/gl_rmain.c
Index: Quake/gl_rmisc.c
===================================================================
--- Quake/gl_rmisc.c (revision 588)
--- Quake/gl_rmisc.c (revision 660)
+++ Quake/gl_rmisc.c (working copy)
@@ -44,6 +44,7 @@
extern cvar_t r_lerpmove;
@ -107,7 +107,7 @@ Index: Quake/gl_rmisc.c
extern cvar_t gl_zfix; // QuakeSpasm z-fighting fix
@@ -243,6 +244,7 @@ void R_Init (void)
@@ -168,6 +169,7 @@ void R_Init (void)
Cvar_RegisterVariable (&r_nolerp_list);
Cvar_SetCallback (&r_nolerp_list, R_NoLerpList_f);
//johnfitz