From 5a17ea058583fb0a3d00392b8e07b2a1f414fded Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 13 Jun 2012 11:29:14 +0300
Subject: SCI: Move all file-related functions in file.*

This way, there is a clear separation of the actual SCI kernel file
functions and the file classes and wrappers of ScummVM
---
 engines/sci/engine/state.h | 43 +++----------------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

(limited to 'engines/sci/engine/state.h')

diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 6f1f6a6bda..78a8a5b0a2 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -34,6 +34,7 @@ class WriteStream;
 }
 
 #include "sci/sci.h"
+#include "sci/engine/file.h"
 #include "sci/engine/seg_manager.h"
 
 #include "sci/parser/vocabulary.h"
@@ -42,6 +43,8 @@ class WriteStream;
 
 namespace Sci {
 
+class FileHandle;
+class DirSeeker;
 class EventManager;
 class MessageState;
 class SoundCommandParser;
@@ -54,32 +57,6 @@ enum AbortGameState {
 	kAbortQuitGame = 3
 };
 
-class DirSeeker {
-protected:
-	reg_t _outbuffer;
-	Common::StringArray _files;
-	Common::StringArray _virtualFiles;
-	Common::StringArray::const_iterator _iter;
-
-public:
-	DirSeeker() {
-		_outbuffer = NULL_REG;
-		_iter = _files.begin();
-	}
-
-	reg_t firstFile(const Common::String &mask, reg_t buffer, SegManager *segMan);
-	reg_t nextFile(SegManager *segMan);
-
-	Common::String getVirtualFilename(uint fileNumber);
-
-private:
-	void addAsVirtualFiles(Common::String title, Common::String fileMask);
-};
-
-enum {
-	MAX_SAVEGAME_NR = 20 /**< Maximum number of savegames */
-};
-
 // We assume that scripts give us savegameId 0->99 for creating a new save slot
 //  and savegameId 100->199 for existing save slots ffs. kfile.cpp
 enum {
@@ -93,20 +70,6 @@ enum {
 	GAMEISRESTARTING_RESTORE = 2
 };
 
-class FileHandle {
-public:
-	Common::String _name;
-	Common::SeekableReadStream *_in;
-	Common::WriteStream *_out;
-
-public:
-	FileHandle();
-	~FileHandle();
-
-	void close();
-	bool isOpen() const;
-};
-
 enum VideoFlags {
 	kNone            = 0,
 	kDoubled         = 1 << 0,
-- 
cgit v1.2.3