# HG changeset patch # User smatz # Date 1258213838 0 # Node ID b25cd3063c0652905c6f4bf406a224fdb9ea435e # Parent e7121cbd5f5a9dbcced86dec41f41c09eaf7ebbd (svn r18079) -Codechange: allow overwriting of screenshots with user-supplied filenames diff --git a/src/screenshot.cpp b/src/screenshot.cpp --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -571,7 +571,9 @@ 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) { strecpy(_screenshot_name, "screenshot", lastof(_screenshot_name)); } else { @@ -590,6 +592,7 @@ filename[0] = '\0'; break; } + if (!generate) break; // allow overwriting of non-automatic filenames if (!FileExists(filename)) break; /* 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);