summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2016-09-04 12:54:30 +0000
committeralberth <alberth@openttd.org>2016-09-04 12:54:30 +0000
commit95bb103a233c9986777897c0d8b26f6f7c1cf08f (patch)
treeb3cd0327b26c3f7016d96a6b11d78f616a7b030a
parentcaf33797463560617526cbb38eac5e8b77eda242 (diff)
downloadopenttd-95bb103a233c9986777897c0d8b26f6f7c1cf08f.tar.xz
(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.
-rw-r--r--src/fios.cpp4
-rw-r--r--src/os/os2/os2.cpp4
-rw-r--r--src/os/unix/unix.cpp3
-rw-r--r--src/os/windows/win32.cpp6
4 files changed, 9 insertions, 8 deletions
diff --git a/src/fios.cpp b/src/fios.cpp
index 529890810..271f27076 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -38,7 +38,7 @@ SortingBits _savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING;
extern bool FiosIsRoot(const char *path);
extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
extern bool FiosIsHiddenFile(const struct dirent *ent);
-extern void FiosGetDrives();
+extern void FiosGetDrives(FileList &file_list);
extern bool FiosGetDiskFreeSpace(const char *path, uint64 *tot);
/* get the name of an oldstyle savegame */
@@ -354,7 +354,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
QSortT(file_list.Get(sort_start), file_list.Length() - sort_start, CompareFiosItems);
/* Show drives */
- FiosGetDrives();
+ FiosGetDrives(file_list);
file_list.Compact();
}
diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp
index 386cc4dbb..7b34f528a 100644
--- a/src/os/os2/os2.cpp
+++ b/src/os/os2/os2.cpp
@@ -45,7 +45,7 @@ bool FiosIsRoot(const char *file)
return file[3] == '\0';
}
-void FiosGetDrives()
+void FiosGetDrives(FileList &file_list)
{
uint disk, disk2, save, total;
@@ -75,7 +75,7 @@ void FiosGetDrives()
#endif
if (disk == disk2) {
- FiosItem *fios = _fios_items.Append();
+ FiosItem *fios = file_list.Append();
fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0;
#ifndef __INNOTEK_LIBC__
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 24dedb2ee..d7c2304ce 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -16,6 +16,7 @@
#include "../../core/random_func.hpp"
#include "../../debug.h"
#include "../../string_func.h"
+#include "../../fios.h"
#include <dirent.h>
@@ -77,7 +78,7 @@ bool FiosIsRoot(const char *path)
#endif
}
-void FiosGetDrives()
+void FiosGetDrives(FileList &file_list)
{
return;
}
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index 041468a13..344d24314 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -208,11 +208,11 @@ bool FiosIsRoot(const char *file)
return file[3] == '\0'; // C:\...
}
-void FiosGetDrives()
+void FiosGetDrives(FileList &file_list)
{
#if defined(WINCE)
/* WinCE only knows one drive: / */
- FiosItem *fios = _fios_items.Append();
+ FiosItem *fios = file_list.Append();
fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0;
seprintf(fios->name, lastof(fios->name), PATHSEP "");
@@ -223,7 +223,7 @@ void FiosGetDrives()
GetLogicalDriveStrings(lengthof(drives), drives);
for (s = drives; *s != '\0';) {
- FiosItem *fios = _fios_items.Append();
+ FiosItem *fios = file_list.Append();
fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0;
seprintf(fios->name, lastof(fios->name), "%c:", s[0] & 0xFF);