cvs diff -wc -r start -r HEAD

Index: client/cl_main.c
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/client/cl_main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** client/cl_main.c	1 Aug 2003 01:57:51 -0000	1.1.1.1
--- client/cl_main.c	21 Aug 2003 01:00:30 -0000	1.2
***************
*** 657,662 ****
--- 657,665 ----
  	}
  
  	cls.state = ca_disconnected;
+ 
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	CapturePatch_OnStopPlayback();
  }
  
  void CL_Disconnect_f (void)
***************
*** 1617,1622 ****
--- 1620,1628 ----
  		|| !cl.configstrings[CS_MAXCLIENTS][0] )
  		return;		// single player can cheat
  
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	if (Cvar_VariableValue("cheats")) return;
+ 
      // find all the cvars if we haven't done it yet
  	if (!numcheatvars)
  	{
***************
*** 1807,1812 ****
--- 1813,1821 ----
  	CL_InitLocal ();
  	IN_Init ();
  
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	CapturePatch_Init();
+ 
  //	Cbuf_AddText ("exec autoexec.cfg\n");
  	FS_ExecAutoexec ();
  	Cbuf_Execute ();
Index: client/cl_scrn.c
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/client/cl_scrn.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** client/cl_scrn.c	1 Aug 2003 01:57:56 -0000	1.1.1.1
--- client/cl_scrn.c	21 Aug 2003 01:00:30 -0000	1.2
***************
*** 1397,1401 ****
--- 1397,1405 ----
  			SCR_DrawLoading ();
  		}
  	}
+     
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	CapturePatch_OnUpdateScreen();
+ 
  	re.EndFrame();
  }
Index: client/client.h
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/client/client.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** client/client.h	1 Aug 2003 01:57:36 -0000	1.1.1.1
--- client/client.h	21 Aug 2003 01:00:30 -0000	1.2
***************
*** 37,42 ****
--- 37,45 ----
  #include "console.h"
  #include "cdaudio.h"
  
+ // Capture patch <http://quakecapture.sourceforge.net/>
+ #include "../capture/patch.h"
+ 
  //=============================================================================
  
  typedef struct
***************
*** 236,241 ****
--- 239,248 ----
  	qboolean	demorecording;
  	qboolean	demowaiting;	// don't record until a non-delta message is received
  	FILE		*demofile;
+ 
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	qboolean    capturedemo;
+ 
  } client_static_t;
  
  extern client_static_t	cls;
Index: client/snd_dma.c
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/client/snd_dma.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** client/snd_dma.c	1 Aug 2003 01:58:18 -0000	1.1.1.1
--- client/snd_dma.c	21 Aug 2003 01:00:30 -0000	1.2
***************
*** 1086,1091 ****
--- 1086,1094 ----
  	static	int		oldsamplepos;
  	int		fullsamples;
  
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	if (CapturePatch_GetSoundtime()) return;
+ 
  	fullsamples = dma.samples / dma.channels;
  
  // it is possible to miscount buffers if it has wrapped twice between
Index: client/snd_mix.c
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/client/snd_mix.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** client/snd_mix.c	1 Aug 2003 01:58:19 -0000	1.1.1.1
--- client/snd_mix.c	21 Aug 2003 01:00:30 -0000	1.2
***************
*** 131,136 ****
--- 131,139 ----
  
  		snd_p += snd_linear_count;
  		lpaintedtime += (snd_linear_count>>1);
+ 
+ 		// Capture patch <http://quakecapture.sourceforge.net/>
+ 		CapturePatch_OnTransferStereo16();
  	}
  }
  
Index: qcommon/common.c
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/qcommon/common.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** qcommon/common.c	1 Aug 2003 02:02:52 -0000	1.1.1.1
--- qcommon/common.c	1 Aug 2004 21:04:24 -0000	1.2
***************
*** 1525,1531 ****
  
  	if (fixedtime->value)
  		msec = fixedtime->value;
! 	else if (timescale->value)
  	{
  		msec *= timescale->value;
  		if (msec < 1)
--- 1525,1532 ----
  
  	if (fixedtime->value)
  		msec = fixedtime->value;
! 	// Capture patch <http://quakecapture.sourceforge.net/>
! 	if (timescale->value)
  	{
  		msec *= timescale->value;
  		if (msec < 1)
Index: ref_gl/gl_rmain.c
===================================================================
RCS file: /cvsroot/quakecapture/quake2capture/ref_gl/gl_rmain.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -w -c -r1.1.1.1 -r1.2
*** ref_gl/gl_rmain.c	1 Aug 2003 02:03:18 -0000	1.1.1.1
--- ref_gl/gl_rmain.c	21 Aug 2003 01:00:30 -0000	1.2
***************
*** 20,25 ****
--- 20,28 ----
  // r_main.c
  #include "gl_local.h"
  
+ // Capture patch <http://quakecapture.sourceforge.net/>
+ #include "../capture/gl_copypixels_backdoor.h"
+ 
  void R_Clear (void);
  
  viddef_t	vid;
***************
*** 1042,1047 ****
--- 1045,1053 ----
  	ri.Cmd_AddCommand( "screenshot", GL_ScreenShot_f );
  	ri.Cmd_AddCommand( "modellist", Mod_Modellist_f );
  	ri.Cmd_AddCommand( "gl_strings", GL_Strings_f );
+ 
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	ri.Cmd_AddCommand( "gl_copypixels_backdoor", GL_CopyPixelsBackdoor_f );
  }
  
  /*
***************
*** 1406,1411 ****
--- 1412,1420 ----
  	ri.Cmd_RemoveCommand ("imagelist");
  	ri.Cmd_RemoveCommand ("gl_strings");
  
+ 	// Capture patch <http://quakecapture.sourceforge.net/>
+ 	ri.Cmd_RemoveCommand ("gl_copypixels_backdoor");
+ 
  	Mod_FreeAll ();
  
  	GL_ShutdownImages ();
