demo deleting: switch the meaning of the values 2 and 3 in cl_autodemo_delete, so...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10171 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_demo.c b/cl_demo.c
index 7b678b7f0d22d925b203ddd9f41e39278bed0af7..4da12fb5dbdbefcc665ea79001da694f4e833638 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -306,7 +306,7 @@ void CL_Stop_f (void)
        CL_WriteDemoMessage(&buf);
 
 // finish up
-       if (cl_autodemo.integer && ((cl_autodemo_delete.integer & 1) ^ ((cl_autodemo_delete.integer >> 1) & 1))) // bit 0 XOR bit 1
+       if(cl_autodemo.integer && (cl_autodemo_delete.integer & 1))
        {
                FS_RemoveOnClose(cls.demofile);
                Con_Print("Completed and deleted demo\n");

diff --git a/cl_main.c b/cl_main.c
index a254ca58cfcaae4d2d8a434f0c24ead0aac495fa..357250eccba9e4a435ad03711a46ebf86b2f83a3 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -57,7 +57,7 @@ cvar_t freelook = {CVAR_SAVE, "freelook", "1","mouse controls pitch instead of f
 
 cvar_t cl_autodemo = {CVAR_SAVE, "cl_autodemo", "0", "records every game played, using the date/time and map name to name the demo file" };
 cvar_t cl_autodemo_nameformat = {CVAR_SAVE, "cl_autodemo_nameformat", "autodemos/%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name (the date is encoded using strftime escapes)" };
-cvar_t cl_autodemo_delete = {0, "cl_autodemo_delete", "0", "Delete demos after recording.  This is a bitmask, bit 1 gives the default, bit 0 inverts the meaning of bit 1 for the current demo.  Thus, the values are: 0 = disabled; 1 = delete current demo only; 2 = delete all demos from this point on; 3 = delete all demos except the current demo" };
+cvar_t cl_autodemo_delete = {0, "cl_autodemo_delete", "0", "Delete demos after recording.  This is a bitmask, bit 1 gives the default, bit 0 the value for the current demo.  Thus, the values are: 0 = disabled; 1 = delete current demo only; 2 = delete all demos except the current demo; 3 = delete all demos from now on" };
 
 cvar_t r_draweffects = {0, "r_draweffects", "1","renders temporary sprite effects"};
 

diff --git a/cl_parse.c b/cl_parse.c
index 2adedb050c896969682842c01e324cb4ae8abb27..63d49ab3142e7e9c57999f8df30fc827dc877ebb 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1828,8 +1828,12 @@ void CL_ParseServerInfo (void)
 
                Con_Printf ("Auto-recording to %s.\n", demofile);
 
-               // Clear the invert flag for every new demo
-               Cvar_SetValueQuick(&cl_autodemo_delete, cl_autodemo_delete.integer & ~0x1);
+               // Reset bit 0 for every new demo
+               Cvar_SetValueQuick(&cl_autodemo_delete,
+                       (cl_autodemo_delete.integer & ~0x1)
+                       |
+                       ((cl_autodemo_delete.integer & 0x2) ? 0x1 : 0)
+               );
 
                cls.demofile = FS_OpenRealFile(demofile, "wb", false);
                if (cls.demofile)