diff options
| author | Colin Snover | 2017-10-01 00:56:01 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-10-07 12:30:29 -0500 |
| commit | 432fd522d243f0779d2ebf99e8983dbb95cdd175 (patch) | |
| tree | 85532da09a21511230923eb8a4acc7ac15bda966 /engines/sci/graphics | |
| parent | ebe6c40a6abb2789349c2b6471eef24ac270ab94 (diff) | |
| download | scummvm-rg350-432fd522d243f0779d2ebf99e8983dbb95cdd175.tar.gz scummvm-rg350-432fd522d243f0779d2ebf99e8983dbb95cdd175.tar.bz2 scummvm-rg350-432fd522d243f0779d2ebf99e8983dbb95cdd175.zip | |
ENGINES: Remove default1x scaler flag
This flag is removed for a few reasons:
* Engines universally set this flag to true for widths > 320,
which made it redundant everywhere;
* This flag functioned primarily as a "force 1x scaler" flag,
since its behaviour was almost completely undocumented and users
would need to figure out that they'd need an explicit non-default
scaler set to get a scaler to operate at widths > 320;
* (Most importantly) engines should not be in the business of
deciding how the backend may choose to render its virtual screen.
The choice of rendering behaviour belongs to the user, and the
backend, in that order.
A nearby future commit restores the default1x scaler behaviour in
the SDL backend code for the moment, but in the future it is my
hope that there will be a better configuration UI to allow users
to specify how they want scaling to work for high resolutions.
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/frameout.h | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/screen.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index 7fc92a829d..434c5a0fec 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -80,7 +80,7 @@ GfxFrameout::GfxFrameout(SegManager *segMan, GfxPalette32 *palette, GfxTransitio } else { _currentBuffer.create(320, 200, Graphics::PixelFormat::createFormatCLUT8()); } - initGraphics(_currentBuffer.w, _currentBuffer.h, _isHiRes); + initGraphics(_currentBuffer.w, _currentBuffer.h); switch (g_sci->getGameId()) { case GID_HOYLE5: diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h index 55ba631cb7..eddf88f523 100644 --- a/engines/sci/graphics/frameout.h +++ b/engines/sci/graphics/frameout.h @@ -207,7 +207,7 @@ public: * Resets the pixel format of the hardware surface to the given format. */ void setPixelFormat(const Graphics::PixelFormat &format) const { - initGraphics(_currentBuffer.w, _currentBuffer.h, _isHiRes, &format); + initGraphics(_currentBuffer.w, _currentBuffer.h, &format); } /** diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index 1af36677b3..b9cef360dc 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -179,13 +179,13 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) { // We add 2 to the height of the icon bar to add a buffer between the screen and the // icon bar (as did the original interpreter). if (g_sci->getGameId() == GID_KQ6) - initGraphics(_displayWidth, _displayHeight + 26 + 2, _displayWidth > 320); + initGraphics(_displayWidth, _displayHeight + 26 + 2); else if (g_sci->getGameId() == GID_FREDDYPHARKAS) - initGraphics(_displayWidth, _displayHeight + 28 + 2, _displayWidth > 320); + initGraphics(_displayWidth, _displayHeight + 28 + 2); else error("Unknown SCI1.1 Mac game"); } else - initGraphics(_displayWidth, _displayHeight, _displayWidth > 320); + initGraphics(_displayWidth, _displayHeight); } GfxScreen::~GfxScreen() { |