[Gemrb-commits] gemrb: branch master updated. v0.6.6-165-gb689ac4

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  b689ac4d752ab3ecfa06848041c6d70e70536a48 (commit)

Summary of changes:
 gemrb/core/System/FileStream.h            |    3 ++-
 gemrb/plugins/BIFImporter/BIFImporter.cpp |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)
      from  92e3333d6a6ace5195b046fdec4fd9f868ff7f7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b689ac4d752ab3ecfa06848041c6d70e70536a48

commit b689ac4d752ab3ecfa06848041c6d70e70536a48
Author: Tom Prince <tom...@ua...>
Date:   Mon Nov 28 13:41:29 2011 -0500

    Fix crasher decompressing BIFs on windows.
    
    Thanks Beholder.

diff --git a/gemrb/core/System/FileStream.h b/gemrb/core/System/FileStream.h
index d225d04..b0cac6c 100644
--- a/gemrb/core/System/FileStream.h
+++ b/gemrb/core/System/FileStream.h
@@ -56,6 +56,8 @@ public:
 	int Read(void* dest, unsigned int length);
 	int Write(const void* src, unsigned int length);
 	int Seek(int pos, int startpos);
+
+	void Close();
 public:
 	/** Opens the specifed file.
 	 *
@@ -64,7 +66,6 @@ public:
 	static FileStream* OpenFile(const char* filename);
 private:
 	void FindLength();
-	void Close();
 };
 
 #endif  // ! FILESTREAM_H
diff --git a/gemrb/plugins/BIFImporter/BIFImporter.cpp b/gemrb/plugins/BIFImporter/BIFImporter.cpp
index 55da327..ab824fc 100644
--- a/gemrb/plugins/BIFImporter/BIFImporter.cpp
+++ b/gemrb/plugins/BIFImporter/BIFImporter.cpp
@@ -88,6 +88,7 @@ DataStream* BIFImporter::DecompressBIFC(DataStream* compressed, const char* path
 		}
 	}
 	print( "\n" );
+	out.Close(); // This is necesary, since windows won't open the file otherwise.
 	return FileStream::OpenFile(path);
 }
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator