[Scummvm-git-logs] scummvm branch-3-0 -> d91aaf15f7ad4027fd8a1b8b252d0630175202de

[dreammaster]

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:
d91aaf15f7 MM: MM1: Fix drawing enhanced main menu circles


Commit: d91aaf15f7ad4027fd8a1b8b252d0630175202de
    https://github.com/scummvm/scummvm/commit/d91aaf15f7ad4027fd8a1b8b252d0630175202de
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-12-21T09:51:27+11:00

Commit Message:
MM: MM1: Fix drawing enhanced main menu circles

Changed paths:
    NEWS.md
    engines/mm/mm1/views_enh/main_menu.cpp


diff --git a/NEWS.md b/NEWS.md
index ea3b567575f..3bfabd6d25d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -113,6 +113,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added Text-to-Speech support.
    - Fixed errors with M&M1 monster advancement in combat.
    - Fixed doors color in M&M1 enhanced mode
+   - Fix rendering of M&M1 enhanced main menu circles
 
  Mohawk:
    - Fixed popping noise in speech in some game releases (bug in the original).
diff --git a/engines/mm/mm1/views_enh/main_menu.cpp b/engines/mm/mm1/views_enh/main_menu.cpp
index cb2481f1c1e..c55d672e8d1 100644
--- a/engines/mm/mm1/views_enh/main_menu.cpp
+++ b/engines/mm/mm1/views_enh/main_menu.cpp
@@ -74,7 +74,7 @@ void MainMenu::copyCircle(const Graphics::Surface *src,
 			y--;
 			p += 2 * (x - y) + 1;
 		}
-		drawCircleLine(src, &dest, x + 1, y + 1);
+		drawCircleLine(src, &dest, x, y);
 	}
 }
 
@@ -86,22 +86,22 @@ void MainMenu::drawCircleLine(const Graphics::Surface *src,
 	src1 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS - x, CIRCLE_Y + CIRCLE_RADIUS + y);
 	src2 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS + x, CIRCLE_Y + CIRCLE_RADIUS + y);
 	dest1 = (byte *)dest->getBasePtr(CIRCLE_RADIUS - x, CIRCLE_RADIUS + y);
-	Common::copy(src1, src2, dest1);
+	Common::copy(src1, src2 + 1, dest1);
 
 	src1 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS - x, CIRCLE_Y + CIRCLE_RADIUS - y);
 	src2 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS + x, CIRCLE_Y + CIRCLE_RADIUS - y);
 	dest1 = (byte *)dest->getBasePtr(CIRCLE_RADIUS - x, CIRCLE_RADIUS - y);
-	Common::copy(src1, src2, dest1);
+	Common::copy(src1, src2 + 1, dest1);
 
 	src1 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS - y, CIRCLE_Y + CIRCLE_RADIUS - x);
 	src2 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS + y, CIRCLE_Y + CIRCLE_RADIUS - x);
 	dest1 = (byte *)dest->getBasePtr(CIRCLE_RADIUS - y, CIRCLE_RADIUS - x);
-	Common::copy(src1, src2, dest1);
+	Common::copy(src1, src2 + 1, dest1);
 
 	src1 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS - y, CIRCLE_Y + CIRCLE_RADIUS + x);
 	src2 = (const byte *)src->getBasePtr(CIRCLE_X + CIRCLE_RADIUS + y, CIRCLE_Y + CIRCLE_RADIUS + x);
 	dest1 = (byte *)dest->getBasePtr(CIRCLE_RADIUS - y, CIRCLE_RADIUS + x);
-	Common::copy(src1, src2, dest1);
+	Common::copy(src1, src2 + 1, dest1);
 }
 
 void MainMenu::draw() {