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

[athrxx]

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

Summary:
cdfc7aba23 SCUMM: (FM-TOWNS) - cleanup


Commit: cdfc7aba2380963dd4983c425ce6b74dbb31836a
    https://github.com/scummvm/scummvm/commit/cdfc7aba2380963dd4983c425ce6b74dbb31836a
Author: athrxx (athrxx at scummvm.org)
Date: 2021-05-24T13:53:42+02:00

Commit Message:
SCUMM: (FM-TOWNS) - cleanup

Changed paths:
    engines/scumm/gfx_towns.cpp


diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp
index 39a464bee9..2d80b5cd04 100644
--- a/engines/scumm/gfx_towns.cpp
+++ b/engines/scumm/gfx_towns.cpp
@@ -641,7 +641,6 @@ template void TownsScreen::transferRect<uint16, uint16, 2, 2, false>(uint8 *dst,
 template void TownsScreen::transferRect<uint16, uint8, 1, 1, true>(uint8 *dst, TownsScreenLayer *l, int x, int y, int w, int h);
 #else
 template void TownsScreen::transferRect<uint8, uint8, 2, 2, false>(uint8 *dst, TownsScreenLayer *l, int x, int y, int w, int h);
-//template void TownsScreen::transferRect<uint8, uint8, 2, 2, true>(uint8 *dst, TownsScreenLayer *l, int x, int y, int w, int h);
 template void TownsScreen::transferRect<uint8, uint8, 1, 1, false>(uint8 *dst, TownsScreenLayer *l, int x, int y, int w, int h);
 template void TownsScreen::transferRect<uint8, uint8, 1, 1, true>(uint8 *dst, TownsScreenLayer *l, int x, int y, int w, int h);
 #endif
@@ -667,16 +666,9 @@ template<typename dstPixelType> void TownsScreen::updateScreenBuffer() {
 			} else {
 				error("TownsScreen::updateOutputBuffer(): Unsupported scale mode");
 			}
-		} else
-
-		if (l->bpp == 1) {
+		} else if (l->bpp == 1) {
 #else
 			if (l->numCol == 16) {
-				if (l->scaleH == 2 && l->scaleW == 2) {
-					//for (Common::List<Common::Rect>::iterator r = _dirtyRects.begin(); r != _dirtyRects.end(); ++r)
-					//	transferRect<dstPixelType, uint8, 2, 2, true>(dst, l, r->left >> 1, r->top >> 1, (r->right - r->left) >> 1, (r->bottom - r->top) >> 1);
-					error("TownsScreen::updateOutputBuffer(): Unsupported scale/color config");
-				} else
 #endif
 				if (l->scaleH == 1 && l->scaleW == 1) {
 					for (Common::List<Common::Rect>::iterator r = _dirtyRects.begin(); r != _dirtyRects.end(); ++r)