[Scummvm-git-logs] scummvm master -> eaea2b0e480b0e6aef89074b330a3f41454a7746

[dreammaster]

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

Summary:
c7eaf9348e BAGEL: METAGAME: Fix error loading minigames
eaea2b0e48 BAGEL: MINIGAMES: Fix array overrun in Word Search


Commit: c7eaf9348e784fcca8b505b5bdcd860ddad9248a
    https://github.com/scummvm/scummvm/commit/c7eaf9348e784fcca8b505b5bdcd860ddad9248a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-02T04:21:44-07:00

Commit Message:
BAGEL: METAGAME: Fix error loading minigames

Changed paths:
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp


diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index 6716f39c657..ad43cb8457b 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -850,10 +850,9 @@ LRESULT CHodjPodjWindow::OnMCINotify(WPARAM wParam, LPARAM lParam) {
  *
  ****************************************************************/
 
-void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
-	bool    bSuccess = false;
-	int     nWhichDLL;
-	bool    bLoadedDLL;
+void CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
+	int nWhichDLL;
+	bool bLoadedDLL;
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
@@ -869,18 +868,18 @@ void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
 
 		if (bReturnToZoom) {
 			StartBackgroundMidi();
-			bSuccess = LoadZoomDLL();
+			LoadZoomDLL();
 		}
 
 		if (bReturnToMeta) {
 			StopBackgroundMidi();
 			lpMetaGame->m_bRestart = true;
-			bSuccess = LoadMetaDLL();
+			LoadMetaDLL();
 		}
 
 		if (bReturnToGrandTour) {
 			StartBackgroundMidi();
-			bSuccess = LoadGrandTourDLL();
+			LoadGrandTourDLL();
 		}
 
 		return;
@@ -890,7 +889,7 @@ void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
 
 	if (lParam == MG_GAME_CHALLENGE) {
 		StartBackgroundMidi();
-		bSuccess = LoadZoomDLL();
+		bool bSuccess = LoadZoomDLL();
 		bReturnToZoom = false;
 		if (bSuccess == false) {
 			lpMetaGame->m_bRestart = true;
@@ -953,17 +952,14 @@ void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
 			MessageBox("Verify proper game installation and try again.");
 
 			if (bReturnToZoom)
-				bSuccess = LoadZoomDLL();
+				LoadZoomDLL();
 
 			if (bReturnToMeta) {
 				lpMetaGame->m_bRestart = true;
-				bSuccess = LoadMetaDLL();
+				LoadMetaDLL();
 			}
 		}
 	}
-
-	if (!bSuccess)
-		error("LoadNewDLL call failed");
 }
 
 


Commit: eaea2b0e480b0e6aef89074b330a3f41454a7746
    https://github.com/scummvm/scummvm/commit/eaea2b0e480b0e6aef89074b330a3f41454a7746
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-02T04:21:44-07:00

Commit Message:
BAGEL: MINIGAMES: Fix array overrun in Word Search

Changed paths:
    engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp


diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
index 9e8ffb85f09..07530b8a997 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
@@ -554,7 +554,7 @@ void CMainWSWindow::CreateNewGrid() {
 			}
 			switch (nDirection) {
 			case 0: // going right
-				if (ptSPos.x + nWordLen > NUMBEROFCOLS)
+				if (ptSPos.x + nWordLen >= NUMBEROFCOLS)
 					continue;
 				bTemp2 = true;
 				for (z = 0; z < nWordLen; z++) {
@@ -571,9 +571,9 @@ void CMainWSWindow::CreateNewGrid() {
 				}
 				break;
 			case 1: // going down and right
-				if (ptSPos.x + nWordLen > NUMBEROFCOLS)
+				if (ptSPos.x + nWordLen >= NUMBEROFCOLS)
 					continue;
-				if (ptSPos.y + nWordLen > NUMBEROFROWS)
+				if (ptSPos.y + nWordLen >= NUMBEROFROWS)
 					continue;
 				bTemp2 = true;
 				for (z = 0; z < nWordLen; z++) {
@@ -590,7 +590,7 @@ void CMainWSWindow::CreateNewGrid() {
 				}
 				break;
 			case 2: // going down
-				if (ptSPos.y + nWordLen > NUMBEROFROWS)
+				if (ptSPos.y + nWordLen >= NUMBEROFROWS)
 					continue;
 				bTemp2 = true;
 				for (z = 0; z < nWordLen; z++) {
@@ -607,7 +607,7 @@ void CMainWSWindow::CreateNewGrid() {
 				}
 				break;
 			case 3: // going down and left
-				if (ptSPos.y + nWordLen > NUMBEROFROWS)
+				if (ptSPos.y + nWordLen >= NUMBEROFROWS)
 					continue;
 				if (ptSPos.x - nWordLen < 0)
 					continue;
@@ -679,7 +679,7 @@ void CMainWSWindow::CreateNewGrid() {
 				}
 				break;
 			case 7: // going up and right
-				if (ptSPos.x + nWordLen > NUMBEROFCOLS)
+				if (ptSPos.x + nWordLen >= NUMBEROFCOLS)
 					continue;
 				if (ptSPos.y - nWordLen < 0)
 					continue;