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

[sev-]

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

Summary:
74cd80a92c GLK: SCOTT: Fix copy/paste reeor. CID 1488039
7c0d64034a ICB: Fix copy/paste error. CID 1433438
9ae7a446e1 ICB: Fix copy/pate error. CID 1433582
4afd1bd043 MADS: Fix copy/paste error. CID 1356120


Commit: 74cd80a92c962283b099d2b5873bf25e7a86aa70
    https://github.com/scummvm/scummvm/commit/74cd80a92c962283b099d2b5873bf25e7a86aa70
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-08T01:38:33+02:00

Commit Message:
GLK: SCOTT: Fix copy/paste reeor. CID 1488039

Changed paths:
    engines/glk/scott/resource.cpp


diff --git a/engines/glk/scott/resource.cpp b/engines/glk/scott/resource.cpp
index dd57a852b71..2e435f272f6 100644
--- a/engines/glk/scott/resource.cpp
+++ b/engines/glk/scott/resource.cpp
@@ -105,7 +105,7 @@ uint8_t *readDictionary(GameInfo info, uint8_t **pointer, int loud) {
 	int nv = info._numberOfVerbs;
 	int nn = info._numberOfNouns;
 
-	for (int i = 0; i <= MAX(nn, nw) - nv; i++) {
+	for (int i = 0; i <= MAX(nv, nw) - nv; i++) {
 		_G(_verbs)[nv + i] = ".\0";
 	}
 


Commit: 7c0d64034ac29e4c21fcb2aa5210d3dfd9c50e6a
    https://github.com/scummvm/scummvm/commit/7c0d64034ac29e4c21fcb2aa5210d3dfd9c50e6a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-08T01:40:14+02:00

Commit Message:
ICB: Fix copy/paste error. CID 1433438

Changed paths:
    engines/icb/actor_fx_pc.cpp


diff --git a/engines/icb/actor_fx_pc.cpp b/engines/icb/actor_fx_pc.cpp
index 15e6dcd3d54..84eae5064fc 100644
--- a/engines/icb/actor_fx_pc.cpp
+++ b/engines/icb/actor_fx_pc.cpp
@@ -219,7 +219,7 @@ void DrawBreathingPC(Breath *breath) {
 				if (y < minY)
 					minY = y;
 
-				if (y + w > maxX)
+				if (x + w > maxX)
 					maxX = (int16)(x + w);
 
 				if (y + h > maxY)


Commit: 9ae7a446e1e26b595f6805aca0ef856fa9ff6d4e
    https://github.com/scummvm/scummvm/commit/9ae7a446e1e26b595f6805aca0ef856fa9ff6d4e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-08T01:42:15+02:00

Commit Message:
ICB: Fix copy/pate error. CID 1433582

Changed paths:
    engines/icb/drawpoly_pc.cpp


diff --git a/engines/icb/drawpoly_pc.cpp b/engines/icb/drawpoly_pc.cpp
index 51efe7f9335..620476f1e88 100644
--- a/engines/icb/drawpoly_pc.cpp
+++ b/engines/icb/drawpoly_pc.cpp
@@ -671,7 +671,7 @@ void drawFTS3PC(uint32 *polyStart, const uint32 n, SVECTORPC *pVertex) {
 				if (selFace == i)
 					setRGB0(poly, selPRed, selPGreen, selPBlue);
 				else
-					setRGB0(poly, rgbIn->r, rgbIn->b, rgbIn->b);
+					setRGB0(poly, rgbIn->r, rgbIn->g, rgbIn->b);
 
 				// Put it into the global ot at the correct place
 				myAddPrimClip(avgz, drawpacket);


Commit: 4afd1bd043ee5fd723272e6577b3a1460c00ec96
    https://github.com/scummvm/scummvm/commit/4afd1bd043ee5fd723272e6577b3a1460c00ec96
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-08T01:44:06+02:00

Commit Message:
MADS: Fix copy/paste error. CID 1356120

Changed paths:
    engines/mads/scene_data.cpp


diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index 127add4bb93..8d629c6d5b5 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -261,7 +261,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 		loadPalette(_sceneId, _artFileNum, resName, flags, bgSurface);
 	} else {
 		loadMadsV2Background(_sceneId, resName, flags, bgSurface);
-		loadPalette(_sceneId, _sceneId, resName, flags, bgSurface);
+		loadPalette(_sceneId, _artFileNum, resName, flags, bgSurface);
 	}
 
 	Common::Array<SpriteAsset *> spriteSets;