SCI: Rewrite the way file handles are managed

svn-id: r38794

2 files changed, 18 insertions, 3 deletions

diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index ec1f49b07e..2e29a0682a 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -27,6 +27,7 @@
 #define _SCI_ENGINE_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
 
 namespace Common {
 	class SeekableReadStream;
@@ -79,7 +80,22 @@ struct SavegameMetadata {
 	int savegame_time;
 };
 
+class FileHandle {
+public:
+	FILE *_file;
+	
+	FileHandle() : _file(0) {
+	}
+	
+	~FileHandle() {
+		if (_file)
+			fclose(_file);
+	}
+};
+
 struct EngineState {
+	EngineState();
+
 	int savegame_version;
 
 	int widget_serial_counter; /* Used for savegames */
@@ -171,8 +187,7 @@ struct EngineState {
 
 	/* Kernel File IO stuff */
 
-	int file_handles_nr; /* maximum numer of allowed file handles */
-	FILE **file_handles; /* Array of file handles. Dynamically increased if required. */
+	Common::Array<FileHandle> _fileHandles; /* Array of file handles. Dynamically increased if required. */
 
 	DirSeeker *dirseeker;
 
diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h
index c5d6452610..608a2b7b7c 100644
--- a/engines/sci/include/kernel.h
+++ b/engines/sci/include/kernel.h
@@ -172,7 +172,7 @@ byte *kernel_dereference_bulk_pointer(EngineState *s, reg_t pointer, int entries
 
 int kernel_oops(EngineState *s, const char *file, int line, const char *reason);
 /* Halts script execution and informs the user about an internal kernel error or failed assertion
-** Paramters: (EngineState *) s: The state to use
+** Parameters: (EngineState *) s: The state to use
 **            (const char *) file: The file the oops occured in
 **            (int) line: The line the oops occured in
 **            (const char *) reason: Reason for the kernel oops