diff options
author | rubidium <rubidium@openttd.org> | 2007-06-17 15:48:57 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-06-17 15:48:57 +0000 |
commit | 347c28b71ac754aee20f8eeeae1df1a3b9a49d10 (patch) | |
tree | 8bc2a050b44170ed785af66e6e9045d429c789db /src/screenshot.cpp | |
parent | 5fdde681c2aff0976eef8cea59422332527b3a65 (diff) | |
download | openttd-347c28b71ac754aee20f8eeeae1df1a3b9a49d10.tar.xz |
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
-Codechange: add support for personal directories on Windows.
-Fix [FS#153, FS#193, FS#502, FS#816, FS#854]: fix issues related to fixed names, fixed places of files/directories and application bundles.
Diffstat (limited to 'src/screenshot.cpp')
-rw-r--r-- | src/screenshot.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/screenshot.cpp b/src/screenshot.cpp index 9beac53d5..78235553d 100644 --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -8,11 +8,13 @@ #include "table/strings.h" #include "gfx.h" #include "hal.h" +#include "fileio.h" #include "viewport.h" #include "player.h" #include "screenshot.h" #include "variables.h" #include "date.h" +#include "string.h" #include "helpers.hpp" #include "blitter/blitter.hpp" #include "fileio.h" @@ -521,12 +523,12 @@ static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, ui static char *MakeScreenshotName(const char *ext) { - static char filename[256]; - char *base; + static char filename[MAX_PATH]; int serial; + size_t len; if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_player == PLAYER_SPECTATOR) { - sprintf(_screenshot_name, "screenshot"); + ttd_strlcpy(_screenshot_name, "screenshot", lengthof(_screenshot_name)); } else { const Player* p = GetPlayer(_local_player); SetDParam(0, p->name_1); @@ -535,16 +537,16 @@ static char *MakeScreenshotName(const char *ext) GetString(_screenshot_name, STR_4004, lastof(_screenshot_name)); } + /* Add extension to screenshot file */ SanitizeFilename(_screenshot_name); - base = strchr(_screenshot_name, 0); - base[0] = '.'; strcpy(base + 1, ext); - - serial = 0; - for (;;) { - snprintf(filename, sizeof(filename), "%s%s", _paths.personal_dir, _screenshot_name); - if (!FileExists(filename)) - break; - sprintf(base, " #%d.%s", ++serial, ext); + len = strlen(_screenshot_name); + snprintf(&_screenshot_name[len], lengthof(_screenshot_name) - len, ".%s", ext); + + for (serial = 1;; serial++) { + snprintf(filename, lengthof(filename), "%s%s", _personal_dir, _screenshot_name); + 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); } return filename; |