[Scummvm-git-logs] scummvm master -> dbe999613d8f5b4a2b5654c72d833f6a167921dd
dreammaster
noreply at scummvm.org
Sat Oct 4 09:33:30 UTC 2025
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
2da6c69502 BAGEL: METAGAME: Fix warnings. PVS-Studio V781
8d70a1d17f BAGEL: MINIGAMES: Remove unneeded pragmas from NoVacancy
55a4d1adcb BAGEL: MINIGAMES: Packrat warning fixes. PVS-Studio V1037, V519
dbe999613d BAGEL: MINIGAMES: Warning fixes. PVS-Studio V519
Commit: 2da6c69502860a6819a17f65f41eeca990c7e1d8
https://github.com/scummvm/scummvm/commit/2da6c69502860a6819a17f65f41eeca990c7e1d8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T02:33:21-07:00
Commit Message:
BAGEL: METAGAME: Fix warnings. PVS-Studio V781
Changed paths:
engines/bagel/hodjnpodj/metagame/gtl/store.cpp
engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
index b1c72949f9c..b8b6765f085 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
@@ -703,7 +703,6 @@ void CGeneralStore::OnMouseMove(unsigned int nFlags, CPoint point) {
((i + nFirstSlot) < (*pGeneralStore).ItemCount())) {
pItem = (*pGeneralStore).FetchItem(i + nFirstSlot);
if (pItem != nullptr) {
- hNewCursor = (*pMyApp).LoadStandardCursor(IDC_ARROW);
pDC = GetDC();
nPrice = (*pItem).GetValue();
if ((*pItem).GetQuantity() == 1) {
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
index 2d80562778a..137d742f4b0 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
@@ -82,6 +82,7 @@ bool SaveGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
if ((iGameNum = dlgSave.DoModal()) != -1) {
// Save users description of this saved game
+ assert(iGameNum < MAX_SAVEGAMES);
Common::strcpy_s(szDescriptions[iGameNum], szDescBuf);
// Change cursor to a disk to indicate saving
@@ -95,7 +96,6 @@ bool SaveGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
// Do the actual save
Common::String desc = szDescriptions[iGameNum];
- assert(iGameNum >= 0 && iGameNum < MAX_SAVEGAMES);
if (g_engine->saveGameState(iGameNum + 1, desc).getCode() != Common::kNoError)
*pErrCode = ERR_FOPEN;
Commit: 8d70a1d17f0d0ca2cdebd83e8795d504db88132c
https://github.com/scummvm/scummvm/commit/8d70a1d17f0d0ca2cdebd83e8795d504db88132c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T02:33:21-07:00
Commit Message:
BAGEL: MINIGAMES: Remove unneeded pragmas from NoVacancy
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 bd3a6803ca2..c103aeaf2a2 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -209,16 +209,11 @@ CMainWindow::CMainWindow() {
}
/* preload dice cell sprites */
-#pragma warning(disable: 4706)
-
m_bDiceBmpsLoaded = false;
memset(m_bDoorBmpLoaded, false, 10 * sizeof(bool));
for (i = 1; i < 10; pCDoorBmp[i] = new CSprite(), i++);
-#pragma warning(default: 4706)
-
-
// only continue if there was no error
if (errCode == ERR_NONE) {
@@ -550,10 +545,10 @@ void CMainWindow::PlayGame() {
}//end if (hDIB)
AnimateDice();
-#pragma warning(disable: 4135)
+
m_LDie = (byte)(((uint32)(unsigned int)brand() * 6L) / ((uint32)(unsigned int)RAND_MAX + 1L)) + 1;
m_RDie = (byte)(((uint32)(unsigned int)brand() * 6L) / ((uint32)(unsigned int)RAND_MAX + 1L)) + 1;
-#pragma warning(default: 4135)
+
PaintMaskedBitmap(pDC, m_pGamePalette, pCRDieBmp[m_RDie], \
m_rRDie.left, m_rRDie.top, (int) m_rRDie.Width(), (int) m_rRDie.Height());
@@ -798,11 +793,11 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
m_bOneDieCase = AllFxd;
/* randomise throws */
-#pragma warning(disable: 4135)
+
V = (uint32)((unsigned int)RAND_MAX + 1);
m_LDie = (byte)(((uint32)(unsigned int)brand() * 6L) / V) +1; // left Die
m_RDie = m_bOneDieCase ? 0 : (byte)(((uint32)(unsigned int)brand() * 6) / V) +1; // right Die
-#pragma warning(default: 4135)
+
pDC = GetDC();
@@ -1367,7 +1362,6 @@ bool CMainWindow::IsThrowDoable(byte DiceSum) {
****************************************************************************************************************
*/
-#pragma warning(disable: 4135)
byte s[9]; //Open doors.
byte Count, //# of open doors.
i,
@@ -1598,7 +1592,6 @@ bool CMainWindow::IsThrowDoable(byte DiceSum) {
}//end for -k
return false; //Undoable by default.
}
-#pragma warning(default: 4135)
void CMainWindow::OnClose() {
Commit: 55a4d1adcbe425492a8803cd4219b06011025eff
https://github.com/scummvm/scummvm/commit/55a4d1adcbe425492a8803cd4219b06011025eff
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T02:33:21-07:00
Commit Message:
BAGEL: MINIGAMES: Packrat warning fixes. PVS-Studio V1037, V519
Changed paths:
engines/bagel/hodjnpodj/packrat/packrat.cpp
diff --git a/engines/bagel/hodjnpodj/packrat/packrat.cpp b/engines/bagel/hodjnpodj/packrat/packrat.cpp
index 1a03da0d874..817d558ed0f 100644
--- a/engines/bagel/hodjnpodj/packrat/packrat.cpp
+++ b/engines/bagel/hodjnpodj/packrat/packrat.cpp
@@ -1327,9 +1327,6 @@ void CMainPackRatWindow::KillPlayer(bool bFirstTime) {
m_ptCurrPLocInGrid.y = 15;
break;
case 3:
- m_ptCurrPLocInGrid.x = 18;
- m_ptCurrPLocInGrid.y = 13;
- break;
case 4:
m_ptCurrPLocInGrid.x = 18;
m_ptCurrPLocInGrid.y = 13;
@@ -1542,7 +1539,6 @@ void CMainPackRatWindow::PickUpSuperObject() {
m_anMazeArray[m_ptCurrPLocInGrid.x + (m_ptCurrPLocInGrid.y * NUMBEROFCOLS)] = 0;
bEatTurtle = true;
nEatTurtle = 1;
- nEatTurtle = 1;
nOldTSpeed = m_nBadGuySpeed;
m_nBadGuySpeed *= 2;
if (m_lpGameStruct->bSoundEffectsEnabled) {
@@ -1772,7 +1768,6 @@ void CMainPackRatWindow::SetNewPlayerPos() {
if (m_anMazeArray[m_ptCurrPLocInGrid.x + 1 + (m_ptCurrPLocInGrid.y * NUMBEROFCOLS)] != WALL) {
if (nOldDir != m_nPDirection) {
- pTempSprite = new CSprite;
pTempSprite = pPlayerRightSprite->DuplicateSprite(pDC);
}
m_ptCurrentPPos.x = (m_ptCurrPLocInGrid.x * MOVEPLAYER) + MAZELEFT;
@@ -1796,7 +1791,6 @@ void CMainPackRatWindow::SetNewPlayerPos() {
if (m_anMazeArray[m_ptCurrPLocInGrid.x + ((m_ptCurrPLocInGrid.y - 1) * NUMBEROFCOLS)] != WALL) {
if (nOldDir != m_nPDirection) {
- pTempSprite = new CSprite;
pTempSprite = pPlayerUpSprite->DuplicateSprite(pDC);
}
m_ptCurrentPPos.x = (m_ptCurrPLocInGrid.x * MOVEPLAYER) + MAZELEFT;
@@ -1820,7 +1814,6 @@ void CMainPackRatWindow::SetNewPlayerPos() {
} else {
if (m_anMazeArray[m_ptCurrPLocInGrid.x + ((m_ptCurrPLocInGrid.y + 1) * NUMBEROFCOLS)] != WALL) {
if (nOldDir != m_nPDirection) {
- pTempSprite = new CSprite;
pTempSprite = pPlayerDownSprite->DuplicateSprite(pDC);
}
m_ptCurrentPPos.x = (m_ptCurrPLocInGrid.x * MOVEPLAYER) + MAZELEFT;
@@ -2236,8 +2229,6 @@ bool CMainPackRatWindow::SetNewBadGuyPos(int nWhichBadGuy, bool bForceRepaint) {
m_aptCurrentBPos[nWhichBadGuy].y = (m_aptCurrBLocInGrid[nWhichBadGuy].y * MOVEBADGUY) + MAZETOP;
if (nOldDir != m_anBDirection[nWhichBadGuy]) {
- pTempSprite = new CSprite;
-
if (bEatTurtle) {
if (bFlashTurtle)
pTempSprite = pFlashUpSprite->DuplicateSprite(pDC);
@@ -2247,7 +2238,6 @@ bool CMainPackRatWindow::SetNewBadGuyPos(int nWhichBadGuy, bool bForceRepaint) {
pTempSprite = pBadGuyUpSprite->DuplicateSprite(pDC);
} else {
if (bEatTurtle) {
- pTempSprite = new CSprite;
if (bFlashTurtle)
pTempSprite = pFlashUpSprite->DuplicateSprite(pDC);
else
Commit: dbe999613d8f5b4a2b5654c72d833f6a167921dd
https://github.com/scummvm/scummvm/commit/dbe999613d8f5b4a2b5654c72d833f6a167921dd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T02:33:21-07:00
Commit Message:
BAGEL: MINIGAMES: Warning fixes. PVS-Studio V519
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 07530b8a997..b26389a9967 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
@@ -942,8 +942,6 @@ void CMainWSWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
ptCurrPosInGrid.y = y;
ptOrigPosInGrid.x = x;
ptOrigPosInGrid.y = y;
- ptOrigPosInGrid.x = x;
- ptOrigPosInGrid.y = y;
ptLastPosInGrid.x = x;
ptLastPosInGrid.y = y;
pDC->FrameRect(&arScreenGrid[y][x], &cBrush);
More information about the Scummvm-git-logs
mailing list