dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/screenshot.cpp
#	src/settings_gui.cp
This commit is contained in:
Jonathan G Rennison
2022-11-10 19:46:02 +00:00
parent 502b263d25 019dcb7b7b
commit 3b7352132b
66 changed files with 170 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/screenshot.cpp
View File

@@ -706,13 +706,15 @@ static const char *MakeScreenshotName(const char *default_fn, const char *ext, b
size_t len = strlen(_screenshot_name);
/* Handle user-specified filenames ending in %d with automatic numbering */
if (len >= 2) {
if (_screenshot_name[len - 2] == '%' && _screenshot_name[len - 1] == 'd') {
generate = true;
len -= 2;
_screenshot_name[len] = '\0';
}
/* Handle user-specified filenames ending in %d or # with automatic numbering */
if (len >= 2 && _screenshot_name[len - 2] == '%' && _screenshot_name[len - 1] == 'd') {
generate = true;
len -= 2;
_screenshot_name[len] = '\0';
} else if (len >= 1 && _screenshot_name[len - 1] == '#') {
generate = true;
len -= 1;
_screenshot_name[len] = '\0';
}
/* Add extension to screenshot file */