[Scummvm-git-logs] scummvm master -> 93a01da34fb7f100508cf943f44145b8a02d3479

[sev-]

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

Summary:
af8183175b QDENGINE: Remove more global constructors
273b4da5c4 QDENGINE: Fix grDispatcher::putSprMask_a() and remove stub warning
93a01da34f QDENGINE: Fix grDispatcher::putSprMas(), not yet tested


Commit: af8183175b8ca7bea5a39a99e9a343bfe7d8fc8f
    https://github.com/scummvm/scummvm/commit/af8183175b8ca7bea5a39a99e9a343bfe7d8fc8f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-20T23:52:13+02:00

Commit Message:
QDENGINE: Remove more global constructors

Changed paths:
    engines/qdengine/qdcore/qd_minigame_interface.cpp
    engines/qdengine/qdcore/qd_named_object_indexer.cpp


diff --git a/engines/qdengine/qdcore/qd_minigame_interface.cpp b/engines/qdengine/qdcore/qd_minigame_interface.cpp
index e90d7fc6f64..84ffdc05a41 100644
--- a/engines/qdengine/qdcore/qd_minigame_interface.cpp
+++ b/engines/qdengine/qdcore/qd_minigame_interface.cpp
@@ -496,9 +496,13 @@ bool qdMinigameObjectInterfaceImplBase::is_visible() const {
 	return _object->is_visible();
 }
 
+qdEngineInterfaceImpl *g_qdi = nullptr;
+
 const qdEngineInterfaceImpl &qdEngineInterfaceImpl::instance() {
-	static qdEngineInterfaceImpl qdi;
-	return qdi;
+	if (!g_qdi)
+		g_qdi = new qdEngineInterfaceImpl;
+
+	return *g_qdi;
 }
 
 qdMinigameSceneInterface *qdEngineInterfaceImpl::current_scene_interface() const {
diff --git a/engines/qdengine/qdcore/qd_named_object_indexer.cpp b/engines/qdengine/qdcore/qd_named_object_indexer.cpp
index 658c9072578..efc2deec170 100644
--- a/engines/qdengine/qdcore/qd_named_object_indexer.cpp
+++ b/engines/qdengine/qdcore/qd_named_object_indexer.cpp
@@ -29,6 +29,8 @@
 
 namespace QDEngine {
 
+qdNamedObjectIndexer *g_idx = nullptr;
+
 qdNamedObjectIndexer::qdNamedObjectIndexer() {
 }
 
@@ -36,8 +38,10 @@ qdNamedObjectIndexer::~qdNamedObjectIndexer() {
 }
 
 qdNamedObjectIndexer &qdNamedObjectIndexer::instance() {
-	static qdNamedObjectIndexer idx;
-	return idx;
+	if (!g_idx)
+		g_idx = new qdNamedObjectIndexer;
+
+	return *g_idx;
 }
 
 bool qdNamedObjectIndexer::qdNamedObjectReferenceLink::resolve() {


Commit: 273b4da5c4811bb98556797dd1e0dc6dbef83a43
    https://github.com/scummvm/scummvm/commit/273b4da5c4811bb98556797dd1e0dc6dbef83a43
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-20T23:52:13+02:00

Commit Message:
QDENGINE: Fix grDispatcher::putSprMask_a() and remove stub warning

Changed paths:
    engines/qdengine/system/graphics/gr_draw_sprite.cpp


diff --git a/engines/qdengine/system/graphics/gr_draw_sprite.cpp b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
index 9a368e19228..7845fdbbd31 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
@@ -1137,7 +1137,6 @@ void grDispatcher::putSprMask_a(int x, int y, int sx, int sy, const byte *p, uin
 	} else
 		dy = 1;
 
-	x <<= 1;
 	sx <<= 2;
 	px <<= 2;
 
@@ -1146,7 +1145,6 @@ void grDispatcher::putSprMask_a(int x, int y, int sx, int sy, const byte *p, uin
 	byte mr, mg, mb;
 	split_rgb565u(mask_color, mr, mg, mb);
 
-	warning("STUB: grDispatcher::putSprMask_a");
 	for (int i = 0; i < psy; i++) {
 		uint16 *scr_buf = (uint16 *)(_screenBuf->getBasePtr(x, y));
 		const byte *data_line = data_ptr;


Commit: 93a01da34fb7f100508cf943f44145b8a02d3479
    https://github.com/scummvm/scummvm/commit/93a01da34fb7f100508cf943f44145b8a02d3479
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-20T23:52:13+02:00

Commit Message:
QDENGINE: Fix grDispatcher::putSprMas(), not yet tested

Changed paths:
    engines/qdengine/system/graphics/gr_draw_sprite.cpp


diff --git a/engines/qdengine/system/graphics/gr_draw_sprite.cpp b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
index 7845fdbbd31..09371eb8dfa 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
@@ -1021,8 +1021,6 @@ void grDispatcher::putSprMask(int x, int y, int sx, int sy, const byte *p, uint3
 	} else
 		dy = 1;
 
-	x <<= 1;
-
 	px *= 3;
 	sx *= 3;