From 83e05ea13f61fdd5d582115c8c2bbd246f70983c Mon Sep 17 00:00:00 2001
From: Jaromir Wysoglad
Date: Tue, 18 Jun 2019 10:31:49 +0200
Subject: SUPERNOVA2: Add english translated image

This adds translated image of cyphered text inside Cabin room
I don't think I can get any closer to the original looks with
.pbm format.
---
 engines/supernova2/graphics.cpp | 33 ++++++++++++++++++++++-----------
 engines/supernova2/screen.cpp   |  4 +++-
 engines/supernova2/state.cpp    |  2 --
 3 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/supernova2/graphics.cpp b/engines/supernova2/graphics.cpp
index 592a8e9081..b629041cc9 100644
--- a/engines/supernova2/graphics.cpp
+++ b/engines/supernova2/graphics.cpp
@@ -81,12 +81,9 @@ bool MS2Image::init(int filenumber) {
 }
 
 bool MS2Image::loadFromEngineDataFile() {
-	//TODO
-	/*Common::String name;
-	if (_filenumber == 1)
+	Common::String name;
+	if (_filenumber == 28)
 		name = "IMG1";
-	else if (_filenumber == 2)
-		name = "IMG2";
 	else
 		return false;
 
@@ -96,16 +93,16 @@ bool MS2Image::loadFromEngineDataFile() {
 	// or the format is not as expected. We will get those warning when reading the
 	// strings anyway (actually the engine will even refuse to start).
 	Common::File f;
-	if (!f.open(SUPERNOVA_DAT))
+	if (!f.open(SUPERNOVA2_DAT))
 		return false;
 
 	char id[5], lang[5];
 	id[4] = lang[4] = '\0';
 	f.read(id, 3);
-	if (strncmp(id, "MSN", 3) != 0)
+	if (strncmp(id, "MS2", 3) != 0)
 		return false;
 	int version = f.readByte();
-	if (version != SUPERNOVA_DAT_VERSION)
+	if (version != SUPERNOVA2_DAT_VERSION)
 		return false;
 
 	while (!f.eos()) {
@@ -118,7 +115,7 @@ bool MS2Image::loadFromEngineDataFile() {
 			return f.read(_encodedImage, size) == size;
 		} else
 			f.skip(size);
-	}*/
+	}
 
 	return false;
 }
@@ -222,8 +219,9 @@ bool MS2Image::loadStream(Common::SeekableReadStream &stream) {
 
 bool MS2Image::loadSections() {
 	bool isPoster = _filenumber == 38;
-	int imageWidth = isPoster ? 640 : 320;
-	int imageHeight = isPoster ? 480 : 200;
+	bool isCypheredText = _filenumber == 28 && ConfMan.get("language") == "en";
+	int imageWidth = isPoster || isCypheredText ? 640 : 320;
+	int imageHeight = isPoster || isCypheredText ? 480 : 200;
 	_pitch = imageWidth;
 
 	for (int section = 0; section < _numSections; ++section) {
@@ -242,6 +240,19 @@ bool MS2Image::loadSections() {
 				*surfacePixels++ = (_encodedImage[i] & 0x02) ? kColorWhite63 : kColorBlack;
 				*surfacePixels++ = (_encodedImage[i] & 0x01) ? kColorWhite63 : kColorBlack;
 			}
+		} else if (isCypheredText) {
+			surface->create(imageWidth, imageHeight, g_system->getScreenFormat());
+			byte *surfacePixels = static_cast<byte *>(surface->getPixels());
+			for (int i = 0; i < imageWidth * imageHeight / 8; ++i) {
+				*surfacePixels++ = (_encodedImage[i] & 0x80) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x40) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x20) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x10) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x08) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x04) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x02) ? kColorWhite44 : kColorBlack;
+				*surfacePixels++ = (_encodedImage[i] & 0x01) ? kColorWhite44 : kColorBlack;
+			}
 		} else {
 
 			uint32 offset = (_section[section].addressHigh << 16) + _section[section].addressLow;
diff --git a/engines/supernova2/screen.cpp b/engines/supernova2/screen.cpp
index 82e38af091..60c2179638 100644
--- a/engines/supernova2/screen.cpp
+++ b/engines/supernova2/screen.cpp
@@ -22,6 +22,7 @@
 
 #include "common/str.h"
 #include "common/system.h"
+#include "common/config-manager.h"
 #include "engines/util.h"
 #include "graphics/cursorman.h"
 #include "graphics/palette.h"
@@ -354,7 +355,8 @@ void Screen::renderImageSection(const MS2Image *image, int section, bool invert)
 							 image->_section[section].y1,
 							 image->_section[section].x2 + 1,
 							 image->_section[section].y2 + 1);
-	if (image->_filenumber == 38) {
+	if (image->_filenumber == 38 ||
+			(image->_filenumber == 28 && ConfMan.get("language") == "en")) {
 		sectionRect.setWidth(640);
 		sectionRect.setHeight(480);
 		if (_screenWidth != 640) {
diff --git a/engines/supernova2/state.cpp b/engines/supernova2/state.cpp
index ab4c4b8ec8..1652170e9e 100644
--- a/engines/supernova2/state.cpp
+++ b/engines/supernova2/state.cpp
@@ -132,8 +132,6 @@ bool GameManager::deserialize(Common::ReadStream *in, int version) {
 	for (int i = 0; i < NUMROOMS; ++i) {
 		_rooms[i]->deserialize(in, version);
 	}
-	delete _rooms[SHIP];
-	_rooms[SHIP] = new Ship(_vm, this);
 	_lastRoom = _rooms[lastRoomId];
 	changeRoom(curRoomId);
 
-- 
cgit v1.2.3