screenshots are now saved to screenshots/ and videos are now saved to video/, and...

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

diff --git a/cl_screen.c b/cl_screen.c
index 9384f3e2e5f66fbb44cdac27139826465d46b780..a616b57f4eec2c7f44241387b6447f490aa595aa 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -652,35 +652,35 @@ SCR_ScreenShot_f
 */
 void SCR_ScreenShot_f (void)
 {
-       static int i = 0;
-       char filename[16];
-       char checkname[MAX_OSPATH];
-       const char* extens;
+       static int shotnumber = 0;
+       const char *base;
+       char filename[64];
        qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
 
-       if (jpeg)
-               extens = "jpg";
-       else
-               extens = "tga";
-
+       base = "screenshots/dp";
+       if (gamemode == GAME_FNIGGIUM)
+               base = "screenshots/fniggium";
+       
        // find a file name to save it to
-       for (; i<=9999 ; i++)
-       {
-               sprintf (filename, "dp%04i.%s", i, extens);
-               sprintf (checkname, "%s/%s", fs_gamedir, filename);
-               if (!FS_SysFileExists(checkname))
+       for (;shotnumber < 1000000;shotnumber++)
+               if (!FS_SysFileExists(va("%s/%s%06d.tga", fs_gamedir, base, shotnumber)) && !FS_SysFileExists(va("%s/%s%06d.jpg", fs_gamedir, base, shotnumber)))
                        break;
-       }
-       if (i==10000)
+       if (shotnumber >= 1000000)
        {
-               Con_Printf ("SCR_ScreenShot_f: Couldn't create the image file\n");
+               Con_Printf("SCR_ScreenShot_f: Couldn't create the image file\n");
                return;
        }
 
-       if (SCR_ScreenShot (filename, vid.realx, vid.realy, vid.realwidth, vid.realheight, jpeg))
-               Con_Printf ("Wrote %s\n", filename);
+       if (jpeg)
+               sprintf(filename, "%s%06d.jpg", base, shotnumber);
+       else
+               sprintf(filename, "%s%06d.tga", base, shotnumber);
+
+       if (SCR_ScreenShot(filename, vid.realx, vid.realy, vid.realwidth, vid.realheight, jpeg))
+               Con_Printf("Wrote %s\n", filename);
        else
-               Con_Printf ("unable to write %s\n", filename);
+               Con_Printf("unable to write %s\n", filename);
+       shotnumber++;
 }
 
 static int cl_avidemo_frame = 0;
@@ -691,9 +691,9 @@ void SCR_CaptureAVIDemo(void)
        qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
 
        if (jpeg)
-               sprintf(filename, "dpavi%06d.jpg", cl_avidemo_frame);
+               sprintf(filename, "video/dp%06d.jpg", cl_avidemo_frame);
        else
-               sprintf(filename, "dpavi%06d.tga", cl_avidemo_frame);
+               sprintf(filename, "video/dp%06d.tga", cl_avidemo_frame);
 
        if (SCR_ScreenShot(filename, vid.realx, vid.realy, vid.realwidth, vid.realheight, jpeg))
                cl_avidemo_frame++;

diff --git a/todo b/todo
index d73edec51c7839f741aa60f3707a699a96ba8def..b531ed5ec297883c292de0e196233885fedb11ed 100644 (file)
--- a/todo
+++ b/todo
@@ -41,8 +41,8 @@ d darkplaces: cleaned up rtlight handling, merging most code between world rtlig
 d darkplaces: safety checked lightmap access in Mod_Q1BSP_RecursiveLightPoint as one map Sajt uses was crashing (Sajt)
 -n darkplaces: upgrade network protocol to send precise angles, and make EF_LOWPRECISION downgrade both origin and angles (-Urre, -Wazat for Battlemech, FrikaC, -mashakos, RenegadeC, Sajt)
 -n darkplaces: fix cubemap upload scaling crashes (Urre)
-0 darkplaces: make screenshots save to screenshots/fniggium%04i.tga in GAME_FNIGGIUM (Sajt)
-0 darkplaces: make screenshots save to screenshots directory (Sajt)
+d darkplaces: make screenshots save to screenshots/fniggium%04i.tga in GAME_FNIGGIUM (Sajt)
+d darkplaces: make screenshots save to screenshots directory (Sajt)
 2 darkplaces: make corona occlusion testing use GL_ARB_occlusion_query instead of a CL_TraceLine (Riot)
 d darkplaces: default a few cvars accordingly for GAME_TENEBRAE mode
 d darkplaces: add skin and pflags support to light entity loader