mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 09:39:43 +01:00
Code Issues Releases Wiki Activity

Allow taking multiple screenshots in same second

Browse source 
Dav999 notified me that if multiple screenshots are taken in the same
second, the second screenshot has `_2` appended to it and so on. We do
the same here by storing the current timestamp and a counter.

This doesn't prevent overwriting files if you have system time that
changes, or have multiple instances of VVVVVV running at the same time,
but my position on those cases is as follows: Don't do that.
This commit is contained in:
Misa 2024-01-09 17:16:58 -08:00
parent d8b97db6a8
commit 18730b465e
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
desktop_version/src/GraphicsResources.cpp
View file

@ -510,6 +510,9 @@ bool SaveImage(const SDL_Surface* surface, const char* filename)
bool SaveScreenshot(void) bool SaveScreenshot(void)
{ {
static time_t last_time = 0;
static int subsecond_counter = 0;
bool success = TakeScreenshot(&graphics.tempScreenshot); bool success = TakeScreenshot(&graphics.tempScreenshot);
if (!success) if (!success)
{ {
@ -520,11 +523,28 @@ bool SaveScreenshot(void)
const time_t now = time(NULL); const time_t now = time(NULL);
const tm* date = localtime(&now); const tm* date = localtime(&now);
if (now != last_time)
{
last_time = now;
subsecond_counter = 0;
}
subsecond_counter++;
char timestamp[32]; char timestamp[32];
strftime(timestamp, sizeof(timestamp), "%Y-%m-%d_%H-%M-%S", date); strftime(timestamp, sizeof(timestamp), "%Y-%m-%d_%H-%M-%S", date);
char name[32];
if (subsecond_counter > 1)
{
SDL_snprintf(name, sizeof(name), "%s_%i", timestamp, subsecond_counter);
}
else
{
SDL_strlcpy(name, timestamp, sizeof(name));
}
char filename[64]; char filename[64];
SDL_snprintf(filename, sizeof(filename), "screenshots/1x/%s_1x.png", timestamp); SDL_snprintf(filename, sizeof(filename), "screenshots/1x/%s_1x.png", name);
success = SaveImage(graphics.tempScreenshot, filename); success = SaveImage(graphics.tempScreenshot, filename);
if (!success) if (!success)
@ -539,7 +559,7 @@ bool SaveScreenshot(void)
return false; return false;
} }
SDL_snprintf(filename, sizeof(filename), "screenshots/2x/%s_2x.png", timestamp); SDL_snprintf(filename, sizeof(filename), "screenshots/2x/%s_2x.png", name);
success = SaveImage(graphics.tempScreenshot2x, filename); success = SaveImage(graphics.tempScreenshot2x, filename);
if (!success) if (!success)
@ -547,6 +567,6 @@ bool SaveScreenshot(void)
return false; return false;
} }
vlog_info("Saved screenshot %s", timestamp); vlog_info("Saved screenshot %s", name);
return true; return true;
} }