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

dreammaster noreply at scummvm.org
Tue Sep 30 10:43:29 UTC 2025


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:
adcc043a5e BAGEL: MINIGAMES: Fix Barbershop Coverity warnings


Commit: adcc043a5e45e22d07fe4cb3b5415b0cb7d32df0
    https://github.com/scummvm/scummvm/commit/adcc043a5e45e22d07fe4cb3b5415b0cb7d32df0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-30T03:43:24-07:00

Commit Message:
BAGEL: MINIGAMES: Fix Barbershop Coverity warnings

Changed paths:
    engines/bagel/hodjnpodj/barbershop/animate.cpp
    engines/bagel/hodjnpodj/barbershop/jay.cpp
    engines/bagel/hodjnpodj/barbershop/main.cpp
    engines/bagel/hodjnpodj/barbershop/paint.cpp
    engines/bagel/hodjnpodj/barbershop/paint.h
    engines/bagel/hodjnpodj/barbershop/usercfg.cpp
    engines/bagel/hodjnpodj/barbershop/usercfg.h


diff --git a/engines/bagel/hodjnpodj/barbershop/animate.cpp b/engines/bagel/hodjnpodj/barbershop/animate.cpp
index f30a940e478..b08bf24291c 100644
--- a/engines/bagel/hodjnpodj/barbershop/animate.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/animate.cpp
@@ -85,13 +85,12 @@ bool CAnimate::Clown(CDC *pDC, CPoint point) {
 	} // end if
 
 	m_pSprite->EraseSprite(pDC);
-	if (m_pSprite != nullptr) {
-		delete m_pSprite;
-		m_pSprite = nullptr;
-	} // end if
+
+	delete m_pSprite;
+	m_pSprite = nullptr;
 
 	return true;
-} // clown
+}
 
 bool CAnimate::UFO(CDC *pDC, CPoint point) {
 	bool    bSuccess;
@@ -201,13 +200,12 @@ bool CAnimate::UFO(CDC *pDC, CPoint point) {
 	} // end if
 
 	m_pSprite->EraseSprite(pDC);
-	if (m_pSprite != nullptr) {
-		delete m_pSprite;
-		m_pSprite = nullptr;
-	} // end if
+
+	delete m_pSprite;
+	m_pSprite = nullptr;
 
 	return true;
-} // UFO
+}
 
 bool CAnimate::Brat(CPoint point) {
 	if (m_cBratRect.PtInRect(point) == false)
diff --git a/engines/bagel/hodjnpodj/barbershop/jay.cpp b/engines/bagel/hodjnpodj/barbershop/jay.cpp
index e038db3eedb..9ec45813553 100644
--- a/engines/bagel/hodjnpodj/barbershop/jay.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/jay.cpp
@@ -54,17 +54,12 @@ void 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;
+}
 
 } // namespace Barbershop
 } // namespace HodjNPodj
diff --git a/engines/bagel/hodjnpodj/barbershop/main.cpp b/engines/bagel/hodjnpodj/barbershop/main.cpp
index d40d9ead71c..f27c196ac41 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/main.cpp
@@ -739,9 +739,6 @@ void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 			} // end if
 		} // end if
 	} // end if
-
-	//nFlags  = 0x00;             // bull shit code to get rid of warning messages
-	point   = CPoint(0, 0);
 }
 
 void CMainWindow::DeleteSprite(CSprite *pSprite) {
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.cpp b/engines/bagel/hodjnpodj/barbershop/paint.cpp
index 9228208d740..52cffbb3d2b 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/paint.cpp
@@ -96,10 +96,8 @@ CPaint::CPaint(CDC *pDC) {
 			(*m_cCardSet[(i * CARDS_PER_ROW) + j]).SetMasked(true);
 		}  // end for
 
-		if (pBmpCardSet != nullptr) {
-			delete pBmpCardSet;
-			pBmpCardSet = nullptr;
-		} // end if
+		delete pBmpCardSet;
+		pBmpCardSet = nullptr;
 	}  // end for
 
 	m_nCardBack = CARD_BACK1;
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.h b/engines/bagel/hodjnpodj/barbershop/paint.h
index 4dee515fbcb..60dc8aabe37 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.h
+++ b/engines/bagel/hodjnpodj/barbershop/paint.h
@@ -88,7 +88,7 @@ namespace Barbershop {
 
 class CPaint {
 private:    // vars
-	OSpr    *m_cCardSet[CARD_SET];
+	OSpr *m_cCardSet[CARD_SET] = {};
 
 public:     // func
 	CPaint(CDC*);
@@ -105,13 +105,13 @@ public:     // func
 	void    ChangeBack(CDC*, CBoard*, int);
 
 public:     // vars
-	OSpr    *m_pSprite;
+	OSpr    *m_pSprite = nullptr;
 	CRect   m_cFound;
 	CRect   m_cTab[TAB_COUNT];
 	CRect   m_cStock;
 	CRect   m_cUsed;
-	int     m_nUsedInd;
-	int     m_nCardBack;
+	int     m_nUsedInd = 0;
+	int     m_nCardBack = 0;
 };
 
 } // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
index 15eaaa318f5..1fe8de128be 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
@@ -220,17 +220,12 @@ void CUserCfgDlg::MyFocusRect(CDC *pDC, CRect rect, int nDrawMode, COLORREF rgbC
 	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;
-	}
-
-	if (pMyPen != nullptr) {                           // If the pen was constructed, delete it
-		pMyPen->DeleteObject();
-		delete pMyPen;
-	}
+	pMyBrush->DeleteObject();
+	delete pMyBrush;
 
-} // End MyFocusRect()
+	pMyPen->DeleteObject();
+	delete pMyPen;
+}
 
 } // namespace Barbershop
 } // namespace HodjNPodj
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.h b/engines/bagel/hodjnpodj/barbershop/usercfg.h
index e1d97d0692d..f310271028c 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.h
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.h
@@ -78,13 +78,12 @@ protected:
 	void MyFocusRect(CDC*, CRect, int nDrawMode, COLORREF);
 
 private:
-//	unsigned int            m_nTimeLimit;       //
-	bool            m_bSave;            // True if should save theses values
-	CRect           m_cRectCardBack1;
-	CRect           m_cRectCardBack2;
-	unsigned int            m_nCardBack;
-	CColorButton    *m_pOKButton;       // OKAY button on scroll
-	CText           *m_ctextBox;
+	bool m_bSave = false;					// True if should save theses values
+	CRect m_cRectCardBack1;
+	CRect m_cRectCardBack2;
+	unsigned int m_nCardBack = 0;
+	CColorButton *m_pOKButton = nullptr;	// OKAY button on scroll
+	CText *m_ctextBox = nullptr;
 };
 
 } // namespace Barbershop




More information about the Scummvm-git-logs mailing list