Merge branch 'archive_refactor'

# Conflicts:
#	tools/xcode/DarkRadiant.xcodeproj/project.pbxproj

configure.ac

@@ -48,6 +48,9 @@ AC_PROG_LIBTOOL
 # We require a C++11-compliant compiler, without nonstandard extensions
 AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
 
+# We require the cstdint header to be present
+AC_CHECK_HEADER([cstdint], [], [AC_MSG_ERROR([Could not find the <cstdint> header.])])
+
 # Optional features
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug],

libs/DirectoryArchiveFile.h

@@ -0,0 +1,58 @@
+#pragma once
+
+#include "iarchive.h"
+#include "stream/FileInputStream.h"
+
+namespace archive
+{
+
+/// \brief An ArchiveFile which is stored as a single file on disk.
+class DirectoryArchiveFile :
+	public ArchiveFile
+{
+private:
+	std::string _name;
+	stream::FileInputStream _istream;
+	stream::FileInputStream::size_type _size;
+
+public:
+	typedef stream::FileInputStream::size_type size_type;
+
+	DirectoryArchiveFile(const std::string& name, const std::string& filename) :
+		_name(name),
+		_istream(filename)
+	{
+		if (!failed())
+		{
+			_istream.seek(0, stream::FileInputStream::end);
+			_size = _istream.tell();
+			_istream.seek(0);
+		}
+		else 
+		{
+			_size = 0;
+		}
+	}
+
+	bool failed() const
+	{
+		return _istream.failed();
+	}
+
+	size_type size() const override
+	{
+		return _size;
+	}
+
+	const std::string& getName() const override
+	{
+		return _name;
+	}
+
+	InputStream& getInputStream() override
+	{
+		return _istream;
+	}
+};
+
+}

libs/DirectoryArchiveTextFile.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include "iarchive.h"
+#include "stream/TextFileInputStream.h"
+
+namespace archive
+{
+
+/// \brief An ArchiveTextFile which is stored as a single file on disk.
+class DirectoryArchiveTextFile :
+	public ArchiveTextFile
+{
+private:
+	std::string _name;
+	TextFileInputStream _inputStream;
+
+	// Mod directory
+	std::string _modName;
+
+public:
+
+	DirectoryArchiveTextFile(const std::string& name,
+							 const std::string& modName,
+							 const std::string& filename) : 
+		_name(name),
+		_inputStream(filename),
+		_modName(modName)
+	{}
+
+	bool failed() const 
+	{
+		return _inputStream.failed();
+	}
+
+	const std::string& getName() const override
+	{
+		return _name;
+	}
+
+	TextInputStream& getInputStream() override
+	{
+		return _inputStream;
+	}
+
+	/**
+	* Get mod directory.
+	*/
+	std::string getModName() const override
+	{
+		return _modName;
+	}
+};
+
+}