X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_demo.c;h=08ebe8411bb0e8615fef4bed77fd99d8ce0a8479;hp=81f169bb64b067a7ee5a065d157e964f13284bd6;hb=4d34e0a632cbc401712f46e10bb9864438b0881f;hpb=775c4993063d7673903a2dfaebeacd1a9c71cbf7

diff --git a/sv_demo.c b/sv_demo.c
index 81f169bb..08ebe841 100644
--- a/sv_demo.c
+++ b/sv_demo.c
@@ -1,8 +1,11 @@
 #include "quakedef.h"
 #include "sv_demo.h"
 
+extern cvar_t sv_autodemo_perclient_discardable;
+
 void SV_StartDemoRecording(client_t *client, const char *filename, int forcetrack)
 {
+	prvm_prog_t *prog = SVVM_prog;
 	char name[MAX_QPATH];
 
 	if(client->sv_demo_file != NULL)
@@ -13,18 +16,22 @@ void SV_StartDemoRecording(client_t *client, const char *filename, int forcetrac
 
 	Con_Printf("Recording demo for # %d (%s) to %s\n", PRVM_NUM_FOR_EDICT(client->edict), client->netaddress, name);
 
+	// Reset discardable flag for every new demo.
+	PRVM_serveredictfloat(client->edict, discardabledemo) = 0;
+
 	client->sv_demo_file = FS_OpenRealFile(name, "wb", false);
 	if(!client->sv_demo_file)
 	{
-		Con_Print("ERROR: couldn't open.\n");
+		Con_Print(CON_ERROR "ERROR: couldn't open.\n");
 		return;
 	}
 
 	FS_Printf(client->sv_demo_file, "%i\n", forcetrack);
 }
 
-void SV_WriteDemoMessage(client_t *client, sizebuf_t *sendbuffer, qboolean clienttoserver)
+void SV_WriteDemoMessage(client_t *client, sizebuf_t *sendbuffer, qbool clienttoserver)
 {
+	prvm_prog_t *prog = SVVM_prog;
 	int len, i;
 	float f;
 	int temp;
@@ -39,7 +46,7 @@ void SV_WriteDemoMessage(client_t *client, sizebuf_t *sendbuffer, qboolean clien
 	FS_Write(client->sv_demo_file, &len, 4);
 	for(i = 0; i < 3; ++i)
 	{
-		f = LittleFloat(client->edict->fields.server->v_angle[i]);
+		f = LittleFloat(PRVM_serveredictvector(client->edict, v_angle)[i]);
 		FS_Write(client->sv_demo_file, &f, 4);
 	}
 	FS_Write(client->sv_demo_file, sendbuffer->data, sendbuffer->cursize);
@@ -47,6 +54,7 @@ void SV_WriteDemoMessage(client_t *client, sizebuf_t *sendbuffer, qboolean clien
 
 void SV_StopDemoRecording(client_t *client)
 {
+	prvm_prog_t *prog = SVVM_prog;
 	sizebuf_t buf;
 	unsigned char bufdata[64];
 
@@ -59,16 +67,23 @@ void SV_StopDemoRecording(client_t *client)
 	MSG_WriteByte(&buf, svc_disconnect);
 	SV_WriteDemoMessage(client, &buf, false);
 
+	if (sv_autodemo_perclient_discardable.integer && PRVM_serveredictfloat(client->edict, discardabledemo))
+	{
+		FS_RemoveOnClose(client->sv_demo_file);
+		Con_Printf("Stopped recording discardable demo for # %d (%s)\n", PRVM_NUM_FOR_EDICT(client->edict), client->netaddress);
+	}
+	else
+		Con_Printf("Stopped recording demo for # %d (%s)\n", PRVM_NUM_FOR_EDICT(client->edict), client->netaddress);
+
 	FS_Close(client->sv_demo_file);
 	client->sv_demo_file = NULL;
-	Con_Printf("Stopped recording demo for # %d (%s)\n", PRVM_NUM_FOR_EDICT(client->edict), client->netaddress);
 }
 
 void SV_WriteNetnameIntoDemo(client_t *client)
 {
 	// This "pseudo packet" is written so a program can easily find out whose demo this is
 	sizebuf_t buf;
-	unsigned char bufdata[128];
+	unsigned char bufdata[MAX_SCOREBOARDNAME + 64];
 
 	if(client->sv_demo_file == NULL)
 		return;