From 2d1fd81f90ca0583d1e28b57926079cec3d6c48c Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Thu, 26 Feb 2009 21:17:53 +0000 Subject: [PATCH] start out with an empty array of file handles, so the Enginestates matches between startup and restart. really check its size before accessing it (fixes LSL3 restart) svn-id: r38915 --- engines/sci/engine/game.cpp | 2 -- engines/sci/engine/kfile.cpp | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index 250610dfb7e..03fbb74266e 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -528,8 +528,6 @@ EngineState::EngineState() { kernel_opt_flags = 0; - _fileHandles.resize(5); - dirseeker = 0; execution_stack = 0; diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 7638bab28aa..4c615ff6b49 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -379,12 +379,16 @@ void file_open(EngineState *s, char *filename, int mode) { return; } - uint retval = 1; // Ignore _fileHandles[0] + uint retval = 0; while ((retval < s->_fileHandles.size()) && s->_fileHandles[retval]._file) retval++; - if (retval == s->_fileHandles.size()) { // Hit size limit => Allocate more space - s->_fileHandles.resize(s->_fileHandles.size() + 1); + // Ignore _fileHandles[0] + if (retval < 1) + retval = 1; + + if (retval >= s->_fileHandles.size()) { // Hit size limit => Allocate more space + s->_fileHandles.resize(retval + 1); } s->_fileHandles[retval]._file = file;