summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-11-01 18:15:35 +0000
committersmatz <smatz@openttd.org>2009-11-01 18:15:35 +0000
commit090c762921d7452b7f7730016d6a1d385fcfc953 (patch)
tree2c52bd64ede330c0b5b308dfd79d7b0f9606e5a5 /src
parentbe446d6f542fccf1e5cc2ed50225c4a8289aa7dc (diff)
downloadopenttd-090c762921d7452b7f7730016d6a1d385fcfc953.tar.xz
(svn r17938) -Feature: non-automatic screenshot name can be entered in console
Diffstat (limited to 'src')
-rw-r--r--src/console_cmds.cpp29
-rw-r--r--src/screenshot.cpp25
-rw-r--r--src/screenshot.h2
-rw-r--r--src/toolbar_gui.cpp4
4 files changed, 38 insertions, 22 deletions
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 83ec9a3ef..1f0d3f42e 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -1218,22 +1218,37 @@ DEF_CONSOLE_CMD(ConAlias)
DEF_CONSOLE_CMD(ConScreenShot)
{
if (argc == 0) {
- IConsoleHelp("Create a screenshot of the game. Usage: 'screenshot [big | no_con]'");
- IConsoleHelp("'big' makes a screenshot of the whole map, 'no_con' hides the console to create the screenshot");
+ IConsoleHelp("Create a screenshot of the game. Usage: 'screenshot [big | no_con] [file name]'");
+ IConsoleHelp("'big' makes a screenshot of the whole map, 'no_con' hides the console to create"
+ "the screenshot. Screenshots of whole map are always drawn without console");
return true;
}
if (argc > 3) return false;
- SetScreenshotType(SC_VIEWPORT);
- if (argc > 1) {
- if (strcmp(argv[1], "big") == 0 || (argc == 3 && strcmp(argv[2], "big") == 0))
- SetScreenshotType(SC_WORLD);
+ ScreenshotType type = SC_VIEWPORT;
+ const char *name = NULL;
- if (strcmp(argv[1], "no_con") == 0 || (argc == 3 && strcmp(argv[2], "no_con") == 0))
+ if (argc > 1) {
+ if (strcmp(argv[1], "big") == 0) {
+ /* screenshot big [filename] */
+ type = SC_WORLD;
+ if (argc > 2) name = argv[2];
+ } else if (strcmp(argv[1], "no_con") == 0) {
+ /* screenshot no_con [filename] */
IConsoleClose();
+ if (argc > 2) name = argv[2];
+ } else if (argc == 2) {
+ /* screenshot filename */
+ name = argv[1];
+ } else {
+ /* screenshot argv[1] argv[2] - invalid*/
+ return false;
+ }
}
+ RequestScreenshot(type, name);
+
return true;
}
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index a9142715c..77d5f4e03 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -539,21 +539,20 @@ static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, ui
static char *MakeScreenshotName(const char *ext)
{
- static char filename[MAX_PATH];
- int serial;
- size_t len;
-
- if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_company == COMPANY_SPECTATOR) {
- strecpy(_screenshot_name, "screenshot", lastof(_screenshot_name));
- } else {
- GenerateDefaultSaveName(_screenshot_name, lastof(_screenshot_name));
+ if (_screenshot_name[0] == '\0') {
+ if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_company == COMPANY_SPECTATOR) {
+ strecpy(_screenshot_name, "screenshot", lastof(_screenshot_name));
+ } else {
+ GenerateDefaultSaveName(_screenshot_name, lastof(_screenshot_name));
+ }
}
/* Add extension to screenshot file */
- len = strlen(_screenshot_name);
+ size_t len = strlen(_screenshot_name);
snprintf(&_screenshot_name[len], lengthof(_screenshot_name) - len, ".%s", ext);
- for (serial = 1;; serial++) {
+ static char filename[20 + 1]; // 1 character more to detect overflow
+ for (uint serial = 1;; serial++) {
if (snprintf(filename, lengthof(filename), "%s%s", _personal_dir, _screenshot_name) >= (int)lengthof(filename)) {
/* We need more characters than MAX_PATH -> end with error */
filename[0] = '\0';
@@ -561,15 +560,17 @@ static char *MakeScreenshotName(const char *ext)
}
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, "#%d.%s", serial, ext);
+ snprintf(&_screenshot_name[len], lengthof(_screenshot_name) - len, "#%u.%s", serial, ext);
}
return filename;
}
-void SetScreenshotType(ScreenshotType t)
+void RequestScreenshot(ScreenshotType t, const char *name)
{
_screenshot_type = t;
+ _screenshot_name[0] = '\0';
+ if (name != NULL) strecpy(_screenshot_name, name, lastof(_screenshot_name));
}
bool IsScreenshotRequested()
diff --git a/src/screenshot.h b/src/screenshot.h
index 2f6a30829..f97be75c9 100644
--- a/src/screenshot.h
+++ b/src/screenshot.h
@@ -24,7 +24,7 @@ enum ScreenshotType {
};
bool MakeScreenshot();
-void SetScreenshotType(ScreenshotType t);
+void RequestScreenshot(ScreenshotType t, const char *name);
bool IsScreenshotRequested();
extern char _screenshot_format_name[8];
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 5a7d05b88..01789aedd 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -748,12 +748,12 @@ static void ToolbarHelpClick(Window *w)
static void MenuClickSmallScreenshot()
{
- SetScreenshotType(SC_VIEWPORT);
+ RequestScreenshot(SC_VIEWPORT, NULL);
}
static void MenuClickWorldScreenshot()
{
- SetScreenshotType(SC_WORLD);
+ RequestScreenshot(SC_WORLD, NULL);
}
static void MenuClickHelp(int index)