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

[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:
95bafa8d60 SCI: Don't scale the mouse cursor by 2x in games running at 480x300
c5df234521 SCI: Render text in games running at a 480x300 resolution


Commit: 95bafa8d603e5ff3fef542a0372415086b40d895
    https://github.com/scummvm/scummvm/commit/95bafa8d603e5ff3fef542a0372415086b40d895
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-10-28T22:12:40+02:00

Commit Message:
SCI: Don't scale the mouse cursor by 2x in games running at 480x300

It looks big and quite wrong in this case

Changed paths:
    engines/sci/graphics/cursor.cpp


diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 63a9185d5a..a0a5636c83 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -161,7 +161,7 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 
 	heightWidth = SCI_CURSOR_SCI0_HEIGHTWIDTH;
 
-	if (_upscaledHires) {
+	if (_upscaledHires != GFX_SCREEN_UPSCALED_DISABLED && _upscaledHires != GFX_SCREEN_UPSCALED_480x300) {
 		// Scale cursor by 2x - note: sierra didn't do this, but it looks much better
 		heightWidth *= 2;
 		hotspot.x *= 2;
@@ -240,7 +240,7 @@ void GfxCursor::kernelSetView(GuiResourceId viewNum, int loopNum, int celNum, Co
 	}
 
 	const SciSpan<const byte> &rawBitmap = cursorView->getBitmap(loopNum, celNum);
-	if (_upscaledHires && !_useOriginalKQ6WinCursors) {
+	if (_upscaledHires != GFX_SCREEN_UPSCALED_DISABLED && _upscaledHires != GFX_SCREEN_UPSCALED_480x300 && !_useOriginalKQ6WinCursors) {
 		// Scale cursor by 2x - note: sierra didn't do this, but it looks much better
 		width *= 2;
 		height *= 2;


Commit: c5df23452150bdfcb959bb34efe1e519c383843a
    https://github.com/scummvm/scummvm/commit/c5df23452150bdfcb959bb34efe1e519c383843a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-10-28T22:12:41+02:00

Commit Message:
SCI: Render text in games running at a 480x300 resolution

It looks awful for now, but at least there is text showing up on screen

Changed paths:
    engines/sci/graphics/screen.h


diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 7284de7e56..94909ac8df 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -240,17 +240,14 @@ public:
 		}
 
 		// Set pixel for visual, priority and control map directly, those are not upscaled
-		int offset = y * _width + x;
+		const int offset = y * _width + x;
 
 		if (drawMask & GFX_SCREEN_MASK_VISUAL) {
 			_visualScreen[offset] = color;
 
-			int displayOffset = 0;
-
 			switch (_upscaledHires) {
 			case GFX_SCREEN_UPSCALED_DISABLED:
-				displayOffset = offset;
-				_displayScreen[displayOffset] = color;
+				_displayScreen[offset] = color;
 				break;
 
 			case GFX_SCREEN_UPSCALED_640x400:
@@ -271,7 +268,7 @@ public:
 	}
 
 	void putPixel480x300(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
-		int offset = ((y * 3) / 2 * _width) + ((x * 3) / 2);
+		const int offset = ((y * 3) / 2 * _width) + ((x * 3) / 2);
 
 		// All maps are upscaled
 		// TODO: figure out, what Sierra exactly did on Mac for these games
@@ -390,6 +387,11 @@ public:
 			// Do not scale ourselves, but put it on the display directly
 			putPixelOnDisplay(x, actualY, color);
 		} else {
+			if (_upscaledHires == GFX_SCREEN_UPSCALED_480x300) {
+				putPixel480x300(x, actualY, GFX_SCREEN_MASK_VISUAL, color, 0, 0);
+				return;
+			}
+
 			int offset = actualY * _width + x;
 
 			_visualScreen[offset] = color;