[Scummvm-git-logs] scummvm master -> 99342fc1e38199cddfd11e4e9da784eabea29312

[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:
99342fc1e3 BAGEL: MINIGAMES: Fix ArtParts Coverity warnings


Commit: 99342fc1e38199cddfd11e4e9da784eabea29312
    https://github.com/scummvm/scummvm/commit/99342fc1e38199cddfd11e4e9da784eabea29312
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-30T03:25:51-07:00

Commit Message:
BAGEL: MINIGAMES: Fix ArtParts Coverity warnings

Changed paths:
    engines/bagel/hodjnpodj/artparts/artparts.cpp
    engines/bagel/hodjnpodj/artparts/optndlg.h


diff --git a/engines/bagel/hodjnpodj/artparts/artparts.cpp b/engines/bagel/hodjnpodj/artparts/artparts.cpp
index 2dde605581c..53db221363d 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.cpp
+++ b/engines/bagel/hodjnpodj/artparts/artparts.cpp
@@ -903,7 +903,7 @@ void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 			}
 
 			else if (bSwitched) {                        // Switch back the two areas
-				SwitchAreas(DstRect, SrcRect);
+				SwitchAreas(SrcRect, DstRect);
 				bSwitched = false;                          // Don't allow second Undo
 			}
 
@@ -1313,6 +1313,8 @@ bool CMainWindow::LoadArtWork() {
 	}
 	inFile.getline(chNumEntries, sizeof(chNumEntries));     // read number of names in file
 	nNumEntries = atoi(chNumEntries);
+	assert(nNumEntries > 0);
+
 	pick = nLastPick;
 	while (pick == nLastPick) {
 		pick = (brand() % nNumEntries) + 1;
@@ -1741,17 +1743,12 @@ void CMainWindow::MyFocusRect(CDC *pDC, CRect rect, int nDrawMode) {
 	pDC->SetROP2(OldDrawMode);                   // Set pen mode back to old state
 	(*pDC).SelectPalette(pPalOld, false);           // Select back the old palette
 
-	if (pMyBrush != nullptr) {                         // If the brush was constructed, delete it
-		pMyBrush->DeleteObject();
-		delete pMyBrush;
-	}
+	pMyBrush->DeleteObject();
+	delete pMyBrush;
 
-	if (pMyPen != nullptr) {                           // If the pen was constructed, delete it
-		pMyPen->DeleteObject();
-		delete pMyPen;
-	}
-
-} // End MyFocusRect()
+	pMyPen->DeleteObject();
+	delete pMyPen;
+}
 
 /*****************************************************************
  *
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.h b/engines/bagel/hodjnpodj/artparts/optndlg.h
index 41366e904cb..243ac33b5cc 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.h
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.h
@@ -43,17 +43,17 @@ public:
 	void UpdateScrollbars();
 	void ClearDialogImage();
 
-	int m_nTime;
-	int m_nRows;
-	int m_nColumns;
-	int m_nMins;
-	int m_nSecs;
-	float   m_nScore;
-	bool    m_bFramed;
-	int m_nNumParts;
+	int m_nTime = 0;
+	int m_nRows = 0;
+	int m_nColumns = 0;
+	int m_nMins = 0;
+	int m_nSecs = 0;
+	float   m_nScore = 0.0;
+	bool    m_bFramed = false;
+	int m_nNumParts = 0;
 
-	int nCFacs;
-	int nRFacs;
+	int nCFacs = 0;
+	int nRFacs = 0;
 
 // Dialog Data
 	//{{AFX_DATA(COptnDlg)