Refresh patches.
Debian Janitor
2 years ago
9 | 9 | SP/code/rend2/glsl/lightall_fp.glsl | 2 +- |
10 | 10 | 2 files changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | |
12 | diff --git a/MP/code/rend2/glsl/lightall_fp.glsl b/MP/code/rend2/glsl/lightall_fp.glsl | |
13 | index 443aff1..73b92ac 100644 | |
14 | --- a/MP/code/rend2/glsl/lightall_fp.glsl | |
15 | +++ b/MP/code/rend2/glsl/lightall_fp.glsl | |
16 | @@ -441,7 +441,7 @@ void main() | |
12 | Index: iortcw/MP/code/rend2/glsl/lightall_fp.glsl | |
13 | =================================================================== | |
14 | --- iortcw.orig/MP/code/rend2/glsl/lightall_fp.glsl | |
15 | +++ iortcw/MP/code/rend2/glsl/lightall_fp.glsl | |
16 | @@ -445,7 +445,7 @@ void main() | |
17 | 17 | // from http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/ |
18 | 18 | vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir; |
19 | 19 | |
22 | 22 | vec3 cubeLightColor = hitCube(R * u_CubeMapInfo.w, parallax, u_CubeMapInfo.www, ROUGHNESS_MIPS * roughness, u_CubeMap).rgb * u_EnableTextures.w; |
23 | 23 | #else |
24 | 24 | vec3 cubeLightColor = textureCubeLod(u_CubeMap, R + parallax, ROUGHNESS_MIPS * roughness).rgb * u_EnableTextures.w; |
25 | diff --git a/SP/code/rend2/glsl/lightall_fp.glsl b/SP/code/rend2/glsl/lightall_fp.glsl | |
26 | index 443aff1..73b92ac 100644 | |
27 | --- a/SP/code/rend2/glsl/lightall_fp.glsl | |
28 | +++ b/SP/code/rend2/glsl/lightall_fp.glsl | |
29 | @@ -441,7 +441,7 @@ void main() | |
25 | Index: iortcw/SP/code/rend2/glsl/lightall_fp.glsl | |
26 | =================================================================== | |
27 | --- iortcw.orig/SP/code/rend2/glsl/lightall_fp.glsl | |
28 | +++ iortcw/SP/code/rend2/glsl/lightall_fp.glsl | |
29 | @@ -445,7 +445,7 @@ void main() | |
30 | 30 | // from http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/ |
31 | 31 | vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir; |
32 | 32 |
11 | 11 | MP/code/client/cl_main.c | 2 +- |
12 | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | |
14 | diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c | |
15 | index 41b69b8..5b9d768 100644 | |
16 | --- a/MP/code/client/cl_main.c | |
17 | +++ b/MP/code/client/cl_main.c | |
18 | @@ -4031,7 +4031,7 @@ void CL_Init( void ) { | |
14 | Index: iortcw/MP/code/client/cl_main.c | |
15 | =================================================================== | |
16 | --- iortcw.orig/MP/code/client/cl_main.c | |
17 | +++ iortcw/MP/code/client/cl_main.c | |
18 | @@ -4033,7 +4033,7 @@ void CL_Init( void ) { | |
19 | 19 | |
20 | 20 | cl_showMouseRate = Cvar_Get( "cl_showmouserate", "0", 0 ); |
21 | 21 |
31 | 31 | SP/code/qcommon/files.c | 10 ++++++++++ |
32 | 32 | 2 files changed, 18 insertions(+), 4 deletions(-) |
33 | 33 | |
34 | diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c | |
35 | index 7460b4d..c3375a0 100644 | |
36 | --- a/MP/code/qcommon/files.c | |
37 | +++ b/MP/code/qcommon/files.c | |
38 | @@ -704,7 +704,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) { | |
34 | Index: iortcw/MP/code/qcommon/files.c | |
35 | =================================================================== | |
36 | --- iortcw.orig/MP/code/qcommon/files.c | |
37 | +++ iortcw/MP/code/qcommon/files.c | |
38 | @@ -704,7 +704,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const | |
39 | 39 | Com_Printf( "FS_SV_FOpenFileWrite: %s\n", ospath ); |
40 | 40 | } |
41 | 41 | |
46 | 46 | |
47 | 47 | if( FS_CreatePath( ospath ) ) { |
48 | 48 | return 0; |
49 | @@ -938,7 +940,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) { | |
49 | @@ -938,7 +940,9 @@ fileHandle_t FS_FOpenFileWrite( const ch | |
50 | 50 | Com_Printf( "FS_FOpenFileWrite: %s\n", ospath ); |
51 | 51 | } |
52 | 52 | |
57 | 57 | |
58 | 58 | if ( FS_CreatePath( ospath ) ) { |
59 | 59 | return 0; |
60 | @@ -1593,7 +1597,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q | |
60 | @@ -1593,7 +1597,7 @@ int FS_FindVM(void **startSearch, char * | |
61 | 61 | return VMI_COMPILED; |
62 | 62 | } |
63 | 63 | |
66 | 66 | // extract the dlls from the mp_bin.pk3 so |
67 | 67 | // that they can be referenced |
68 | 68 | if (Q_stricmp(name, "qagame")) |
69 | @@ -1637,7 +1641,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q | |
69 | @@ -1637,7 +1641,7 @@ int FS_FindVM(void **startSearch, char * | |
70 | 70 | |
71 | 71 | // TTimo |
72 | 72 | // relevant to client only |
75 | 75 | /* |
76 | 76 | ================== |
77 | 77 | FS_CL_ExtractFromPakFile |
78 | diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c | |
79 | index caf9f41..c18d437 100644 | |
80 | --- a/SP/code/qcommon/files.c | |
81 | +++ b/SP/code/qcommon/files.c | |
82 | @@ -175,6 +175,8 @@ or configs will never get loaded from disk! | |
78 | Index: iortcw/SP/code/qcommon/files.c | |
79 | =================================================================== | |
80 | --- iortcw.orig/SP/code/qcommon/files.c | |
81 | +++ iortcw/SP/code/qcommon/files.c | |
82 | @@ -175,6 +175,8 @@ or configs will never get loaded from di | |
83 | 83 | |
84 | 84 | */ |
85 | 85 | |
88 | 88 | // every time a new demo pk3 file is built, this checksum must be updated. |
89 | 89 | // the easiest way to get it is to just run the game and see what it spits out |
90 | 90 | #ifndef STANDALONE |
91 | @@ -613,6 +615,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) { | |
91 | @@ -613,6 +615,10 @@ static void FS_CopyFile( char *fromOSPat | |
92 | 92 | return; |
93 | 93 | } |
94 | 94 | |
99 | 99 | f = Sys_FOpen( fromOSPath, "rb" ); |
100 | 100 | if ( !f ) { |
101 | 101 | return; |
102 | @@ -662,6 +668,10 @@ void FS_CopyFileOS( char *from, char *to ) { | |
102 | @@ -662,6 +668,10 @@ void FS_CopyFileOS( char *from, char *to | |
103 | 103 | return; |
104 | 104 | } |
105 | 105 |
12 | 12 | MP/code/sys/sys_unix.c | 20 ------ |
13 | 13 | 3 files changed, 2 insertions(+), 187 deletions(-) |
14 | 14 | |
15 | diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c | |
16 | index 5b9d768..ef3411d 100644 | |
17 | --- a/MP/code/client/cl_main.c | |
18 | +++ b/MP/code/client/cl_main.c | |
15 | Index: iortcw/MP/code/client/cl_main.c | |
16 | =================================================================== | |
17 | --- iortcw.orig/MP/code/client/cl_main.c | |
18 | +++ iortcw/MP/code/client/cl_main.c | |
19 | 19 | @@ -2195,24 +2195,7 @@ void CL_DownloadsComplete( void ) { |
20 | 20 | |
21 | 21 | // DHM - Nerve :: Auto-update (not finished yet) |
42 | 42 | } |
43 | 43 | |
44 | 44 | #ifdef USE_CURL |
45 | @@ -2905,14 +2888,6 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) { | |
45 | @@ -2905,14 +2888,6 @@ void CL_ConnectionlessPacket( netadr_t f | |
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
57 | 57 | #ifdef LEGACY_PROTOCOL |
58 | 58 | Netchan_Setup(NS_CLIENT, &clc.netchan, from, Cvar_VariableValue("net_qport"), |
59 | 59 | clc.challenge, clc.compat); |
60 | @@ -3536,119 +3511,9 @@ int CL_ScaledMilliseconds( void ) { | |
60 | @@ -3538,119 +3513,9 @@ int CL_ScaledMilliseconds( void ) { | |
61 | 61 | |
62 | 62 | // DHM - Nerve |
63 | 63 | void CL_CheckAutoUpdate( void ) { |
177 | 177 | } |
178 | 178 | // DHM - Nerve |
179 | 179 | |
180 | @@ -3980,7 +3845,7 @@ void CL_Init( void ) { | |
180 | @@ -3982,7 +3847,7 @@ void CL_Init( void ) { | |
181 | 181 | #ifdef UPDATE_SERVER_NAME |
182 | 182 | cl_motd = Cvar_Get( "cl_motd", "1", 0 ); |
183 | 183 | #endif |
186 | 186 | |
187 | 187 | cl_timeout = Cvar_Get( "cl_timeout", "200", 0 ); |
188 | 188 | |
189 | @@ -4505,30 +4370,6 @@ CL_UpdateInfoPacket | |
189 | @@ -4507,30 +4372,6 @@ CL_UpdateInfoPacket | |
190 | 190 | =================== |
191 | 191 | */ |
192 | 192 | void CL_UpdateInfoPacket( netadr_t from ) { |
217 | 217 | } |
218 | 218 | // DHM - Nerve |
219 | 219 | |
220 | diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h | |
221 | index a677f94..a96f351 100644 | |
222 | --- a/MP/code/qcommon/qcommon.h | |
223 | +++ b/MP/code/qcommon/qcommon.h | |
224 | @@ -1272,12 +1272,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit ); // NERVE - S | |
220 | Index: iortcw/MP/code/qcommon/qcommon.h | |
221 | =================================================================== | |
222 | --- iortcw.orig/MP/code/qcommon/qcommon.h | |
223 | +++ iortcw/MP/code/qcommon/qcommon.h | |
224 | @@ -1272,12 +1272,6 @@ void Sys_StartProcess( char *cmdline, qb | |
225 | 225 | void Sys_OpenURL( const char *url, qboolean doexit ); // NERVE - SMF |
226 | 226 | int Sys_GetHighQualityCPU( void ); |
227 | 227 | |
234 | 234 | typedef enum |
235 | 235 | { |
236 | 236 | DR_YES = 0, |
237 | diff --git a/MP/code/sys/sys_unix.c b/MP/code/sys/sys_unix.c | |
238 | index acd3bc2..ff76dfc 100644 | |
239 | --- a/MP/code/sys/sys_unix.c | |
240 | +++ b/MP/code/sys/sys_unix.c | |
241 | @@ -1008,26 +1008,6 @@ int Sys_GetHighQualityCPU() { | |
237 | Index: iortcw/MP/code/sys/sys_unix.c | |
238 | =================================================================== | |
239 | --- iortcw.orig/MP/code/sys/sys_unix.c | |
240 | +++ iortcw/MP/code/sys/sys_unix.c | |
241 | @@ -1016,26 +1016,6 @@ int Sys_GetHighQualityCPU() { | |
242 | 242 | return 1; |
243 | 243 | } |
244 | 244 |