[Scummvm-git-logs] scummvm master -> dd6e0fce8efb98021e513af68b2842cbe3f346ed
dreammaster
noreply at scummvm.org
Wed Oct 1 11:20:23 UTC 2025
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
38f23b9146 BAGEL: MINIGAMES: Fix Maze O' Doom Coverity Warnings
c24f44caeb BAGEL: MINIGAMES: Fix No Vacancy Coverity Warnings
dd6e0fce8e BAGEL: MINIGAMES: Fix Packrat Coverity warnings
Commit: 38f23b9146388d4820aad7a0ef5a1e751858e7df
https://github.com/scummvm/scummvm/commit/38f23b9146388d4820aad7a0ef5a1e751858e7df
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-01T03:53:49-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Maze O' Doom Coverity Warnings
Changed paths:
engines/bagel/hodjnpodj/mazedoom/mod.cpp
diff --git a/engines/bagel/hodjnpodj/mazedoom/mod.cpp b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
index 1f8762a0f56..3b07b628afb 100644
--- a/engines/bagel/hodjnpodj/mazedoom/mod.cpp
+++ b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
@@ -1645,7 +1645,7 @@ void create_maze() { /* create a maze layout given the intiialized maz
int choose_door() { /* pick a new path */
- int candidates[3];
+ int candidates[4];
int num_candidates;
num_candidates = 0;
Commit: c24f44caebc57f79fe4bba86f682ce8593ec34e7
https://github.com/scummvm/scummvm/commit/c24f44caebc57f79fe4bba86f682ce8593ec34e7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-01T04:07:22-07:00
Commit Message:
BAGEL: MINIGAMES: Fix No Vacancy Coverity Warnings
Changed paths:
engines/bagel/hodjnpodj/novacancy/main.cpp
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index a10aec8e5b8..bd3a6803ca2 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -523,7 +523,6 @@ void CMainWindow::PlayGame() {
ReleaseDC(pDC);
- pDC = nullptr;
} else { // pDC
errCode = ERR_MEMORY;
@@ -939,7 +938,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
if (!m_bDoorBmpLoaded[i]) {
if (!pCDoorBmp[i])
pCDoorBmp[i] = new CSprite; // the sprite might have been deleted in prev game if that door was locked @end of game.
- if (pCDoorBmp[i]) pCDoorBmp[i]->LoadCels(pDC, GetStringFromResource(IDS_D1 + i - 1), NUM_DOOR_CELS);
+ if (pCDoorBmp[i]) (void)pCDoorBmp[i]->LoadCels(pDC, GetStringFromResource(IDS_D1 + i - 1), NUM_DOOR_CELS);
m_bDoorBmpLoaded[i] = true;
}
Commit: dd6e0fce8efb98021e513af68b2842cbe3f346ed
https://github.com/scummvm/scummvm/commit/dd6e0fce8efb98021e513af68b2842cbe3f346ed
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-01T04:20:13-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Packrat Coverity warnings
Changed paths:
engines/bagel/hodjnpodj/packrat/dialogs.h
engines/bagel/hodjnpodj/packrat/optdlg.cpp
engines/bagel/hodjnpodj/packrat/packrat.cpp
diff --git a/engines/bagel/hodjnpodj/packrat/dialogs.h b/engines/bagel/hodjnpodj/packrat/dialogs.h
index 09c1be76c56..5ff3243136d 100644
--- a/engines/bagel/hodjnpodj/packrat/dialogs.h
+++ b/engines/bagel/hodjnpodj/packrat/dialogs.h
@@ -39,8 +39,8 @@ namespace Packrat {
//////////////////////////////////////////////////////////////////////////////
class CPackRatOptDlg : public CBmpDialog {
private:
- int m_nLives;
- int m_nLevel;
+ int m_nLives = 0;
+ int m_nLevel = 0;
CRect rectDisplayLevel;
CRect rectDisplayLives;
@@ -67,9 +67,9 @@ protected:
//////////////////////////////////////////////////////////////////////////////
class CMsgDlg : public CBmpDialog {
private:
- int m_nWhichMsg;
- long m_lCurrentScore;
- int m_nLevel;
+ int m_nWhichMsg = 0;
+ long m_lCurrentScore = 0;
+ int m_nLevel = 0;
public:
CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MESSAGEBOX);
diff --git a/engines/bagel/hodjnpodj/packrat/optdlg.cpp b/engines/bagel/hodjnpodj/packrat/optdlg.cpp
index 5178f3b2aa3..545bcf7452b 100644
--- a/engines/bagel/hodjnpodj/packrat/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/packrat/optdlg.cpp
@@ -279,9 +279,6 @@ void CPackRatOptDlg::OnPaint() {
ReleaseDC(pDC);
- pLevel = new CScrollBar;
- pLives = new CScrollBar;
-
pLevel = (CScrollBar *)GetDlgItem(IDC_GAMELEVEL);
pLives = (CScrollBar *)GetDlgItem(IDC_NUMBEROFLIVES);
@@ -289,14 +286,6 @@ void CPackRatOptDlg::OnPaint() {
pLives->SetScrollRange(LIVESMIN, LIVESMAX, true);
pLevel->SetScrollPos(m_nLevel, true);
pLives->SetScrollPos(m_nLives, true);
-
- if (pLevel != nullptr) {
- pLevel = nullptr;
- }
- if (pLevel != nullptr) {
- pLives = nullptr;
- }
- return;
}
/*****************************************************************
diff --git a/engines/bagel/hodjnpodj/packrat/packrat.cpp b/engines/bagel/hodjnpodj/packrat/packrat.cpp
index 9032dfd6cad..1a03da0d874 100644
--- a/engines/bagel/hodjnpodj/packrat/packrat.cpp
+++ b/engines/bagel/hodjnpodj/packrat/packrat.cpp
@@ -411,7 +411,6 @@ CMainPackRatWindow::CMainPackRatWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStru
Create(WndClass, "Boffo Games -- Packrat", WS_POPUP, MainRect, nullptr, 0);
pDC = GetDC();
- pTempBMP = new CBitmap();
pTempBMP = FetchBitmap(pDC, &pGamePalette, MAZE1);
bTestBmp = CSprite::SetBackdrop(pDC, pGamePalette, pTempBMP);
@@ -543,7 +542,7 @@ CMainPackRatWindow::CMainPackRatWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStru
pPlayerDownSprite->SetMobile(true);
pPlayerDownSprite->SetOptimizeSpeed(true);
}
- pPlayerSprite = new CSprite;
+
pPlayerSprite = pPlayerUpSprite->DuplicateSprite(pDC);
pPlayerSprite->LinkSprite();
@@ -877,8 +876,6 @@ void CMainPackRatWindow::SetMaze() {
pOldPal = pDC->SelectPalette(pGamePalette, false);
pDC->RealizePalette();
- pTempBmp = new CBitmap();
-
switch (m_nMaze) {
case 2:
pTempBmp = FetchBitmap(pDC, nullptr, MAZE2);
@@ -1753,7 +1750,6 @@ void CMainPackRatWindow::SetNewPlayerPos() {
if (m_anMazeArray[m_ptCurrPLocInGrid.x - 1 + (m_ptCurrPLocInGrid.y * NUMBEROFCOLS)] != WALL) {
if (nOldDir != m_nPDirection) {
- pTempSprite = new CSprite;
pTempSprite = pPlayerLeftSprite->DuplicateSprite(pDC);
}
m_ptCurrentPPos.x = (m_ptCurrPLocInGrid.x * MOVEPLAYER) + MAZELEFT;
@@ -1852,8 +1848,6 @@ void CMainPackRatWindow::SetNewPlayerPos() {
pPlayerSprite->PaintSprite(pDC, m_ptCurrentPPos);
- pTempSprite = nullptr;
-
// m_anMazeArray[m_ptCurrPLocInGrid.x + ( m_ptCurrPLocInGrid.y * NUMBEROFCOLS )]=0;
for (nWhichBadGuy = 0; nWhichBadGuy < 4; nWhichBadGuy++) {
@@ -1936,11 +1930,6 @@ void CMainPackRatWindow::SetNewPlayerPos() {
if (m_nNumberOfObjectsLeft == 0)
m_nNumberOfObjectsLeft--;
- if (pTempSprite != nullptr) {
- delete pTempSprite;
- pTempSprite = nullptr;
- }
-
if (pDC != nullptr) {
ReleaseDC(pDC);
}
@@ -3060,15 +3049,11 @@ void CMainPackRatWindow::OnTimer(uintptr nWhichTimer) {
****************************************************************/
void CMainPackRatWindow::MainLoop() {
int nLoop1;
- CSprite *pTempSprite = nullptr;
-//long lOldScore = 0;
int nLoop2;
CDC *pDC = nullptr;
POINT ptLive;
bool bRedrawLives = false;
- pTempSprite = new CSprite;
-
(*this).SetFocus();
while (bEndGame == false) {
if (m_bSuspend == false) {
@@ -3080,11 +3065,6 @@ void CMainPackRatWindow::MainLoop() {
else
bFlashTurtle = false;
} else {
- if (pTempSprite != nullptr) {
- pTempSprite = nullptr;
- delete pTempSprite;
- }
-
if (nEatTurtle > 0) {
nNumOfBGKilled = 0;
bChangeTurtle = true;
@@ -3194,7 +3174,6 @@ void CMainPackRatWindow::MainLoop() {
}
}
ReleaseDC(pDC);
- pDC = nullptr;
}
}
More information about the Scummvm-git-logs
mailing list