VOYEUR: Merge of upstream

8 files changed, 99 insertions, 54 deletions

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 6cc0c45963..af7e91f7eb 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -25,7 +25,6 @@
 #include "common/debug.h"
 #include "common/debug-channels.h"
 #include "common/error.h"
-#include "common/EventRecorder.h"
 #include "common/file.h"
 #include "common/fs.h"
 #include "engines/advancedDetector.h"
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index 0e8c5a05bb..61558c0989 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -80,6 +80,12 @@ class Talk;
 
 #define kSayTheEnd  41
 
+enum GameType {
+	kGameTypeNone = 0,
+	kGameTypeSoltys,
+	kGameTypeSfinx
+};
+
 // our engine debug channels
 enum {
 	kCGEDebugBitmap = 1 << 0,
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index f4f1cd3e0b..5325558f8b 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -358,7 +358,7 @@ void CGEEngine::writeSavegameHeader(Common::OutSaveFile *out, SavegameHeader &he
 	// Create a thumbnail and save it
 	Graphics::Surface *thumb = new Graphics::Surface();
 	Graphics::Surface *s = _vga->_page[0];
-	::createThumbnail(thumb, (const byte *)s->pixels, kScrWidth, kScrHeight, thumbPalette);
+	::createThumbnail(thumb, (const byte *)s->getPixels(), kScrWidth, kScrHeight, thumbPalette);
 	Graphics::saveThumbnail(*out, *thumb);
 	thumb->free();
 	delete thumb;
@@ -1046,7 +1046,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, i
 		for (line = sprf.readLine(); !sprf.eos(); line = sprf.readLine()) {
 			len = line.size();
 			lcnt++;
-			strcpy(tmpStr, line.c_str());
+			Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
 			if (len == 0 || *tmpStr == '.')
 				continue;
 
@@ -1132,7 +1132,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, i
 		_sprite->_flags._bDel = true;
 
 		// Extract the filename, without the extension
-		strcpy(_sprite->_file, fname);
+		Common::strlcpy(_sprite->_file, fname, sizeof(_sprite->_file));
 		char *p = strchr(_sprite->_file, '.');
 		if (p)
 			*p = '\0';
@@ -1158,7 +1158,7 @@ void CGEEngine::loadScript(const char *fname) {
 		char *p;
 
 		lcnt++;
-		strcpy(tmpStr, line.c_str());
+		Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
 		if ((line.size() == 0) || (*tmpStr == '.'))
 			continue;
 
diff --git a/engines/cge/configure.engine b/engines/cge/configure.engine
new file mode 100644
index 0000000000..72af1197be
--- /dev/null
+++ b/engines/cge/configure.engine
@@ -0,0 +1,3 @@
+# This file is included from the main "configure" script
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+add_engine cge "CGE" yes
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 289aede99e..c377970c51 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -36,77 +36,116 @@ static const PlainGameDescriptor CGEGames[] = {
 
 namespace CGE {
 
-static const ADGameDescription gameDescriptions[] = {
+struct CgeGameDescription {
+	ADGameDescription desc;
+	GameType gameType;
+};
+
+static const CgeGameDescription gameDescriptions[] = {
 
 	{
-		"soltys", "",
 		{
-			{"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176},
-			{"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437572},
-			AD_LISTEND
+			"soltys", "",
+			{
+				{"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176},
+				{"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437572},
+				AD_LISTEND
+			},
+			Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
 		},
-		Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
+		kGameTypeSoltys
 	},
 	{
-		"soltys", "Soltys Freeware",
 		{
-			{"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176},
-			{"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437676},
-			AD_LISTEND
+			"soltys", "Soltys Freeware",
+			{
+				{"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176},
+				{"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437676},
+				AD_LISTEND
+			},
+			Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
 		},
-		Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
+		kGameTypeSoltys
 	},
 	{
-		"soltys", "Soltys Demo (not supported)",
 		{
-			{"vol.cat", 0, "1e077c8ff58109a187f07ac54b0c873a", 18788},
-			{"vol.dat", 0, "75d385a6074c58b69f7730481f256051", 1796710},
-			AD_LISTEND
+			"soltys", "Soltys Demo (not supported)",
+			{
+				{"vol.cat", 0, "1e077c8ff58109a187f07ac54b0c873a", 18788},
+				{"vol.dat", 0, "75d385a6074c58b69f7730481f256051", 1796710},
+				AD_LISTEND
+			},
+			Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO , GUIO0()
 		},
-		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO , GUIO0()
+		kGameTypeSoltys
 	},
 	{
-		"soltys", "Soltys Demo (not supported)",
 		{
-			{"vol.cat", 0, "f17987487fab1ebddd781d8d02fedecc", 7168},
-			{"vol.dat", 0, "c5d9b15863cab61dc125551576dece04", 1075272},
-			AD_LISTEND
+			"soltys", "Soltys Demo (not supported)",
+			{
+				{"vol.cat", 0, "f17987487fab1ebddd781d8d02fedecc", 7168},
+				{"vol.dat", 0, "c5d9b15863cab61dc125551576dece04", 1075272},
+				AD_LISTEND
+			},
+			Common::PL_POL, Common::kPlatformDOS, ADGF_DEMO , GUIO0()
 		},
-		Common::PL_POL, Common::kPlatformDOS, ADGF_DEMO , GUIO0()
+		kGameTypeSoltys
 	},
 	{
-		"soltys", "Soltys Freeware v1.0",
 		{
-			{"vol.cat", 0, "f1675684c68ab90272f5776f8f2c3974", 50176},
-			{"vol.dat", 0, "4ffeff4abc99ac5999b55ccfc56ab1df", 8430868},
-			AD_LISTEND
+			"soltys", "Soltys Freeware v1.0",
+			{
+				{"vol.cat", 0, "f1675684c68ab90272f5776f8f2c3974", 50176},
+				{"vol.dat", 0, "4ffeff4abc99ac5999b55ccfc56ab1df", 8430868},
+				AD_LISTEND
+			},
+			Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO0()
 		},
-		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO0()
+		kGameTypeSoltys
 	},
 	{
-		"soltys", "Soltys Freeware v1.0",
 		{
-			{"vol.cat", 0, "20fdce799adb618100ef9ee2362be875", 50176},
-			{"vol.dat", 0, "0e43331c846094d77f5dd201827e0a3b", 8439339},
-			AD_LISTEND
+			"soltys", "Soltys Freeware v1.0",
+			{
+				{"vol.cat", 0, "20fdce799adb618100ef9ee2362be875", 50176},
+				{"vol.dat", 0, "0e43331c846094d77f5dd201827e0a3b", 8439339},
+				AD_LISTEND
+			},
+			Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
 		},
-		Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
+		kGameTypeSoltys
 	},
 	{
-		// Polish version, provided by Strangerke
-		"sfinx", "Sfinx Freeware",
 		{
-			{"vol.cat", 0, "21197b287d397c53261b6616bf0dd880", 129024},
-			{"vol.dat", 0, "de14291869a8eb7c2732ab783c7542ef", 34180844},	
-			AD_LISTEND
+			"soltys", "Soltys Freeware v1.0",
+			{
+				{"vol.cat", 0, "fcae86b20eaa5cedec17b24fa5e85eb4", 50176},
+				{"vol.dat", 0, "ff10d54acc2c95696c57e05819b6906f", 8450151},
+				AD_LISTEND
+			},
+			Common::ES_ESP, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO0()
 		},
-		Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
+		kGameTypeSoltys
 	},
-	AD_TABLE_END_MARKER
+	{
+		{
+			// Polish version, provided by Strangerke
+			"sfinx", "Sfinx Freeware",
+			{
+				{"vol.cat", 0, "21197b287d397c53261b6616bf0dd880", 129024},
+				{"vol.dat", 0, "de14291869a8eb7c2732ab783c7542ef", 34180844},
+				AD_LISTEND
+			},
+			Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
+		},
+		kGameTypeSfinx
+	},
+
+	{AD_TABLE_END_MARKER, kGameTypeNone}
 };
 
 static const ADFileBasedFallback fileBasedFallback[] = {
-	{ &gameDescriptions[0], { "vol.cat", "vol.dat", 0 } },
+	{ &gameDescriptions[0].desc, { "vol.cat", "vol.dat", 0 } },
 	{ 0, { 0 } }
 };
 
@@ -114,7 +153,7 @@ static const ADFileBasedFallback fileBasedFallback[] = {
 
 class CGEMetaEngine : public AdvancedMetaEngine {
 public:
-	CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames) {
+	CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(CGE::CgeGameDescription), CGEGames) {
 		_singleid = "soltys";
 	}
 
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index edb8972040..b9030efb4d 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -494,7 +494,7 @@ void CGEEngine::snGame(Sprite *spr, int num) {
 		_sprK3->step(newRandom(6));
 
 		// check the ALT key as it's the solution of the puzzle
-		// the test has been restricted to some specific OSes 
+		// the test has been restricted to some specific OSes
 		// in order to avoid some obvious issues (like Android, iOS, NDS, N64...)
 		// Not perfect, but at least better than nothing.
 #if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(MOTOEZX) || defined(LINUPY) || defined(LINUXMOTO_SDL)
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index 27bb0608fd..08ff005e1e 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -69,7 +69,7 @@ int16 Text::count() {
 	for (line = tf.readLine(); !tf.eos(); line = tf.readLine()) {
 		char *s;
 		assert(line.size() <= 513);
-		strcpy(tmpStr, line.c_str());
+		Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
 		if ((s = strtok(tmpStr, " =,;/\t\n")) == NULL)
 			continue;
 		if (!Common::isDigit(*s))
@@ -101,8 +101,7 @@ void Text::load() {
 	for (idx = 0, line = tf.readLine(); !tf.eos(); line = tf.readLine()) {
 		int n = line.size();
 		char *s;
-		assert(n <= 513);
-		strcpy(tmpStr, line.c_str());
+		Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
 		if ((s = strtok(tmpStr, " =,;/\t\n")) == NULL)
 			continue;
 		if (!Common::isDigit(*s))
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 56a0754527..4954e638ab 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -214,8 +214,7 @@ Sprite *Sprite::expand() {
 
 		for (line = sprf.readLine(); !sprf.eos(); line = sprf.readLine()) {
 			len = line.size();
-			assert(len <= 513);
-			strcpy(tmpStr, line.c_str());
+			Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
 			lcnt++;
 			if (len == 0 || *tmpStr == '.')
 				continue;
@@ -826,7 +825,7 @@ void Vga::update() {
 		}
 	}
 
-	g_system->copyRectToScreen(Vga::_page[0]->getBasePtr(0, 0), kScrWidth, 0, 0, kScrWidth, kScrHeight);
+	g_system->copyRectToScreen(Vga::_page[0]->getPixels(), kScrWidth, 0, 0, kScrWidth, kScrHeight);
 	g_system->updateScreen();
 }
 
@@ -845,7 +844,7 @@ void Bitmap::xShow(int16 x, int16 y) {
 	debugC(4, kCGEDebugBitmap, "Bitmap::xShow(%d, %d)", x, y);
 
 	const byte *srcP = (const byte *)_v;
-	byte *destEndP = (byte *)_vm->_vga->_page[1]->pixels + (kScrWidth * kScrHeight);
+	byte *destEndP = (byte *)_vm->_vga->_page[1]->getBasePtr(0, kScrHeight);
 	byte *lookupTable = _m;
 
 	// Loop through processing data for each plane. The game originally ran in plane mapped mode, where a
@@ -898,7 +897,7 @@ void Bitmap::show(int16 x, int16 y) {
 	debugC(5, kCGEDebugBitmap, "Bitmap::show(%d, %d)", x, y);
 
 	const byte *srcP = (const byte *)_v;
-	byte *destEndP = (byte *)_vm->_vga->_page[1]->pixels + (kScrWidth * kScrHeight);
+	byte *destEndP = (byte *)_vm->_vga->_page[1]->getBasePtr(0, kScrHeight);
 
 	// Loop through processing data for each plane. The game originally ran in plane mapped mode, where a
 	// given plane holds each fourth pixel sequentially. So to handle an entire picture, each plane's data