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

[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:
d0b9d94fc0 BAGEL: MINIGAMES: Fix Beacon Coverity warnings
4a97751c91 BAGEL: MINIGAMES: Fix DFA Coverity Warnings


Commit: d0b9d94fc08d70dc82076ba0c29e4013829dcdfd
    https://github.com/scummvm/scummvm/commit/d0b9d94fc08d70dc82076ba0c29e4013829dcdfd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-01T03:17:42-07:00

Commit Message:
BAGEL: MINIGAMES: Fix Beacon Coverity warnings

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


diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index 74e55d7d587..99fc4cce59e 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -342,7 +342,7 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 	CPalette    *pPalOld = nullptr,                    // Pointer to old palette
 	             *pBigPalOld = nullptr;
 	CRect       rect;
-	CPoint      Start, End, Center;
+	CPoint      StartPt, EndPt, Center;
 	unsigned int    i;
 	int     radius;
 	float   degrees, x, y, radians, rads;
@@ -371,8 +371,8 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 	x = (float)cos(0.0);
 	y = (float)sin(0.0);
 
-	Start.x = Center.x + (int)(x * radius);     // + radius
-	Start.y = Center.y  + (int)(y * radius);    //- radius;
+	EndPt.x = Center.x + (int)(x * radius);     // + radius
+	EndPt.y = Center.y  + (int)(y * radius);    //- radius;
 
 	for (i = 0; i < NUM_BEAMS; i++) {
 		degrees = ((float)(i + 1)) * (float)(360 / NUM_BEAMS);
@@ -383,8 +383,8 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 		x = (float)cos(rads);
 		y = (float)sin(rads);
 
-		End.x = Center.x + (int)(x * radius);
-		End.y = Center.y + (int)(y * radius);
+		StartPt.x = Center.x + (int)(x * radius);
+		StartPt.y = Center.y + (int)(y * radius);
 
 		pMyPen = new CPen();                            // Construct new pen
 		(*pMyPen).CreatePen(PS_SOLID, 1, PALETTEINDEX((uint16)(i + START_ENTRY)));
@@ -393,7 +393,7 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((uint16)(i + START_ENTRY)));
 		pOldBrush = (*pBigDC).SelectObject(pMyBrush);
 
-		(*pBigDC).Pie(&rect, End, Start);
+		(*pBigDC).Pie(&rect, StartPt, EndPt);
 
 		(*pBigDC).SelectObject(pOldPen);
 
@@ -410,8 +410,8 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 		x = (float)cos(radians);
 		y = (float)sin(radians);
 
-		Start.x = Center.x + (int)(x * radius);
-		Start.y = Center.y + (int)(y * radius);
+		EndPt.x = Center.x + (int)(x * radius);
+		EndPt.y = Center.y + (int)(y * radius);
 	}
 
 	(*pDC).BitBlt(SIDE_BORDER, TOP_BORDER, ART_WIDTH, ART_HEIGHT, pBigDC, ART_WIDTH / 2, ART_HEIGHT / 2, SRCCOPY);


Commit: 4a97751c913587bff7b01be56a35468e48736ecc
    https://github.com/scummvm/scummvm/commit/4a97751c913587bff7b01be56a35468e48736ecc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-01T03:24:43-07:00

Commit Message:
BAGEL: MINIGAMES: Fix DFA Coverity Warnings

Changed paths:
    engines/bagel/hodjnpodj/dfa/dialogs.h
    engines/bagel/hodjnpodj/dfa/optdlg.cpp


diff --git a/engines/bagel/hodjnpodj/dfa/dialogs.h b/engines/bagel/hodjnpodj/dfa/dialogs.h
index 560d75bb080..83d9f5bd63c 100644
--- a/engines/bagel/hodjnpodj/dfa/dialogs.h
+++ b/engines/bagel/hodjnpodj/dfa/dialogs.h
@@ -34,8 +34,8 @@ namespace DFA {
 //////////////////////////////////////////////////////////////////////////////
 class CDFAOptDlg : public CBmpDialog {
 private:
-	int m_nGameTime;
-	int m_nBeaverTime;
+	int m_nGameTime = 0;
+	int m_nBeaverTime = 0;
 	CRect rDisplayGTime;
 	CRect rDisplayBTime;
 
diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index 89086e90983..d8fa380b7d6 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -319,16 +319,9 @@ void CDFAOptDlg::OnPaint() {
 	pBTime->SetScrollRange(BEAVERTIMEMIN, BEAVERTIMEMAX, true);
 	pBTime->SetScrollPos(m_nBeaverTime, true);
 
-	if (pGTime != nullptr) {
-		pGTime = nullptr;
-	}
-
-	if (pBTime != nullptr) {
-		pBTime = nullptr;
-	}
-
+	pGTime = nullptr;
+	pBTime = nullptr;
 	ReleaseDC(pDC);
-	return;
 }
 
 /*****************************************************************