From f8a916e64bf2dbc6bda708f0571be77fa142e27f Mon Sep 17 00:00:00 2001 From: molivier Date: Wed, 23 Jun 2004 14:06:45 +0000 Subject: [PATCH] A couple of minor simplifications in the screenshot / video code git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4249 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_screen.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index 8defda16..0f9f6ae8 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -684,10 +684,7 @@ void SCR_ScreenShot_f (void) return; } - if (jpeg) - sprintf(filename, "%s%06d.jpg", base, shotnumber); - else - sprintf(filename, "%s%06d.tga", base, shotnumber); + sprintf(filename, "%s%06d.%s", base, shotnumber, jpeg ? "jpg" : "tga"); buffer1 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3); buffer2 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3); @@ -715,16 +712,7 @@ void SCR_CaptureAVIDemo(void) char filename[32]; qboolean jpeg = (scr_screenshot_jpeg.integer != 0); - if (cl_avidemo.integer) - { - if (avi_buffer1 == NULL) - { - avi_buffer1 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3); - avi_buffer2 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3); - avi_buffer3 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3 + 18); - } - } - else + if (!cl_avidemo.integer) { if (avi_buffer1 != NULL) { @@ -739,10 +727,14 @@ void SCR_CaptureAVIDemo(void) return; } - if (jpeg) - sprintf(filename, "video/dp%06d.jpg", cl_avidemo_frame); - else - sprintf(filename, "video/dp%06d.tga", cl_avidemo_frame); + if (avi_buffer1 == NULL) + { + avi_buffer1 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3); + avi_buffer2 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3); + avi_buffer3 = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * 3 + 18); + } + + sprintf(filename, "video/dp%06d.%s", cl_avidemo_frame, jpeg ? "jpg" : "tga"); if (SCR_ScreenShot(filename, avi_buffer1, avi_buffer2, avi_buffer3, vid.realx, vid.realy, vid.realwidth, vid.realheight, false, false, false, jpeg)) cl_avidemo_frame++; -- 2.39.2