[ioquake3] 03/05: Refresh patches
Simon McVittie
smcv at debian.org
Mon Mar 21 09:25:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository ioquake3.
commit 5db6e83b3b0a9efc6eb5fbcc9437fb172a33f9fc
Author: Simon McVittie <smcv at debian.org>
Date: Mon Mar 21 08:15:38 2016 +0000
Refresh patches
---
...dd-a-special-vmMagic-that-causes-equivalent-native-.patch | 12 ++++++------
...dd-sv_dorestart-which-can-be-set-by-game-code-to-re.patch | 10 +++++-----
debian/patches/Let-servers-set-sv_fps-too.patch | 4 ++--
.../Run-in-a-window-by-default-on-new-installations.patch | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index a7a3752..f47599e 100644
--- a/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++ b/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
@@ -26,10 +26,10 @@ Forwarded: no
4 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 376eaad..89f6479 100644
+index 77dfd29..aff0651 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
-@@ -1402,7 +1402,7 @@ Return the searchpath in "startSearch".
+@@ -1418,7 +1418,7 @@ Return the searchpath in "startSearch".
=================
*/
@@ -38,7 +38,7 @@ index 376eaad..89f6479 100644
{
searchpath_t *search, *lastSearch;
directory_t *dir;
-@@ -1426,7 +1426,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1442,7 +1442,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
while(search)
{
@@ -47,7 +47,7 @@ index 376eaad..89f6479 100644
{
dir = search->dir;
-@@ -1449,7 +1449,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1465,7 +1465,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
return VMI_COMPILED;
}
}
@@ -57,10 +57,10 @@ index 376eaad..89f6479 100644
pack = search->pack;
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 62f753e..1f22c8c 100644
+index b47a41f..22469ba 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
-@@ -625,7 +625,7 @@ qboolean FS_FileExists( const char *file );
+@@ -627,7 +627,7 @@ qboolean FS_FileExists( const char *file );
qboolean FS_CreatePath (char *OSPath);
diff --git a/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch b/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
index cc50b39..c00f2c4 100644
--- a/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+++ b/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
@@ -12,7 +12,7 @@ Forwarded: no
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/code/server/server.h b/code/server/server.h
-index 407d6ab..f4682eb 100644
+index 39d6f4d..ed6a2f6 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -286,6 +286,7 @@ extern cvar_t *sv_dlRate;
@@ -24,7 +24,7 @@ index 407d6ab..f4682eb 100644
extern cvar_t *sv_floodProtect;
extern cvar_t *sv_lanForceRate;
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
-index 1b72339..6fb375b 100644
+index 506afcc..6797c8b 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -173,6 +173,9 @@ static void SV_Map_f( void ) {
@@ -50,7 +50,7 @@ index 1b72339..6fb375b 100644
// restart the map the slow way
Q_strncpyz( mapname, Cvar_VariableString( "mapname" ), sizeof( mapname ) );
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
-index 7332180..453e1b1 100644
+index ae9086e..1484ceb 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -638,6 +638,7 @@ void SV_Init (void)
@@ -62,10 +62,10 @@ index 7332180..453e1b1 100644
sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM);
sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO);
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 4169fd2..1f410d2 100644
+index 993910f..888ca8b 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
-@@ -54,6 +54,7 @@ cvar_t *sv_dlRate;
+@@ -55,6 +55,7 @@ cvar_t *sv_dlRate;
cvar_t *sv_minPing;
cvar_t *sv_maxPing;
cvar_t *sv_gametype;
diff --git a/debian/patches/Let-servers-set-sv_fps-too.patch b/debian/patches/Let-servers-set-sv_fps-too.patch
index a343e19..7ee7921 100644
--- a/debian/patches/Let-servers-set-sv_fps-too.patch
+++ b/debian/patches/Let-servers-set-sv_fps-too.patch
@@ -7,10 +7,10 @@ Subject: Let servers set sv_fps, too
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
-index 5c9c147..9c7991c 100644
+index 3968250..afb9377 100644
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
-@@ -414,9 +414,9 @@ void CL_SystemInfoChanged( void ) {
+@@ -415,9 +415,9 @@ void CL_SystemInfoChanged( void ) {
// If this cvar may not be modified by a server discard the value.
if(!(cvar_flags & (CVAR_SYSTEMINFO | CVAR_SERVER_CREATED | CVAR_USER_CREATED)))
{
diff --git a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
index 72806ac..495880d 100644
--- a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
+++ b/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
@@ -33,10 +33,10 @@ index 15e7972..701c182 100644
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index 525dfba..8b8fe2a 100644
+index 3f38723..e9c6644 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
-@@ -1167,8 +1167,8 @@ void R_Register( void )
+@@ -1193,8 +1193,8 @@ void R_Register( void )
ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list