mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18079) -Codechange: allow overwriting of screenshots with user-supplied filenames

release/1.0
smatz 2009-11-14 15:50:38 +00:00
parent 16c2e53191
commit 28916ca39e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/screenshot.cpp
View File

@ -571,7 +571,9 @@ static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, ui
static const char *MakeScreenshotName(const char *ext) static const char *MakeScreenshotName(const char *ext)
{ {
if (_screenshot_name[0] == '\0') { bool generate = StrEmpty(_screenshot_name);
if (generate) {
if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_company == COMPANY_SPECTATOR) { if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_company == COMPANY_SPECTATOR) {
strecpy(_screenshot_name, "screenshot", lastof(_screenshot_name)); strecpy(_screenshot_name, "screenshot", lastof(_screenshot_name));
} else { } else {
@ -590,6 +592,7 @@ static const char *MakeScreenshotName(const char *ext)
filename[0] = '\0'; filename[0] = '\0';
break; break;
} }
if (!generate) break; // allow overwriting of non-automatic filenames
if (!FileExists(filename)) break; if (!FileExists(filename)) break;
/* If file exists try another one with same name, but just with a higher index */ /* If file exists try another one with same name, but just with a higher index */
snprintf(&_screenshot_name[len], lengthof(_screenshot_name) - len, "#%u.%s", serial, ext); snprintf(&_screenshot_name[len], lengthof(_screenshot_name) - len, "#%u.%s", serial, ext);