AURORA: Fix TheWitcherSaveWriter to use only file stems

src/aurora/thewitchersavewriter.cpp

@@ -24,6 +24,7 @@
 
 #include "src/common/encoding.h"
 
+#include "src/aurora/util.h"
 #include "src/aurora/thewitchersavewriter.h"
 
 namespace Aurora {
@@ -61,12 +62,12 @@ TheWitcherSaveWriter::TheWitcherSaveWriter(const Common::UString &areaName, Comm
 	stream.writeZeros(2048);
 }
 
-void TheWitcherSaveWriter::add(const Common::UString &fileName, Common::ReadStream &stream) {
+void TheWitcherSaveWriter::add(const Common::UString &resRef, const Aurora::FileType fileType, Common::ReadStream &stream) {
 	if (_finished)
 		throw Common::Exception("TheWitcherSave::add() Archive is already finished");
 
 	Resource resource;
-	resource.name = fileName;
+	resource.name = TypeMan.setFileType(resRef, fileType);
 	resource.offset = _stream.pos();
 	resource.size = _stream.writeStream(stream);
 
@@ -89,6 +90,8 @@ void TheWitcherSaveWriter::finish() {
 
 	_stream.writeUint32LE(resourceTableOffset);
 	_stream.writeUint32LE(_resources.size());
+
+	_finished = true;
 }
 
 } // End of namespace Aurora

src/aurora/thewitchersavewriter.h

@@ -27,6 +27,8 @@
 
 #include "src/common/writestream.h"
 
+#include "src/aurora/types.h"
+
 namespace Aurora {
 
 class TheWitcherSaveWriter {
@@ -41,10 +43,11 @@ class TheWitcherSaveWriter {
 
 	/** Add a file to this TheWitcherSave archive.
 	 *
-	 *  @param fileName The filename of the stream to write
+	 *  @param resRef The filename of the stream to write
+	 *  @param fileType The file type of the resource to add
 	 *  @param stream The stream of the
 	 */
-	void add(const Common::UString &fileName, Common::ReadStream &stream);
+	void add(const Common::UString &resRef, const Aurora::FileType fileType, Common::ReadStream &stream);
 
 	/** Finish the stream and write the file table at the
 	 *  end of the stream, and set the finished flag to prevent