[Scummvm-git-logs] scummvm master -> 5a6470e3f24c63601f8765d337bbaaf9780a6254
sluicebox
noreply at scummvm.org
Tue Oct 15 19:32:08 UTC 2024
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:
5a6470e3f2 SCI: Remove unused member
Commit: 5a6470e3f24c63601f8765d337bbaaf9780a6254
https://github.com/scummvm/scummvm/commit/5a6470e3f24c63601f8765d337bbaaf9780a6254
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-10-15T13:31:34-06:00
Commit Message:
SCI: Remove unused member
Changed paths:
engines/sci/graphics/gfxdrivers.cpp
engines/sci/graphics/gfxdrivers.h
engines/sci/graphics/screen.cpp
diff --git a/engines/sci/graphics/gfxdrivers.cpp b/engines/sci/graphics/gfxdrivers.cpp
index 039203f3d70..95aedc0d596 100644
--- a/engines/sci/graphics/gfxdrivers.cpp
+++ b/engines/sci/graphics/gfxdrivers.cpp
@@ -1661,7 +1661,7 @@ void KQ6WinGfxDriver::renderBitmap(const byte *src, int pitch, int dx, int dy, i
realHeight = (dst - dstart) / _screenW;
}
-KQ6WinGfx16ColorsDriver::KQ6WinGfx16ColorsDriver(bool altCursor, bool enhancedDithering, bool rgbRendering) : SCI1_EGADriver(rgbRendering), _enhancedDithering(enhancedDithering), _altCursor(altCursor), _renderLine2(nullptr) {
+KQ6WinGfx16ColorsDriver::KQ6WinGfx16ColorsDriver(bool enhancedDithering, bool rgbRendering) : SCI1_EGADriver(rgbRendering), _enhancedDithering(enhancedDithering), _renderLine2(nullptr) {
static const byte win16Colors[48] = {
0x00, 0x00, 0x00, 0xA8, 0x00, 0x57, 0x00, 0xA8, 0x57, 0xA8, 0xA8, 0x57,
0x00, 0x00, 0xA8, 0xA8, 0x57, 0xA8, 0x57, 0xA8, 0xA8, 0x87, 0x88, 0x8F,
diff --git a/engines/sci/graphics/gfxdrivers.h b/engines/sci/graphics/gfxdrivers.h
index b0e48495b43..5c84146410c 100644
--- a/engines/sci/graphics/gfxdrivers.h
+++ b/engines/sci/graphics/gfxdrivers.h
@@ -313,7 +313,7 @@ class KQ6WinGfx16ColorsDriver final : public SCI1_EGADriver {
public:
// The original does not take into account the extra lines required for the 200->440 vertical scaling. There is a noticeable dithering glitch every 11th line, as the
// two pixels of the checkerbox pattern appear in the wrong order. I have implemented a fix for this which can be activated with the fixDithering parameter.
- KQ6WinGfx16ColorsDriver(bool altCursor, bool fixDithering, bool rgbRendering);
+ KQ6WinGfx16ColorsDriver(bool fixDithering, bool rgbRendering);
~KQ6WinGfx16ColorsDriver() override;
void initScreen(const Graphics::PixelFormat *format) override;
void replaceCursor(const void *cursor, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor) override;
@@ -324,7 +324,6 @@ private:
void renderBitmap(byte *dst, const byte *src, int pitch, int y, int w, int h, const byte *patterns, const byte *palette, uint16 &realWidth, uint16 &realHeight) override;
LineProc _renderLine2;
const bool _enhancedDithering;
- const bool _altCursor;
static const byte _win16ColorsDitherPatterns[512];
};
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 7b5a4fd080c..085bd3c3869 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -166,7 +166,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan, Common::RenderMode renderMode) : _
_gfxDrv = new SCI1_VGAGreyScaleDriver(requestRGB);
break;
case Common::kRenderWin16c:
- _gfxDrv = new KQ6WinGfx16ColorsDriver(ConfMan.getBool("windows_cursors") == false, true, requestRGB);
+ _gfxDrv = new KQ6WinGfx16ColorsDriver(true, requestRGB);
break;
case Common::kRenderPC98_8c:
if (g_sci->getGameId() == GID_PQ2)
More information about the Scummvm-git-logs
mailing list