[Scummvm-git-logs] scummvm master -> d721ecceeaf9de4ac42ee76f14c602594bdbf5f9

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3e4918cbbb TRECISION: Replace updatePixelFormat() with convertToScreenFormat()
d721ecceea TRECISION: Draw video subtitles correctly


Commit: 3e4918cbbbea7d589b8ba16aa42807759b54be16
    https://github.com/scummvm/scummvm/commit/3e4918cbbbea7d589b8ba16aa42807759b54be16
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-06-09T01:49:13+03:00

Commit Message:
TRECISION: Replace updatePixelFormat() with convertToScreenFormat()

Changed paths:
    engines/trecision/graphics.cpp
    engines/trecision/graphics.h
    engines/trecision/resource.cpp


diff --git a/engines/trecision/graphics.cpp b/engines/trecision/graphics.cpp
index 08fec9cb70..72dcd4fda8 100644
--- a/engines/trecision/graphics.cpp
+++ b/engines/trecision/graphics.cpp
@@ -345,18 +345,6 @@ uint16 GraphicsManager::convertToScreenFormat(uint16 color) const {
 	return (uint16)_screenFormat.RGBToColor(r, g, b);
 }
 
-void GraphicsManager::updatePixelFormat(uint16 *p, uint32 len) const {
-	if (_screenFormat == kImageFormat)
-		return;
-
-	uint8 r, g, b;
-	for (uint32 a = 0; a < len; ++a) {
-		const uint16 t = p[a];
-		kImageFormat.colorToRGB(t, r, g, b);
-		p[a] = _screenFormat.RGBToColor(r, g, b);
-	}
-}
-
 /**
  *					Shadow Pixel
  *				(dark) 0..8 (light)
diff --git a/engines/trecision/graphics.h b/engines/trecision/graphics.h
index df043b74c2..e3cfc22892 100644
--- a/engines/trecision/graphics.h
+++ b/engines/trecision/graphics.h
@@ -91,7 +91,6 @@ public:
 	void readSurface(Common::SeekableReadStream *stream, Graphics::Surface *surface, uint16 width, uint16 height, uint16 count = 1);
 
 	uint16 convertToScreenFormat(uint16 color) const;
-	void updatePixelFormat(uint16 *p, uint32 len) const;
 
 	void shadow(uint16 x, uint16 y, uint8 num);
 	void pixelAliasing(uint16 x, uint16 y);
diff --git a/engines/trecision/resource.cpp b/engines/trecision/resource.cpp
index 9c93711d58..cde422e954 100644
--- a/engines/trecision/resource.cpp
+++ b/engines/trecision/resource.cpp
@@ -152,9 +152,7 @@ void TrecisionEngine::readObject(Common::SeekableReadStream *stream, uint16 objI
 		delete[] _objPointers[objIndex];
 		_objPointers[objIndex] = new uint16[size];
 		for (uint32 i = 0; i < size; ++i)
-			_objPointers[objIndex][i] = stream->readUint16LE();
-
-		_graphicsMgr->updatePixelFormat(_objPointers[objIndex], size);
+			_objPointers[objIndex][i] = _graphicsMgr->convertToScreenFormat(stream->readUint16LE());
 	}
 
 	if (obj->isModeMask()) {
@@ -164,9 +162,7 @@ void TrecisionEngine::readObject(Common::SeekableReadStream *stream, uint16 objI
 		delete[] _objPointers[objIndex];
 		_objPointers[objIndex] = new uint16[size];
 		for (uint32 i = 0; i < size; ++i)
-			_objPointers[objIndex][i] = stream->readUint16LE();
-
-		_graphicsMgr->updatePixelFormat(_objPointers[objIndex], size);
+			_objPointers[objIndex][i] = _graphicsMgr->convertToScreenFormat(stream->readUint16LE());
 
 		size = stream->readUint32LE();
 		delete[] _maskPointers[objIndex];


Commit: d721ecceeaf9de4ac42ee76f14c602594bdbf5f9
    https://github.com/scummvm/scummvm/commit/d721ecceeaf9de4ac42ee76f14c602594bdbf5f9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-06-09T01:49:14+03:00

Commit Message:
TRECISION: Draw video subtitles correctly

A regression from 6ce7d3a985bdd9dac719d8f6dc7883e9f2e006eb

Changed paths:
    engines/trecision/video.cpp


diff --git a/engines/trecision/video.cpp b/engines/trecision/video.cpp
index 3319c8052a..a323cf52e6 100644
--- a/engines/trecision/video.cpp
+++ b/engines/trecision/video.cpp
@@ -220,7 +220,7 @@ void AnimManager::drawFrameSubtitles(Graphics::Surface *surface, int frameNum) {
 	// fixed coordinates
 	_vm->_drawText._rect = Common::Rect(20, 380 - TOP, MAXX - 40 + 20, _vm->_drawText.calcHeight(_vm) + (380 - TOP));
 	_vm->_drawText._subtitleRect = Common::Rect(MAXX, MAXY);
-	_vm->_drawText.draw(_vm, surface);
+	_vm->_drawText.draw(_vm, false, surface);
 }
 
 void AnimManager::openSmkAnim(int slot, const Common::String &name) {