[Scummvm-git-logs] scummvm master -> 672cb6565ac817ea38bbbf9cf1cea9f38463c0d4

[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:
62ba5ac305 DARKSEED: Fix comparison for clarity. CID 1563442
5bed2298c9 DIRECTOR: Fix copy/paste error. CID 1549852
672cb6565a SCUMM: MOONBASE: Fix copy/paste error. CID 1545102


Commit: 62ba5ac305f4d58702b5307a7fdd74c501e1254a
    https://github.com/scummvm/scummvm/commit/62ba5ac305f4d58702b5307a7fdd74c501e1254a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-23T23:56:38+02:00

Commit Message:
DARKSEED: Fix comparison for clarity. CID 1563442

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index f4c9e81a4ba..e5756936ec1 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -2516,7 +2516,7 @@ void DarkseedEngine::zeromousebuttons() {
 }
 
 void DarkseedEngine::updateBaseSprites() {
-	if (!_room->isGiger() == _normalWorldSpritesLoaded) {
+	if (_room->isGiger() != _normalWorldSpritesLoaded) {
 		// no need to change graphics
 		return;
 	}


Commit: 5bed2298c9cabe76aec0cc1e9b6fd37c413a779f
    https://github.com/scummvm/scummvm/commit/5bed2298c9cabe76aec0cc1e9b6fd37c413a779f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-24T00:48:04+02:00

Commit Message:
DIRECTOR: Fix copy/paste error. CID 1549852

Changed paths:
    engines/director/lingo/lingo-code.cpp


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index a28d9f222cc..79347d1d9af 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -719,7 +719,7 @@ Datum LC::mapBinaryOp(Datum (*mapFunc)(Datum &, Datum &), Datum &d1, Datum &d2)
 		if (d2.isArray()) {
 			b = d2.u.farr->arr[i];
 		} else if (d2.type == PARRAY) {
-			a = d2.u.parr->arr[i].v;
+			b = d2.u.parr->arr[i].v;
 		}
 		if (res.type == PARRAY) {
 			res.u.parr->arr[i] = PCell(d1.u.parr->arr[i].p, mapFunc(a, b));


Commit: 672cb6565ac817ea38bbbf9cf1cea9f38463c0d4
    https://github.com/scummvm/scummvm/commit/672cb6565ac817ea38bbbf9cf1cea9f38463c0d4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-24T00:55:09+02:00

Commit Message:
SCUMM: MOONBASE: Fix copy/paste error. CID 1545102

Changed paths:
    engines/scumm/he/moonbase/map_mif.cpp


diff --git a/engines/scumm/he/moonbase/map_mif.cpp b/engines/scumm/he/moonbase/map_mif.cpp
index d6026aae86a..8b3b1cf3a55 100644
--- a/engines/scumm/he/moonbase/map_mif.cpp
+++ b/engines/scumm/he/moonbase/map_mif.cpp
@@ -126,7 +126,7 @@ void MIF::defineStartLocations(MapFile *map) {
 					i = 0;
 					while (i < 3) {
 						if (map->threePlayerPoints[i].x == 0xFFFF) {
-							map->threePlayerPoints[i].y = x * 60;
+							map->threePlayerPoints[i].x = x * 60;
 							map->threePlayerPoints[i].y = y * 60;
 							break;
 						}