aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/file.h7
-rw-r--r--common/fs.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/common/file.h b/common/file.h
index 4d519be475..d2eae1f28c 100644
--- a/common/file.h
+++ b/common/file.h
@@ -30,6 +30,8 @@
#include "common/scummsys.h"
#include "common/str.h"
#include "common/stream.h"
+#include "backends/file/base-file.h"
+//#include "backends/factories/fs-factory-maker.cpp"
class FilesystemNode;
@@ -38,6 +40,9 @@ namespace Common {
class File : public SeekableReadStream, public WriteStream {
protected:
/** File handle to the actual file; 0 if no file is open. */
+ //BaseFile *_test;
+
+ /** File handle to the actual file; 0 if no file is open. */
void *_handle;
/** Status flag which tells about recent I/O failures. */
@@ -52,7 +57,7 @@ private:
// code that accidentally copied File objects tended to break in strange
// ways.
File(const File &f);
- File &operator =(const File &f);
+ File &operator =(const File &f);
public:
enum AccessMode {
diff --git a/common/fs.cpp b/common/fs.cpp
index 28f3e11f0b..40d9e4de14 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -25,7 +25,7 @@
#include "common/stdafx.h"
#include "common/util.h"
#include "backends/fs/abstract-fs.h"
-#include "backends/fs/fs-factory-maker.cpp"
+#include "backends/factories/fs-factory-maker.cpp"
/*
* Simple DOS-style pattern matching function (understands * and ? like used in DOS).