[Scummvm-git-logs] scummvm master -> 8abdef4a414c515348e94b09e60959574c57d9da

neuromancer noreply at scummvm.org
Fri Nov 6 16:34:17 UTC 2026


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

Summary:
8abdef4a41 COLONY: disable xor mode when pausing


Commit: 8abdef4a414c515348e94b09e60959574c57d9da
    https://github.com/scummvm/scummvm/commit/8abdef4a414c515348e94b09e60959574c57d9da
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-06T17:31:00+01:00

Commit Message:
COLONY: disable xor mode when pausing

Changed paths:
    engines/colony/colony.cpp
    engines/colony/renderer.h
    engines/colony/renderer_opengl.cpp


diff --git a/engines/colony/colony.cpp b/engines/colony/colony.cpp
index b9ade441648..44ed86f3e8d 100644
--- a/engines/colony/colony.cpp
+++ b/engines/colony/colony.cpp
@@ -350,6 +350,9 @@ bool ColonyEngine::updateScreenSize() {
 }
 
 void ColonyEngine::pauseEngineIntern(bool pause) {
+	if (_gfx)
+		_gfx->pause(pause);
+
 	if (pause && _gfx && _level >= 1 && _level <= 7) {
 		if (_savedScreen) {
 			_savedScreen->free();
diff --git a/engines/colony/renderer.h b/engines/colony/renderer.h
index 86073313501..0aabee1c545 100644
--- a/engines/colony/renderer.h
+++ b/engines/colony/renderer.h
@@ -68,6 +68,7 @@ public:
 
 	// Buffer management
 	virtual void copyToScreen() = 0;
+	virtual void pause(bool pause) {}
 	virtual void setWireframe(bool enable, int64_t fillColor = -1) = 0;
 	virtual void setXorMode(bool enable) {}
 	virtual void setStippleData(const byte *data) {}
diff --git a/engines/colony/renderer_opengl.cpp b/engines/colony/renderer_opengl.cpp
index af782578d97..2ac965a448c 100644
--- a/engines/colony/renderer_opengl.cpp
+++ b/engines/colony/renderer_opengl.cpp
@@ -75,6 +75,15 @@ public:
 			glDisable(GL_COLOR_LOGIC_OP);
 		}
 	}
+	void pause(bool pause) override {
+		// ScummVM dialogs share the GL context, but must not use XOR drawing.
+		if (pause) {
+			_savedXorMode = glIsEnabled(GL_COLOR_LOGIC_OP);
+			setXorMode(false);
+		} else {
+			setXorMode(_savedXorMode);
+		}
+	}
 	void setStippleData(const byte *data) override {
 		_stippleData = data;
 	}
@@ -140,6 +149,7 @@ private:
 	byte _palette[256 * 3] = {};
 	bool _wireframe = true;
 	int64_t _wireframeFillColor = 0; // -1 = no fill (outline only)
+	bool _savedXorMode = false;
 	const byte *_stippleData = nullptr; // GL_POLYGON_STIPPLE pattern (128 bytes), null = disabled
 	uint32 _stippleFgColor = 0;
 	uint32 _stippleBgColor = 0;




More information about the Scummvm-git-logs mailing list