[Scummvm-git-logs] scummvm master -> 4e156da56f6a6e94d2edb5508dc3d18b91618766
dreammaster
noreply at scummvm.org
Sat Oct 4 08:21:58 UTC 2025
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
d709946d64 BAGEL: MINIGAMES: Fix Crypt warnings. PVS-Studio V519
b2737a5c69 BAGEL: MINIGAMES: Fix Fuge warnings. PVS-Studio V519, V1048
fb19eb5e1f BAGEL: MINIGAMES: Fix Garkfunkle warnings. PVS-Studio V773, V1053, V1037
149b1f7ff6 BAGEL: MINIGAMES: Fix hnplibs warnings. PVS-Studio V779, V547
686138e2ba BAGEL: MINIGAMES: Fix Life warnings. PVS-Studio V1037
fea378a492 BAGEL: MINIGAMES: Fix MOD warnings. PVS-Studio V1053
4e156da56f BAGEL: METAGAME: Fix warnings. PVS-Studio V547, V560, V557, V609, V519, V0137
Commit: d709946d64e3c7bc3cea3421eb2ca2eae5f6dbe8
https://github.com/scummvm/scummvm/commit/d709946d64e3c7bc3cea3421eb2ca2eae5f6dbe8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:45-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Crypt warnings. PVS-Studio V519
Changed paths:
engines/bagel/hodjnpodj/crypt/rec.cpp
diff --git a/engines/bagel/hodjnpodj/crypt/rec.cpp b/engines/bagel/hodjnpodj/crypt/rec.cpp
index 3ddd637ce8b..d3f3716c0fc 100644
--- a/engines/bagel/hodjnpodj/crypt/rec.cpp
+++ b/engines/bagel/hodjnpodj/crypt/rec.cpp
@@ -46,9 +46,6 @@ bool CCryptRecord::GetRecord(int nID) {
chBuf = (char)cryptFile->readByte();
if (chBuf == '\\') {
chBuf = (char)cryptFile->readByte();
-
- m_lpszGram[i] = toupper(chBuf);
- i++;
} else if (chBuf == '\"') {
m_lpszGram[i] = '\0';
break;
@@ -68,7 +65,6 @@ bool CCryptRecord::GetRecord(int nID) {
chBuf = (char)cryptFile->readByte();
if (chBuf == '\\') {
chBuf = (char)cryptFile->readByte();
- m_lpszSource[i] = toupper(chBuf);
} else if (chBuf == '\"') {
m_lpszSource[i] = '\0';
break;
Commit: b2737a5c6989f33f8b6c2cf97ad8d3a455ad08d1
https://github.com/scummvm/scummvm/commit/b2737a5c6989f33f8b6c2cf97ad8d3a455ad08d1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:46-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Fuge warnings. PVS-Studio V519, V1048
Changed paths:
engines/bagel/hodjnpodj/dfa/optdlg.cpp
engines/bagel/hodjnpodj/fuge/fuge.cpp
engines/bagel/hodjnpodj/fuge/usercfg.cpp
diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index d8fa380b7d6..54fdbb48582 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -289,7 +289,6 @@ void CDFAOptDlg::OnPaint() {
}
ptxtGTime->DisplayString(pDC, cGDisplay, 14, FW_BOLD, RGB(0, 0, 0));
- pGTime = new CScrollBar;
pGTime = (CScrollBar *)GetDlgItem(IDC_GAMETIME);
pGTime->SetScrollRange(GAMETIMEMIN, GAMETIMEMAX, true);
if (m_nGameTime == 0)
@@ -314,7 +313,6 @@ void CDFAOptDlg::OnPaint() {
}
ptxtBTime->DisplayString(pDC, cBDisplay, 14, FW_BOLD, RGB(0, 0, 0));
- pBTime = new CScrollBar;
pBTime = (CScrollBar *)GetDlgItem(IDC_BEAVERDUR);
pBTime->SetScrollRange(BEAVERTIMEMIN, BEAVERTIMEMAX, true);
pBTime->SetScrollPos(m_nBeaverTime, true);
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index e0b17e01408..9423a211a8a 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -584,9 +584,6 @@ ERROR_CODE CFugeWindow::LoadMasterSprites() {
CDC *pDC;
ERROR_CODE errCode;
- // assume no error
- errCode = ERR_NONE;
-
errCode = LoadNewPaddle(m_nInitPaddleSize);
if (errCode == ERR_NONE) {
@@ -824,9 +821,6 @@ void CFugeWindow::GameResume() {
void CFugeWindow::PlayGame() {
ERROR_CODE errCode;
- // assume no error
- errCode = ERR_NONE;
-
// load the .INI settings
//
LoadIniSettings();
@@ -2333,9 +2327,8 @@ void CFugeWindow::LoadIniSettings() {
if ((m_nInitPaddleSize < PSIZE_MIN) || (m_nInitPaddleSize > PSIZE_MAX))
m_nInitPaddleSize = PSIZE_DEF;
- m_bOutterWall = GetPrivateProfileInt(INI_SECTION, "OutterWall", 0, INI_FILENAME);
- if (m_bOutterWall != 0)
- m_bOutterWall = true;
+ int outerWall = GetPrivateProfileInt(INI_SECTION, "OutterWall", 0, INI_FILENAME);
+ m_bOutterWall = outerWall != 0;
m_nGForceFactor = GetPrivateProfileInt(INI_SECTION, "Gravity", GFORCE_DEF, INI_FILENAME);
if ((m_nGForceFactor < GFORCE_MIN) || (m_nGForceFactor > GFORCE_MAX))
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index 603f9eeb187..5568f2ce55e 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -499,9 +499,8 @@ void CUserCfgDlg::LoadIniSettings() {
if ((m_nPaddleSize < PSIZE_MIN) || (m_nPaddleSize > PSIZE_MAX))
m_nPaddleSize = PSIZE_DEF;
- m_bOutterWall = GetPrivateProfileInt(INI_SECTION, "OutterWall", 0, INI_FILENAME);
- if (m_bOutterWall != 0)
- m_bOutterWall = true;
+ int outerWall = GetPrivateProfileInt(INI_SECTION, "OutterWall", 0, INI_FILENAME);
+ m_bOutterWall = outerWall != 0;
}
void CUserCfgDlg::SaveIniSettings() {
Commit: fb19eb5e1f8c5d895f0f46ad0bb7320a217619c3
https://github.com/scummvm/scummvm/commit/fb19eb5e1f8c5d895f0f46ad0bb7320a217619c3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:46-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Garkfunkle warnings. PVS-Studio V773, V1053, V1037
Changed paths:
engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
engines/bagel/hodjnpodj/garfunkle/garfunkle.h
engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index ad8afce3046..a41b30b5328 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -1071,7 +1071,6 @@ void add_note_to_series(int nNewValue) {
}
(*pNewNote).SetValue(nNewValue);
(*pNewNote).LinkNote(); //Add the new note to the bottom of the list
- pNewNote = nullptr;
}//end add_note_to_series
void CMainWindow::PlayBackSeries(int nNumNotes) {
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.h b/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
index 3bef76fd2c1..c264059747d 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
@@ -201,7 +201,7 @@ public:
bool wait_awhile(int nHundSecs);
//added data members:
- virtual void SplashScreen();
+ void SplashScreen();
private:
void initStatics();
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
index da6587a1bb6..e0edf59416e 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
@@ -214,19 +214,15 @@ void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pS
switch (nSBCode) {
case SB_LINERIGHT:
- NewPos++;
- break;
case SB_PAGERIGHT:
- NewPos ++;
+ NewPos++;
break;
case SB_RIGHT:
NewPos = pMax;
break;
case SB_LINELEFT:
- NewPos--;
- break;
case SB_PAGELEFT:
- NewPos --;
+ NewPos--;
break;
case SB_LEFT:
NewPos = pMin;
Commit: 149b1f7ff6fc0d106826b7988873f60257f03000
https://github.com/scummvm/scummvm/commit/149b1f7ff6fc0d106826b7988873f60257f03000
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:46-07:00
Commit Message:
BAGEL: MINIGAMES: Fix hnplibs warnings. PVS-Studio V779, V547
Changed paths:
engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
engines/bagel/hodjnpodj/hnplibs/sprite.cpp
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
index 5fc738370f1..08c9d792fe9 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
@@ -101,7 +101,6 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
HBITMAP hBitmap, hBitmapOld;
HDC hdcMem; // memory device context
int nDevCaps;
- BITMAPINFO bInfo;
// Check for valid DIB handle
if (hDIB == nullptr)
@@ -155,11 +154,13 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
return bSuccess;
}
+ error("TODO: Populate binfo and enable below if this is ever needed");
+#if 0
+ BITMAPINFO bInfo;
+
// Make sure to use the stretching mode best for color pictures
SetStretchBltMode(hDC, COLORONCOLOR);
- error("TODO: Populate binfo");
-
bSuccess = StretchDIBits(hDC, // hDC
lpDCRect->left, // DestX
lpDCRect->top, // DestY
@@ -178,6 +179,7 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
SelectPalette(hDC, hOldPal, false);
return bSuccess;
+#endif
}
bool CreateDIBPalette(HDIB hDIB, CPalette *pPal) {
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
index 103791b78fc..aa011bea9f8 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
@@ -2292,8 +2292,7 @@ bool CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
}
}
- if (chPixels != nullptr)
- free(chPixels); // free up the work area's bitmap
+ free(chPixels); // free up the work area's bitmap
if (pBitmap1Old != nullptr) // map out the bitmaps we used
(*cDC1).SelectObject(pBitmap1Old);
Commit: 686138e2bab7cae2f16f1f0e72b7f926bb5a0f72
https://github.com/scummvm/scummvm/commit/686138e2bab7cae2f16f1f0e72b7f926bb5a0f72
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:46-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Life warnings. PVS-Studio V1037
Changed paths:
engines/bagel/hodjnpodj/life/game.cpp
diff --git a/engines/bagel/hodjnpodj/life/game.cpp b/engines/bagel/hodjnpodj/life/game.cpp
index db90a94d5fb..7e96722b6bb 100644
--- a/engines/bagel/hodjnpodj/life/game.cpp
+++ b/engines/bagel/hodjnpodj/life/game.cpp
@@ -183,21 +183,7 @@ CMainWindow::CMainWindow(HWND hParentWnd, LPGAMESTRUCT lpGameInfo) {
* Life settings. These are global variables. *
*********************************************/
if (m_lpGameStruct->bPlayingMetagame == true) { // playing meta game?
- switch (m_lpGameStruct->nSkillLevel) { // yes - what skill level?
- case SKILLLEVEL_LOW:
- nLife = VILLAGES_HI; // All levels start with 20
- break;
-
- case SKILLLEVEL_MEDIUM:
- nLife = VILLAGES_HI;
- break;
-
- case SKILLLEVEL_HIGH:
- nLife = VILLAGES_HI;
- break;
-
- } // end switch
-
+ nLife = VILLAGES_HI; // All levels start with 20
nTurnCounter = ROUNDS_META;
nSpeed = SPEED_DEF;
nCountDown = nSpeed * MONTHS;
Commit: fea378a492af6c29933533d685decd123872bc08
https://github.com/scummvm/scummvm/commit/fea378a492af6c29933533d685decd123872bc08
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:46-07:00
Commit Message:
BAGEL: MINIGAMES: Fix MOD warnings. PVS-Studio V1053
Changed paths:
engines/bagel/hodjnpodj/mazedoom/mod.h
diff --git a/engines/bagel/hodjnpodj/mazedoom/mod.h b/engines/bagel/hodjnpodj/mazedoom/mod.h
index 478cf32fe4f..0df3fce2be7 100644
--- a/engines/bagel/hodjnpodj/mazedoom/mod.h
+++ b/engines/bagel/hodjnpodj/mazedoom/mod.h
@@ -117,7 +117,7 @@ public:
//added data members:
- virtual void SplashScreen();
+ void SplashScreen();
private:
void OnSoundNotify(CSound *pSound);
Commit: 4e156da56f6a6e94d2edb5508dc3d18b91618766
https://github.com/scummvm/scummvm/commit/4e156da56f6a6e94d2edb5508dc3d18b91618766
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T01:21:46-07:00
Commit Message:
BAGEL: METAGAME: Fix warnings. PVS-Studio V547, V560, V557, V609, V519, V0137
Changed paths:
engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlcmp.cpp
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
index c18e76a1d73..5d01a6281e8 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
@@ -97,9 +97,6 @@ bool CBackpack::SetupKeyboardHook() {
pBackpackDialog = this; // retain pointer to our dialog box
lpfnKbdHook = &BackpackHookProc;
- if (lpfnKbdHook == nullptr) // setup pointer to our procedure
- return false;
-
hKbdHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)lpfnKbdHook, hExeInst, GetCurrentTask());
if (hKbdHook == nullptr) // plug in our keyboard hook
return false;
@@ -576,11 +573,7 @@ bool CBackpack::CreateWorkAreas(CDC *pDC) {
if (pBackpackBitmap == nullptr)
return false;
- if ((GetFreeSpace(0) >= (unsigned long)500000) &&
- (GlobalCompact((unsigned long)500000) >= (unsigned long)400000))
- pBackgroundBitmap = FetchScreenBitmap(pDC, pBackgroundPalette, 0, 0, BACKPACK_DX, BACKPACK_DY);
- else
- pBackgroundBitmap = nullptr;
+ pBackgroundBitmap = FetchScreenBitmap(pDC, pBackgroundPalette, 0, 0, BACKPACK_DX, BACKPACK_DY);
(*pDC).SelectPalette(pBackgroundPalette, false);
(*pDC).RealizePalette();
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
index 6c8e1c9d3db..a080705725b 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
@@ -316,7 +316,7 @@ CMainGTWindow::CMainGTWindow(HWND hCallingWnd, LPGRANDTRSTRUCT pgtGrandTourStru
int j;
nNewRank = i;
- for (j = 10; j > i; j--) {
+ for (j = 9; j > i; j--) {
Common::strcpy_s(astTopTenScores[j].acName, astTopTenScores[j - 1].acName);
astTopTenScores[j].nScore = astTopTenScores[j - 1].nScore;
astTopTenScores[j].nSkillLevel = astTopTenScores[j - 1].nSkillLevel;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp b/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
index f22130acfe4..f55280234d3 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
@@ -651,10 +651,10 @@ int DoEncounter(CWnd *pWnd, CPalette *pPalette, bool bHodj, CInventory *pInvento
nRandFactor = -(int)min((long)abs(nRandFactor), lCrowns);// can't remove more gold than the player has
- nChangeAmount = brand() % nRandFactor + 1; //...subtract from 1 to nRandFactor
+ nChangeAmount = brand() % (nRandFactor + 1); //...subtract from 1 to nRandFactor
lCrowns -= nChangeAmount;
} else {
- nChangeAmount = brand() % nRandFactor + 1; // Add from 1 to nRandFactor
+ nChangeAmount = brand() % (nRandFactor + 1); // Add from 1 to nRandFactor
lCrowns += nChangeAmount;
}
// our logic was wrong if we end up negative
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
index 68755610d7e..4e3ca42f38e 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
@@ -94,15 +94,6 @@ bool CGtlApp::InitInstance() {
// Initialize
//
- m_iWidth = GetSystemMetrics(SM_CXSCREEN);
- m_iHeight = GetSystemMetrics(SM_CYSCREEN);
-
- m_iX = 0;
- m_iY = 0;
-
- // If we ever change Hodj 'n' Podj to live in entire screen
- // then delete these next 4 lines of code
- //
m_iWidth = GAME_WIDTH;
m_iHeight = GAME_HEIGHT;
m_iX = (GetSystemMetrics(SM_CXSCREEN) - m_iWidth) / 2 ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlcmp.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlcmp.cpp
index 6c15c5d953b..0f2e40ce476 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlcmp.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlcmp.cpp
@@ -214,9 +214,6 @@ bool CGtlData::DetermineWeights(CXodj * xpXodj)
switch (xpStratLocInfo->m_iValueCode) {
case MG_VISIT_MISHMOSH:
- xpStratLocInfo->m_iWeight = MAXPOSINT;
- break ;
-
case MG_VISIT_CASTLE:
xpStratLocInfo->m_iWeight = MAXPOSINT;
break ;
More information about the Scummvm-git-logs
mailing list