[Scummvm-git-logs] scummvm master -> 4ea15e9b8b27ebd295dcfe393934a7dd12126e11

sluicebox noreply at scummvm.org
Tue Jul 16 05:05:03 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:
4ea15e9b8b SCI: Fix error when SCI1_EGADriver clears rect


Commit: 4ea15e9b8b27ebd295dcfe393934a7dd12126e11
    https://github.com/scummvm/scummvm/commit/4ea15e9b8b27ebd295dcfe393934a7dd12126e11
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-07-15T22:03:31-07:00

Commit Message:
SCI: Fix error when SCI1_EGADriver clears rect

Changed paths:
    engines/sci/graphics/gfxdrivers.cpp
    engines/sci/graphics/gfxdrivers.h


diff --git a/engines/sci/graphics/gfxdrivers.cpp b/engines/sci/graphics/gfxdrivers.cpp
index 12c16d82872..5f7e79f60eb 100644
--- a/engines/sci/graphics/gfxdrivers.cpp
+++ b/engines/sci/graphics/gfxdrivers.cpp
@@ -867,7 +867,7 @@ void SCI1_VGAGreyScaleDriver::setPalette(const byte *colors, uint start, uint nu
 const char *SCI1_VGAGreyScaleDriver::_driverFile = "VGA320BW.DRV";
 
 SCI1_EGADriver::SCI1_EGADriver(bool rgbRendering) : GfxDriver(320, 200, 256), _requestRGBMode(rgbRendering), _egaColorPatterns(nullptr), _egaMatchTable(nullptr),
-	_currentBitmap(nullptr), _compositeBuffer(nullptr), _currentPalette(nullptr), _internalPalette(nullptr), _colAdjust(0), _ready(false) {
+	_currentBitmap(nullptr), _compositeBuffer(nullptr), _currentPalette(nullptr), _internalPalette(nullptr), _colAdjust(0) {
 	Common::File drv;
 	if (!drv.open(_driverFile))
 		error("SCI1_EGADriver: Failed to open '%s'", _driverFile);
diff --git a/engines/sci/graphics/gfxdrivers.h b/engines/sci/graphics/gfxdrivers.h
index f40a1af317a..0901c53e28a 100644
--- a/engines/sci/graphics/gfxdrivers.h
+++ b/engines/sci/graphics/gfxdrivers.h
@@ -178,7 +178,6 @@ public:
 	bool supportsPalIntensity() const override { return false; }
 	static bool validateMode() { return checkDriver(&_driverFile, 1); }
 private:
-	bool _ready;
 	byte *_compositeBuffer;
 	byte *_currentBitmap;
 	byte *_currentPalette;




More information about the Scummvm-git-logs mailing list