summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2011-05-28 13:54:42 +0000
committeralberth <alberth@openttd.org>2011-05-28 13:54:42 +0000
commit84f7fc32fa5b9dd6d195d45fe67c55c80037a955 (patch)
tree1611aab7d95147746a8aa95a5a5a7c0febe7177a /src
parentbe048e05f2535458aeef5024ff1c61da183a7836 (diff)
downloadopenttd-84f7fc32fa5b9dd6d195d45fe67c55c80037a955.tar.xz
(svn r22510) -Codechange: Extract filepath creation to its own function.
Diffstat (limited to 'src')
-rw-r--r--src/fios.cpp43
1 files changed, 28 insertions, 15 deletions
diff --git a/src/fios.cpp b/src/fios.cpp
index 97eb13b18..b51b7c919 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -141,38 +141,51 @@ const char *FiosBrowseTo(const FiosItem *item)
}
/**
- * Make a save game or scenario filename from a name.
- * @param buf Destination buffer for saving the filename.
- * @param name Name of the file.
- * @param size Length of buffer \a buf.
+ * Construct a filename from its components in destination buffer \a buf.
+ * @param buf Destination buffer.
+ * @param path Directory path, may be \c NULL.
+ * @param name Filename.
+ * @param ext Filename extension (use \c "" for no extension).
+ * @param size Size of \a buf.
*/
-void FiosMakeSavegameName(char *buf, const char *name, size_t size)
+static void FiosMakeFilename(char *buf, const char *path, const char *name, const char *ext, size_t size)
{
- const char *extension, *period;
-
- extension = (_game_mode == GM_EDITOR) ? ".scn" : ".sav";
+ const char *period;
/* Don't append the extension if it is already there */
period = strrchr(name, '.');
- if (period != NULL && strcasecmp(period, extension) == 0) extension = "";
+ if (period != NULL && strcasecmp(period, ext) == 0) ext = "";
#if defined(__MORPHOS__) || defined(__AMIGAOS__)
- if (_fios_path != NULL) {
- unsigned char sepchar = _fios_path[(strlen(_fios_path) - 1)];
+ if (path != NULL) {
+ unsigned char sepchar = path[(strlen(path) - 1)];
if (sepchar != ':' && sepchar != '/') {
- snprintf(buf, size, "%s" PATHSEP "%s%s", _fios_path, name, extension);
+ snprintf(buf, size, "%s" PATHSEP "%s%s", path, name, ext);
} else {
- snprintf(buf, size, "%s%s%s", _fios_path, name, extension);
+ snprintf(buf, size, "%s%s%s", path, name, ext);
}
} else {
- snprintf(buf, size, "%s%s", name, extension);
+ snprintf(buf, size, "%s%s", name, ext);
}
#else
- snprintf(buf, size, "%s" PATHSEP "%s%s", _fios_path, name, extension);
+ snprintf(buf, size, "%s" PATHSEP "%s%s", path, name, ext);
#endif
}
/**
+ * Make a save game or scenario filename from a name.
+ * @param buf Destination buffer for saving the filename.
+ * @param name Name of the file.
+ * @param size Length of buffer \a buf.
+ */
+void FiosMakeSavegameName(char *buf, const char *name, size_t size)
+{
+ const char *extension = (_game_mode == GM_EDITOR) ? ".scn" : ".sav";
+
+ FiosMakeFilename(buf, _fios_path, name, extension, size);
+}
+
+/**
* Delete a file.
* @param name Filename to delete.
*/