mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 09:39:43 +01:00
Allow taking multiple screenshots in same second
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:
parent
d8b97db6a8
commit
18730b465e
1 changed files with 23 additions and 3 deletions
|
@ -510,6 +510,9 @@ bool SaveImage(const SDL_Surface* surface, const char* filename)
|
|||
|
||||
bool SaveScreenshot(void)
|
||||
{
|
||||
static time_t last_time = 0;
|
||||
static int subsecond_counter = 0;
|
||||
|
||||
bool success = TakeScreenshot(&graphics.tempScreenshot);
|
||||
if (!success)
|
||||
{
|
||||
|
@ -520,11 +523,28 @@ bool SaveScreenshot(void)
|
|||
const time_t now = time(NULL);
|
||||
const tm* date = localtime(&now);
|
||||
|
||||
if (now != last_time)
|
||||
{
|
||||
last_time = now;
|
||||
subsecond_counter = 0;
|
||||
}
|
||||
subsecond_counter++;
|
||||
|
||||
char timestamp[32];
|
||||
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];
|
||||
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);
|
||||
if (!success)
|
||||
|
@ -539,7 +559,7 @@ bool SaveScreenshot(void)
|
|||
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);
|
||||
if (!success)
|
||||
|
@ -547,6 +567,6 @@ bool SaveScreenshot(void)
|
|||
return false;
|
||||
}
|
||||
|
||||
vlog_info("Saved screenshot %s", timestamp);
|
||||
vlog_info("Saved screenshot %s", name);
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue