thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: (FM-TOWNS) - fix for builds w/o USE_RGBCOLOR

Browse source 
These changes are currently pointless, since the affected function variants won't be called. The Japanese game versions for which they would be used are not supported in non-USE_RGBCOLOR builds. But the code should be correct nonetheless...
This commit is contained in:
athrxx 2021-05-24 03:48:41 +02:00
parent 78de93126f
commit cfa0654ce8
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/gfx_towns.cpp
View file

@ -641,6 +641,7 @@ 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
@ -672,8 +673,9 @@ template<typename dstPixelType> void TownsScreen::updateScreenBuffer() {
#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, r->top, r->right - r->left, r->bottom - r->top);
//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) {
@ -686,7 +688,7 @@ template<typename dstPixelType> void TownsScreen::updateScreenBuffer() {
} else {
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, false>(dst, l, r->left, r->top, r->right - r->left, r->bottom - r->top);
transferRect<dstPixelType, uint8, 2, 2, false>(dst, l, r->left >> 1, r->top >> 1, (r->right - r->left) >> 1, (r->bottom - r->top) >> 1);
} else if (l->scaleH == 1 && l->scaleW == 1) {
for (Common::List<Common::Rect>::iterator r = _dirtyRects.begin(); r != _dirtyRects.end(); ++r)
transferRect<dstPixelType, uint8, 1, 1, false>(dst, l, r->left, r->top, r->right - r->left, r->bottom - r->top);