summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskidd13 <skidd13@openttd.org>2008-06-02 14:27:58 +0000
committerskidd13 <skidd13@openttd.org>2008-06-02 14:27:58 +0000
commit11cdcf875c7e2d0900429b83195ad6aac5ce6d2e (patch)
tree4c4410cabaf08a8d35010d548f26880e398ac0cc
parent8a40ca49c6c12ce47b2a333f5297d65abe957b86 (diff)
downloadopenttd-11cdcf875c7e2d0900429b83195ad6aac5ce6d2e.tar.xz
(svn r13360) -Fix (r13359): Forgot to remove some instances of FiosAlloc()
-rw-r--r--src/fios.h2
-rw-r--r--src/os2.cpp2
-rw-r--r--src/win32.cpp4
3 files changed, 3 insertions, 5 deletions
diff --git a/src/fios.h b/src/fios.h
index 7ec8e6767..7e7e80975 100644
--- a/src/fios.h
+++ b/src/fios.h
@@ -105,8 +105,6 @@ StringID FiosGetDescText(const char **path, uint32 *total_free);
bool FiosDelete(const char *name);
/* Make a filename from a name */
void FiosMakeSavegameName(char *buf, const char *name, size_t size);
-/* Allocate a new FiosItem */
-FiosItem *FiosAlloc();
int CDECL compare_FiosItems(const void *a, const void *b);
diff --git a/src/os2.cpp b/src/os2.cpp
index 3d1c4df64..4e95103dc 100644
--- a/src/os2.cpp
+++ b/src/os2.cpp
@@ -67,7 +67,7 @@ void FiosGetDrives()
#endif
if (disk == disk2) {
- FiosItem *fios = FiosAlloc();
+ FiosItem *fios = _fios_items.Append()();
fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0;
#ifndef __INNOTEK_LIBC__
diff --git a/src/win32.cpp b/src/win32.cpp
index ba35b7e9c..9f671c9f6 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -780,7 +780,7 @@ void FiosGetDrives()
{
#if defined(WINCE)
/* WinCE only knows one drive: / */
- FiosItem *fios = FiosAlloc();
+ FiosItem *fios = _fios_items.Append()();
fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0;
snprintf(fios->name, lengthof(fios->name), PATHSEP "");
@@ -791,7 +791,7 @@ void FiosGetDrives()
GetLogicalDriveStrings(sizeof(drives), drives);
for (s = drives; *s != '\0';) {
- FiosItem *fios = FiosAlloc();
+ FiosItem *fios = _fios_items.Append()();
fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0;
snprintf(fios->name, lengthof(fios->name), "%c:", s[0] & 0xFF);