Merge branch 'master' into teenagentRefactor

Conflicts:
	engines/teenagent/resources.cpp

1 files changed, 25 insertions, 3 deletions

diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index 500b44cfe3..bd09b08522 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -22,6 +22,7 @@
 #include "teenagent/resources.h"
 #include "teenagent/teenagent.h"
 #include "common/textconsole.h"
+#include "common/translation.h"
 #include "common/zlib.h"
 
 namespace TeenAgent {
@@ -87,16 +88,37 @@ bool Resources::loadArchives(const ADGameDescription *gd) {
 	Common::File *dat_file = new Common::File();
 	if (!dat_file->open("teenagent.dat")) {
 		delete dat_file;
-		Common::String errorMessage = "You're missing the 'teenagent.dat' file. Get it from the ScummVM website";
-		GUIErrorMessage(errorMessage);
+		Common::String errorMessage = _("You're missing the 'teenagent.dat' file. Get it from the ScummVM website");
 		warning("%s", errorMessage.c_str());
+		GUIErrorMessage(errorMessage);
 		return false;
 	}
+
+	// teenagent.dat used to be compressed with zlib compression. The usage of
+	// zlib here is no longer needed, and it's maintained only for backwards
+	// compatibility.
 	Common::SeekableReadStream *dat = Common::wrapCompressedReadStream(dat_file);
+
+#if !defined(USE_ZLIB)
+	uint16 header = dat->readUint16BE();
+	bool isCompressed = (header == 0x1F8B ||
+				     ((header & 0x0F00) == 0x0800 &&
+				      header % 31 == 0));
+	dat->seek(-2, SEEK_CUR);
+
+	if (isCompressed) {
+		// teenagent.dat is compressed, but zlib hasn't been compiled in
+		delete dat;
+		Common::String errorMessage = _("The teenagent.dat file is compressed and zlib hasn't been included in this executable. Please decompress it");
+		warning("%s", errorMessage.c_str());
+		GUIErrorMessage(errorMessage);
+		return false;
+	}
+#endif
+
 	cseg.read(dat, CSEG_SIZE);
 	dseg.read(dat, DSEG_SIZE);
 	eseg.read(dat, ESEG_SIZE);
-
 	delete dat;
 
 	precomputeDialogOffsets();