[Scummvm-git-logs] scummvm master -> 6fe69d253db50f0be927d7f4c5100160b037ce07
dreammaster
noreply at scummvm.org
Sat Oct 4 07:12:27 UTC 2025
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
5d27d485d2 BAGEL: Remove redundant code. PVS-Studio V571
428a022c7f BAGEL: MINIGAMES: Remove redundant code. PVS-Studio V519
af4d7d134f BAGEL: MINIGAMES: Fix ArtParts warnings. PVS-Studio V1053, V1020
9b6babf83d BAGEL: MINIGAMES: Fix Barbershop warnings. PVS-Studio V1037
6fe69d253d BAGEL: MINIGAMES: Added class field default values
Commit: 5d27d485d2b7f5a36aa24dad8fe28c0f8ed92359
https://github.com/scummvm/scummvm/commit/5d27d485d2b7f5a36aa24dad8fe28c0f8ed92359
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T00:12:17-07:00
Commit Message:
BAGEL: Remove redundant code. PVS-Studio V571
Changed paths:
engines/bagel/boflib/string.cpp
diff --git a/engines/bagel/boflib/string.cpp b/engines/bagel/boflib/string.cpp
index 342453766bc..2fb26a2d976 100644
--- a/engines/bagel/boflib/string.cpp
+++ b/engines/bagel/boflib/string.cpp
@@ -241,11 +241,6 @@ void CBofString::concatInPlace(int nSrcLen, const char *lpszSrcData) {
_nLength = (uint16)(_nLength + (uint16)nSrcLen);
} else {
- // Handle no buffer in place.
- if (NORMALIZEBUFFERSIZE() == 0) {
- allocBuffer(_nLength + nAllocAmount);
- }
-
assert(_pszData != nullptr);
// We have to grow the buffer, use the concat in place routine
Commit: 428a022c7fd6093554f0c93b15aa0bca5da00d4a
https://github.com/scummvm/scummvm/commit/428a022c7fd6093554f0c93b15aa0bca5da00d4a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T00:12:17-07:00
Commit Message:
BAGEL: MINIGAMES: Remove redundant code. PVS-Studio V519
Changed paths:
engines/bagel/hodjnpodj/archeroids/main.cpp
engines/bagel/hodjnpodj/hnplibs/sprite.h
diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index 3eb68cbb727..8e7d5c446c6 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -1339,8 +1339,6 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
errCode = ERR_NONE;
if (ARROWS && (m_nBadArrows < MAX_BAD_ARROWS)) {
-
- point = pBadGuy->GetPosition();
point = GetLeftMostBadGuy();
point.y = pBadGuy->GetPosition().y;
size = pBadGuy->GetSize();
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.h b/engines/bagel/hodjnpodj/hnplibs/sprite.h
index 5fec3c2162a..b0313c0c80e 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.h
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.h
@@ -111,7 +111,7 @@ public:
void SetPosition(CPoint point) {
SetPosition(point.x, point.y);
}
- CPoint GetPosition() {
+ CPoint GetPosition() const {
return (m_cPosition);
}
Commit: af4d7d134fc798cfde3c7df0ab8fd9ac07fa8df2
https://github.com/scummvm/scummvm/commit/af4d7d134fc798cfde3c7df0ab8fd9ac07fa8df2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T00:12:18-07:00
Commit Message:
BAGEL: MINIGAMES: Fix ArtParts warnings. PVS-Studio V1053, V1020
Changed paths:
engines/bagel/hodjnpodj/artparts/artparts.cpp
engines/bagel/hodjnpodj/artparts/artparts.h
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.cpp b/engines/bagel/hodjnpodj/artparts/artparts.cpp
index 53db221363d..de54a7ae7c4 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.cpp
+++ b/engines/bagel/hodjnpodj/artparts/artparts.cpp
@@ -113,6 +113,7 @@ CMainWindow::CMainWindow() {
if (LoadArtWork() == false) { // Load first artwork & display
PostMessage(WM_CLOSE, 0, 0);
+ EndWaitCursor();
return;
}
@@ -1572,6 +1573,7 @@ void CMainWindow::NewGame() {
m_bPlaying = true;
if (LoadArtWork() == false) { // Load artwork to Scratch1
+ EndWaitCursor();
PostMessage(WM_CLOSE, 0, 0);
return;
}
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.h b/engines/bagel/hodjnpodj/artparts/artparts.h
index 2f0b22b3ce4..1b06a869b80 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.h
+++ b/engines/bagel/hodjnpodj/artparts/artparts.h
@@ -126,9 +126,9 @@ public:
CRect SrcRect; // The area to be moved
CRect DstRect; // The destination of the moving area
- virtual void SplashScreen();
- virtual void SplashScratch();
- virtual void SplashScratchPaint();
+ void SplashScreen();
+ void SplashScratch();
+ void SplashScratchPaint();
private:
POINT Grid[MAX_COLUMNS][MAX_ROWS]; // Location of the art parts
Commit: 9b6babf83d6d28173323e908ac8e1d733d085c4c
https://github.com/scummvm/scummvm/commit/9b6babf83d6d28173323e908ac8e1d733d085c4c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T00:12:18-07:00
Commit Message:
BAGEL: MINIGAMES: Fix Barbershop warnings. PVS-Studio V1037
Changed paths:
engines/bagel/hodjnpodj/barbershop/paint.cpp
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.cpp b/engines/bagel/hodjnpodj/barbershop/paint.cpp
index 52cffbb3d2b..8ae24e09614 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/paint.cpp
@@ -388,13 +388,7 @@ void CPaint::Stack(CDC *pDC, CCard *pCard, int nSize) {
}
switch (pCard->m_pStack->GetID()) { // Update card visual coordinates
-
case fnd:
- pCard->m_cOrigin = pCard->m_pStack->m_cRect.TopLeft();
- pCard->m_cOrigin.x += ((int) i / STACK_INDENT) * STACK_DX;
- pCard->m_cOrigin.y += ((int) i / STACK_INDENT) * STACK_DY;
- break;
-
case stock:
pCard->m_cOrigin = pCard->m_pStack->m_cRect.TopLeft();
pCard->m_cOrigin.x += ((int) i / STACK_INDENT) * STACK_DX;
Commit: 6fe69d253db50f0be927d7f4c5100160b037ce07
https://github.com/scummvm/scummvm/commit/6fe69d253db50f0be927d7f4c5100160b037ce07
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-04T00:12:18-07:00
Commit Message:
BAGEL: MINIGAMES: Added class field default values
Changed paths:
engines/bagel/hodjnpodj/archeroids/main.h
engines/bagel/hodjnpodj/artparts/artparts.h
engines/bagel/hodjnpodj/barbershop/barb.h
engines/bagel/hodjnpodj/barbershop/board.h
engines/bagel/hodjnpodj/battlefish/bfish.h
engines/bagel/hodjnpodj/beacon/optndlg.h
engines/bagel/hodjnpodj/crypt/crypt.h
engines/bagel/hodjnpodj/crypt/main.h
engines/bagel/hodjnpodj/crypt/optn.h
engines/bagel/hodjnpodj/crypt/pnt_gram.h
engines/bagel/hodjnpodj/dfa/dfa.h
engines/bagel/hodjnpodj/fuge/fuge.h
engines/bagel/hodjnpodj/garfunkle/note.h
engines/bagel/hodjnpodj/life/grid.h
engines/bagel/hodjnpodj/life/life.h
engines/bagel/hodjnpodj/mankala/mnk.h
engines/bagel/hodjnpodj/novacancy/main.h
engines/bagel/hodjnpodj/pdq/main.h
engines/bagel/hodjnpodj/peggle/game.h
engines/bagel/hodjnpodj/poker/dialogs.h
engines/bagel/hodjnpodj/riddles/riddles.h
engines/bagel/hodjnpodj/wordsearch/wordsearch.h
diff --git a/engines/bagel/hodjnpodj/archeroids/main.h b/engines/bagel/hodjnpodj/archeroids/main.h
index 4bec2e234ed..763df26d38f 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.h
+++ b/engines/bagel/hodjnpodj/archeroids/main.h
@@ -101,69 +101,69 @@ protected:
//
// protected data members
//
- CRect m_rNewGameButton;
- CPalette *m_pGamePalette;
- CSprite *m_pMasterBadArrow;
- CSprite *m_pMasterGoodArrow;
- CSprite *m_pMasterBurn;
- CSprite *m_pMasterBadWalk;
- CSprite *m_pMasterBadShoot;
- CSprite *m_pMasterBadDie;
- CSprite *m_pMasterGoodWalk;
- CSprite *m_pMasterGoodShoot;
- CSprite *m_pMasterGoodDie;
- CSprite *m_pMasterHeart;
- CSprite *m_pHodj;
- CSprite *m_pScrollSprite;
- CSprite *m_pLives[LIVES_MAX];
- CLList *m_pBadGuyList;
- CLList *m_pBadArrowList;
- CLList *m_pGoodArrowList;
- CLList *m_pHayList;
- CLList *m_pFXList;
- CSound *m_pSoundTrack;
-
- char * m_pBadDieSound;
- char * m_pBoltSound;
- char * m_pArrowSound;
- char * m_pBurnSound;
- char * m_pExtraLifeSound;
- HANDLE m_hBadDieRes;
- HANDLE m_hBoltRes;
- HANDLE m_hArrowRes;
- HANDLE m_hBurnRes;
- HANDLE m_hExtraLifeRes;
+ CRect m_rNewGameButton = nullptr;
+ CPalette *m_pGamePalette = nullptr;
+ CSprite *m_pMasterBadArrow = nullptr;
+ CSprite *m_pMasterGoodArrow = nullptr;
+ CSprite *m_pMasterBurn = nullptr;
+ CSprite *m_pMasterBadWalk = nullptr;
+ CSprite *m_pMasterBadShoot = nullptr;
+ CSprite *m_pMasterBadDie = nullptr;
+ CSprite *m_pMasterGoodWalk = nullptr;
+ CSprite *m_pMasterGoodShoot = nullptr;
+ CSprite *m_pMasterGoodDie = nullptr;
+ CSprite *m_pMasterHeart = nullptr;
+ CSprite *m_pHodj = nullptr;
+ CSprite *m_pScrollSprite = nullptr;
+ CSprite *m_pLives[LIVES_MAX] = {};
+ CLList *m_pBadGuyList = nullptr;
+ CLList *m_pBadArrowList = nullptr;
+ CLList *m_pGoodArrowList = nullptr;
+ CLList *m_pHayList = nullptr;
+ CLList *m_pFXList = nullptr;
+ CSound *m_pSoundTrack = nullptr;
+
+ char * m_pBadDieSound = nullptr;
+ char * m_pBoltSound = nullptr;
+ char * m_pArrowSound = nullptr;
+ char * m_pBurnSound = nullptr;
+ char * m_pExtraLifeSound = nullptr;
+ HANDLE m_hBadDieRes = nullptr;
+ HANDLE m_hBoltRes = nullptr;
+ HANDLE m_hArrowRes = nullptr;
+ HANDLE m_hBurnRes = nullptr;
+ HANDLE m_hExtraLifeRes = nullptr;
POINT m_ptAnchor;
- unsigned long m_lScore;
- unsigned long m_lNewLifeScore;
- int m_nGoodArrows, m_nBadArrows;
- int m_nGameSpeed;
- unsigned int m_nBadGuySpeed;
- unsigned int m_nArrowSpeed;
- unsigned int m_nState;
- int m_nMoveArrows;
- int m_nBadGuys;
- int m_nLives;
- int m_nLevel;
- int m_nWave;
- unsigned int m_nJoyLast;
- bool m_bPause;
- bool m_bGameActive;
- bool m_bJoyActive;
- bool m_bMoveMode;
- bool m_bInMenu;
- bool m_bNewGame;
- bool m_bAnimationsOn;
- bool m_bTimerActive;
+ unsigned long m_lScore = 0;
+ unsigned long m_lNewLifeScore = 0;
+ int m_nGoodArrows, m_nBadArrows = 0;
+ int m_nGameSpeed = 0;
+ unsigned int m_nBadGuySpeed = 0;
+ unsigned int m_nArrowSpeed = 0;
+ unsigned int m_nState = 0;
+ int m_nMoveArrows = 0;
+ int m_nBadGuys = 0;
+ int m_nLives = 0;
+ int m_nLevel = 0;
+ int m_nWave = 0;
+ unsigned int m_nJoyLast = 0;
+ bool m_bPause = false;
+ bool m_bGameActive = false;
+ bool m_bJoyActive = false;
+ bool m_bMoveMode = false;
+ bool m_bInMenu = false;
+ bool m_bNewGame = false;
+ bool m_bAnimationsOn = false;
+ bool m_bTimerActive = false;
// User Setup variables
//
- int m_nInitGameSpeed;
- int m_nInitArcherLevel;
- int m_nInitNumLives;
- int m_nInitNumBadGuys;
+ int m_nInitGameSpeed = 0;
+ int m_nInitArcherLevel = 0;
+ int m_nInitNumLives = 0;
+ int m_nInitNumBadGuys = 0;
};
////
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.h b/engines/bagel/hodjnpodj/artparts/artparts.h
index 1b06a869b80..71f622a6e0c 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.h
+++ b/engines/bagel/hodjnpodj/artparts/artparts.h
@@ -113,18 +113,18 @@ public:
void ShowOutOfPlace();
//added data members:
- bool m_bPlaying; // Flag True if playing, False if setting options
- bool m_bNewGame; // Flag to check if a new game is being played
- bool m_bFirst; // Flag to check if the first area is being selected
+ bool m_bPlaying = false; // Flag True if playing, False if setting options
+ bool m_bNewGame = false; // Flag to check if a new game is being played
+ bool m_bFirst = false; // Flag to check if the first area is being selected
CPoint First;
CPoint Second;
CPoint Center;
CPoint UpLeft;
- CRect BaseRect; // The part that is the base of the select area
- CRect OldRect; // The last area highlighted
- CRect HiLiteRect; // The new area to highlight
- CRect SrcRect; // The area to be moved
- CRect DstRect; // The destination of the moving area
+ CRect BaseRect; // The part that is the base of the select area
+ CRect OldRect; // The last area highlighted
+ CRect HiLiteRect; // The new area to highlight
+ CRect SrcRect; // The area to be moved
+ CRect DstRect; // The destination of the moving area
void SplashScreen();
void SplashScratch();
@@ -152,7 +152,7 @@ private:
bool bSuccess;
bool m_bIgnoreScrollClick;
bool m_bShowOutOfPlace = false;
- char szCurrentArt[64];
+ char szCurrentArt[64] = {};
static CPalette *pGamePalette; // Palette of current artwork
static int nSeconds;
diff --git a/engines/bagel/hodjnpodj/barbershop/barb.h b/engines/bagel/hodjnpodj/barbershop/barb.h
index 68a3e3279bd..09ff97da7b6 100644
--- a/engines/bagel/hodjnpodj/barbershop/barb.h
+++ b/engines/bagel/hodjnpodj/barbershop/barb.h
@@ -52,11 +52,11 @@ namespace Barbershop {
class CBarber {
private:
- CDeck *m_cDck; // Handles card shuffling
- CBoard *m_cBrd; // contains position info for all card stacks on screen
- CLogic *m_pLogic; // determines whether a given move is valid or not
- CUndo *m_pUndo; // records moves made by user and handles move undoing
- CSound *m_pSound;
+ CDeck *m_cDck = nullptr; // Handles card shuffling
+ CBoard *m_cBrd = nullptr; // contains position info for all card stacks on screen
+ CLogic *m_pLogic = nullptr; // determines whether a given move is valid or not
+ CUndo *m_pUndo = nullptr; // records moves made by user and handles move undoing
+ CSound *m_pSound = nullptr;
public:
CBarber(CDC*, CSound*);
@@ -74,10 +74,10 @@ public:
void ChangeBack(CDC*, int);
int Score();
- CPaint *m_cPnt; // used to visually paint cards on screen
- CCard *m_pCrd; // the card being moved
- bool m_bIsGameOver; // tells if game has ended
- bool m_bIsWin; // tells if game was won or lost
+ CPaint *m_cPnt = nullptr; // used to visually paint cards on screen
+ CCard *m_pCrd = nullptr; // the card being moved
+ bool m_bIsGameOver = false; // tells if game has ended
+ bool m_bIsWin = false; // tells if game was won or lost
};
// Globals!
diff --git a/engines/bagel/hodjnpodj/barbershop/board.h b/engines/bagel/hodjnpodj/barbershop/board.h
index c1f2bedfedb..3abf7ec1ef0 100644
--- a/engines/bagel/hodjnpodj/barbershop/board.h
+++ b/engines/bagel/hodjnpodj/barbershop/board.h
@@ -38,10 +38,10 @@ public: // functions
bool IsTabStack(int);
public: // vars
- CStack *m_pFound;
- CStack *m_pTab[TAB_COUNT];
- CStack *m_pStock;
- CStack *m_pUsed;
+ CStack *m_pFound = nullptr;
+ CStack *m_pTab[TAB_COUNT] = {};
+ CStack *m_pStock = nullptr;
+ CStack *m_pUsed = nullptr;
};
} // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index f9f1f99ece1..a5e54c56b34 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -111,37 +111,37 @@ protected:
// Data Members
//
- byte m_nUserGrid[GRID_ROWS][GRID_COLS];
- byte m_nEnemyGrid[GRID_ROWS][GRID_COLS];
- FISH m_aEnemyFishInfo[MAX_FISH];
- FISH m_aUserFishInfo[MAX_FISH];
+ byte m_nUserGrid[GRID_ROWS][GRID_COLS] = {};
+ byte m_nEnemyGrid[GRID_ROWS][GRID_COLS] = {};
+ FISH m_aEnemyFishInfo[MAX_FISH] = {};
+ FISH m_aUserFishInfo[MAX_FISH] = {};
CRect m_rNewGameButton;
CRect m_rEndPlacement;
CPoint m_cLastPoint;
- CSprite *m_pHarpoons[MAX_TURNS];
- CSprite *m_pFish[MAX_FISH];
- CSprite *m_pEnemyFish[MAX_FISH];
- CSprite *m_pMasterHit;
- CSprite *m_pMasterMiss;
- CSprite *m_pMasterHarpoon;
- CSprite *m_pDragFish;
- CSprite *m_pScrollSprite;
- CSprite *m_pOctopus;
- CPalette *m_pGamePalette;
- CSound *m_pSoundTrack;
- CText *m_pTxtClickHere;
- int m_nEnemyFish;
- int m_nUserFish;
- int m_nTurns;
- int m_nDifficultyLevel;
- bool m_bGameActive;
- bool m_bPause;
- bool m_bUserEditMode;
- bool m_bMovingFish;
- bool m_bLastRotated;
- bool m_bStillCheck;
- bool m_bUsersTurn;
- bool m_bInMenu;
+ CSprite *m_pHarpoons[MAX_TURNS] = {};
+ CSprite *m_pFish[MAX_FISH] = {};
+ CSprite *m_pEnemyFish[MAX_FISH] = {};
+ CSprite *m_pMasterHit = nullptr;
+ CSprite *m_pMasterMiss = nullptr;
+ CSprite *m_pMasterHarpoon = nullptr;
+ CSprite *m_pDragFish = nullptr;
+ CSprite *m_pScrollSprite = nullptr;
+ CSprite *m_pOctopus = nullptr;
+ CPalette *m_pGamePalette = nullptr;
+ CSound *m_pSoundTrack = nullptr;
+ CText *m_pTxtClickHere = nullptr;
+ int m_nEnemyFish = 0;
+ int m_nUserFish = 0;
+ int m_nTurns = 0;
+ int m_nDifficultyLevel = 0;
+ bool m_bGameActive = false;
+ bool m_bPause = false;
+ bool m_bUserEditMode = false;
+ bool m_bMovingFish = false;
+ bool m_bLastRotated = false;
+ bool m_bStillCheck = false;
+ bool m_bUsersTurn = false;
+ bool m_bInMenu = false;
};
} // namespace Battlefish
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.h b/engines/bagel/hodjnpodj/beacon/optndlg.h
index a285b992960..43b6925ccf8 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.h
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.h
@@ -50,11 +50,11 @@ public:
enum { IDD = IDD_SUBOPTIONS };
CScrollBar m_ScrollSweeps;
CScrollBar m_ScrollSpeed;
- bool m_bAutomatic;
- bool m_bChangeAtTwelve;
- unsigned int m_nSweeps;
- unsigned int m_nSpeed;
- unsigned int nSweepSets;
+ bool m_bAutomatic = false;
+ bool m_bChangeAtTwelve = false;
+ unsigned int m_nSweeps = 0;
+ unsigned int m_nSpeed = 0;
+ unsigned int nSweepSets = 0;
CString mSpeedTable [NUM_SPEEDS];
//}}AFX_DATA
diff --git a/engines/bagel/hodjnpodj/crypt/crypt.h b/engines/bagel/hodjnpodj/crypt/crypt.h
index aca9ca0e797..e131ae8244b 100644
--- a/engines/bagel/hodjnpodj/crypt/crypt.h
+++ b/engines/bagel/hodjnpodj/crypt/crypt.h
@@ -40,7 +40,7 @@ namespace Crypt {
class CCryptogram {
private:
CCryptRecord *m_cRecordGram = nullptr;
- int m_nCryptMap[MAP][ALPHABET];
+ int m_nCryptMap[MAP][ALPHABET] = {};
public:
CCryptogram(CDC *pDC);
diff --git a/engines/bagel/hodjnpodj/crypt/main.h b/engines/bagel/hodjnpodj/crypt/main.h
index 216b3328c3c..98397a4cc8c 100644
--- a/engines/bagel/hodjnpodj/crypt/main.h
+++ b/engines/bagel/hodjnpodj/crypt/main.h
@@ -156,17 +156,14 @@ public:
void GameLose();
private:
- HWND m_hCallAppWnd;
- LPGAMESTRUCT m_lpGameStruct;
- CRect MainRect; // screen area spanned by the game window
- CRect m_cNewGame; // area spanned by new game rect
-// CCryptogram *m_cCryptograms; // cryptogram game object
- CBmpButton *m_pScrollButton; // scroll button
- bool m_bIgnoreScrollClick; // scroll button
- bool m_bIsFirstTimeHack;
- CSprite *m_pHourGlass;
-// int m_nTimer;
-// bool m_bPause;
+ HWND m_hCallAppWnd = nullptr;
+ LPGAMESTRUCT m_lpGameStruct = nullptr;
+ CRect MainRect; // screen area spanned by the game window
+ CRect m_cNewGame; // area spanned by new game rect
+ CBmpButton *m_pScrollButton = nullptr; // scroll button
+ bool m_bIgnoreScrollClick = false; // scroll button
+ bool m_bIsFirstTimeHack = false;
+ CSprite *m_pHourGlass = nullptr;
private:
void OnSoundNotify(CSound *pSound);
diff --git a/engines/bagel/hodjnpodj/crypt/optn.h b/engines/bagel/hodjnpodj/crypt/optn.h
index fb2e8d94da9..bdd76478c96 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.h
+++ b/engines/bagel/hodjnpodj/crypt/optn.h
@@ -64,7 +64,7 @@ public:
~COptn();
void ClearDialogImage();
- int m_nLttrsSlvd, m_nTime;
+ int m_nLttrsSlvd = 0, m_nTime = 0;
// Dialog Data
//{{AFX_DATA(COptn)
enum { IDD = IDD_USER_OPTIONS };
diff --git a/engines/bagel/hodjnpodj/crypt/pnt_gram.h b/engines/bagel/hodjnpodj/crypt/pnt_gram.h
index b7f5d691f4f..a08a8274537 100644
--- a/engines/bagel/hodjnpodj/crypt/pnt_gram.h
+++ b/engines/bagel/hodjnpodj/crypt/pnt_gram.h
@@ -101,10 +101,10 @@ private: // functions
}
private: // vars
- CSprite *m_cAlphabet[SYMBOLS]; // Crypt construct objects
- CSprite *m_cUsedAlphabet[USED_SYMBOLS];
- CSprite *m_cRevealAlphabet[REVEAL_SYMBOLS];
- CSprite *m_cHiLite;
+ CSprite *m_cAlphabet[SYMBOLS] = {}; // Crypt construct objects
+ CSprite *m_cUsedAlphabet[USED_SYMBOLS] = {};
+ CSprite *m_cRevealAlphabet[REVEAL_SYMBOLS] = {};
+ CSprite *m_cHiLite = nullptr;
CSize m_cPos;
@@ -161,7 +161,7 @@ public:
return nTypeCode & ~LIMBO_TYPE;
}
- CSprite *m_cDisplayLetters;
+ CSprite *m_cDisplayLetters = nullptr;
};
} // namespace Crypt
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.h b/engines/bagel/hodjnpodj/dfa/dfa.h
index 5baf4437ec3..55da658acf2 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.h
+++ b/engines/bagel/hodjnpodj/dfa/dfa.h
@@ -127,15 +127,15 @@ namespace DFA {
class CMainDFAWindow : public CFrameWnd {
public:
- unsigned int m_nTimeForGame;
- int m_nBeaverDuration;
+ unsigned int m_nTimeForGame = 0;
+ int m_nBeaverDuration = 0;
private:
- bool m_bPlaySounds; // bool for am I playing a certain # of rounds
- HWND m_hCallAppWnd;
- LPGAMESTRUCT m_lpGameStruct;
- bool m_bMouseCaptured;
- long m_lScore;
+ bool m_bPlaySounds = false; // bool for am I playing a certain # of rounds
+ HWND m_hCallAppWnd = nullptr;
+ LPGAMESTRUCT m_lpGameStruct = nullptr;
+ bool m_bMouseCaptured = false;
+ long m_lScore = 0;
CRect MainRect; // screen area spanned by the game window
CRect ArtRect; // screen area inside the border trim
CRect OptionRect; // screen area spanned by the option button
@@ -168,10 +168,10 @@ protected:
//
// Sound as resource dudes:
//
- char * m_pHitSound[NUM_HIT_SOUNDS];
- HANDLE m_hHitRes[NUM_HIT_SOUNDS];
- char * m_pMissSound[NUM_MISS_SOUNDS];
- HANDLE m_hMissRes[NUM_MISS_SOUNDS];
+ char *m_pHitSound[NUM_HIT_SOUNDS] = {};
+ HANDLE m_hHitRes[NUM_HIT_SOUNDS] = {};
+ char *m_pMissSound[NUM_MISS_SOUNDS] = {};
+ HANDLE m_hMissRes[NUM_MISS_SOUNDS] = {};
//{{AFX_MSG( CMainPackRatWindow )
afx_msg void OnPaint();
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index d1d5496cb9e..996460bb5c7 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -95,53 +95,53 @@ protected:
DECLARE_MESSAGE_MAP()
- bool m_bBrickVisible[N_BRICKS];
+ bool m_bBrickVisible[N_BRICKS] = {};
CPoint m_ptOrigin;
CRect m_rNewGameButton;
CRect m_rBlackHole;
CVector m_vBallVector;
CVector m_ptBallLocation;
- CPalette *m_pGamePalette;
- CBmpButton *m_pScrollButton;
- CSprite *m_pBall;
- CSprite *m_pPaddle;
- CSound *m_pSoundTrack;
-
- char * m_pBrickSound;
- char * m_pWallSound;
- char * m_pPaddleSound;
- char * m_pExtraLifeSound;
- HANDLE m_hBrickRes;
- HANDLE m_hWallRes;
- HANDLE m_hPaddleRes;
- HANDLE m_hExtraLifeRes;
-
- int m_nInitNumBalls;
- int m_nInitStartLevel;
- int m_nInitBallSpeed;
- int m_nInitPaddleSize;
- int m_nGForceFactor;
-
- double m_fTurboBoost;
- long m_lScore;
- long m_lExtraLifeScore;
- long m_nJoyOrgX;
- long m_nJoyOrgY;
- int m_nBricks;
- int m_nBalls;
- int m_nBallSpeed;
- int m_nNumRows;
- int m_nPaddleCelIndex;
+ CPalette *m_pGamePalette = nullptr;
+ CBmpButton *m_pScrollButton = nullptr;
+ CSprite *m_pBall = nullptr;
+ CSprite *m_pPaddle = nullptr;
+ CSound *m_pSoundTrack = nullptr;
+
+ char * m_pBrickSound = nullptr;
+ char * m_pWallSound = nullptr;
+ char * m_pPaddleSound = nullptr;
+ char * m_pExtraLifeSound = nullptr;
+ HANDLE m_hBrickRes = nullptr;
+ HANDLE m_hWallRes = nullptr;
+ HANDLE m_hPaddleRes = nullptr;
+ HANDLE m_hExtraLifeRes = nullptr;
+
+ int m_nInitNumBalls = 0;
+ int m_nInitStartLevel = 0;
+ int m_nInitBallSpeed = 0;
+ int m_nInitPaddleSize = 0;
+ int m_nGForceFactor = 0;
+
+ double m_fTurboBoost = 0;
+ long m_lScore = 0;
+ long m_lExtraLifeScore = 0;
+ long m_nJoyOrgX = 0;
+ long m_nJoyOrgY = 0;
+ int m_nBricks = 0;
+ int m_nBalls = 0;
+ int m_nBallSpeed = 0;
+ int m_nNumRows = 0;
+ int m_nPaddleCelIndex = 0;
int m_nOldSize = -1;
- bool m_bMovingPaddle;
- bool m_bGameActive;
- bool m_bPause;
- bool m_bIgnoreScrollClick;
- bool m_bPaddleHit;
- bool m_bOutterWall;
- bool m_bJoyActive;
- bool m_bBallOnPaddle;
+ bool m_bMovingPaddle = false;
+ bool m_bGameActive = false;
+ bool m_bPause = false;
+ bool m_bIgnoreScrollClick = false;
+ bool m_bPaddleHit = false;
+ bool m_bOutterWall = false;
+ bool m_bJoyActive = false;
+ bool m_bBallOnPaddle = false;
CVector gvCenter;
};
diff --git a/engines/bagel/hodjnpodj/garfunkle/note.h b/engines/bagel/hodjnpodj/garfunkle/note.h
index cf77860c1de..7bbc3d954b0 100644
--- a/engines/bagel/hodjnpodj/garfunkle/note.h
+++ b/engines/bagel/hodjnpodj/garfunkle/note.h
@@ -60,12 +60,12 @@ public:
static void FlushNoteList();
private:
- int m_nValue;
- CNote *m_pNext; // pointer to next note in chain
- CNote *m_pPrev; // pointer to previous note in chain
+ int m_nValue = 0;
+ CNote *m_pNext = nullptr; // pointer to next note in chain
+ CNote *m_pPrev = nullptr; // pointer to previous note in chain
- static CNote *m_pNoteHead; // pointer to linked chain of notes
- static CNote *m_pNoteTail; // pointer to tail of list of notes
+ static CNote *m_pNoteHead; // pointer to linked chain of notes
+ static CNote *m_pNoteTail; // pointer to tail of list of notes
};
} // namespace Garfunkle
diff --git a/engines/bagel/hodjnpodj/life/grid.h b/engines/bagel/hodjnpodj/life/grid.h
index c7cec2d3c68..26e7c7fe611 100644
--- a/engines/bagel/hodjnpodj/life/grid.h
+++ b/engines/bagel/hodjnpodj/life/grid.h
@@ -38,8 +38,8 @@ namespace Life {
class colony {
- int grid[ROWS][COLS];
- int rows, cols;
+ int grid[ROWS][COLS] = {};
+ int rows = 0, cols = 0;
public:
//creator
@@ -55,20 +55,20 @@ public:
bool operator!=(const colony &c);
//accessors
- int row() {
+ int row() const {
return rows;
};
- int col() {
+ int col() const {
return cols;
};
- int islife(int r, int c) {
+ int islife(int r, int c) const {
return grid[r][c];
};
void evolve(const colony &c);
void flip(int r, int c);
//void print();
public:
- int m_nColony_count;
+ int m_nColony_count = 0;
};
} // namespace Life
diff --git a/engines/bagel/hodjnpodj/life/life.h b/engines/bagel/hodjnpodj/life/life.h
index d22c2b089d5..6895cdabbe2 100644
--- a/engines/bagel/hodjnpodj/life/life.h
+++ b/engines/bagel/hodjnpodj/life/life.h
@@ -46,8 +46,8 @@ namespace Life {
class CCalendar {
public:
- CSprite *pMonthSprite[MONTHS];
- bool bIsOn[MONTHS];
+ CSprite *pMonthSprite[MONTHS] = {};
+ bool bIsOn[MONTHS] = {};
};
class CLife {
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.h b/engines/bagel/hodjnpodj/mankala/mnk.h
index 7559bfe1062..d919efb1449 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.h
+++ b/engines/bagel/hodjnpodj/mankala/mnk.h
@@ -139,12 +139,12 @@ typedef struct {
// CBmpTable -- table of bitmap filenames
class CBmpTable {
public:
- int m_iBmpType ; // BMT_xxxx
- int m_iNumStones ; // 0 means "many"
- int m_iNumBmps ; // number of bmp files for this combo
- const char *m_xpszFilenameString ; // sprintf string
- bool m_bSubNumStones ;
- bool m_bMasked ; // mask white areas of bitmap
+ int m_iBmpType = 0; // BMT_xxxx
+ int m_iNumStones = 0; // 0 means "many"
+ int m_iNumBmps = 0; // number of bmp files for this combo
+ const char *m_xpszFilenameString = nullptr; // sprintf string
+ bool m_bSubNumStones = false;
+ bool m_bMasked = false; // mask white areas of bitmap
} ;
// CBmpObject -- bitmap object
diff --git a/engines/bagel/hodjnpodj/novacancy/main.h b/engines/bagel/hodjnpodj/novacancy/main.h
index b9fd5cc09f0..63ce13cbc56 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.h
+++ b/engines/bagel/hodjnpodj/novacancy/main.h
@@ -70,8 +70,8 @@ protected:
CRect m_rNewGameButton,
m_rectGameArea;
- CPalette *m_pGamePalette;
- CBmpButton *m_pScrollButton;
+ CPalette *m_pGamePalette = nullptr;
+ CBmpButton *m_pScrollButton = nullptr;
CRect m_rLDie; //the rectangles defined by the two dice.
CRect m_rRDie;
@@ -79,25 +79,25 @@ protected:
//assume all doors are equi-sized and equidistant.
CRect m_rDoor1; //the first door
CRect m_rDoor[10]; //rectangles representing doors 0 thru 9 ; #0 is unused.
- bool m_bDieUpdate;
- byte m_iDoorStatus[10]; //status of every door.
- bool m_bGameJustBegun;
- bool m_bDiceJustThrown;
- bool m_bDoorBmpLoaded[10];
- bool m_bGameLoadUp;
-
- byte m_cDoorToOpen;
- byte m_LDie;
- byte m_RDie;
- byte m_cUnDoableThrows;
-
- short m_iMoveValid; // flag to indicate the legal status of the last move. It is a ternary indicator :
+ bool m_bDieUpdate = false;
+ byte m_iDoorStatus[10] = {}; //status of every door.
+ bool m_bGameJustBegun = false;
+ bool m_bDiceJustThrown = false;
+ bool m_bDoorBmpLoaded[10] = {};
+ bool m_bGameLoadUp = false;
+
+ byte m_cDoorToOpen = 0;
+ byte m_LDie = 0;
+ byte m_RDie = 0;
+ byte m_cUnDoableThrows = 0;
+
+ short m_iMoveValid = 0; // flag to indicate the legal status of the last move. It is a ternary indicator :
// 1 => Perfectly legal move, and the dice van be rolled if desired.
// 0 => Legal move but not complete to roll the dice. The dice are disabled.
// -1=> Illegal move; stop and correct yourself. The dice are disabled.
- byte m_cDoorCount; // keeps track of all closed doors, irrespective of the validity of the move
- byte m_cActiveDoor; // the door whose status has just been changed (as result of mouse action).
- bool m_bOneDieCase; // this variable is always false unless doors 7, 8, and 9 are FIEXD.
+ byte m_cDoorCount = 0; // keeps track of all closed doors, irrespective of the validity of the move
+ byte m_cActiveDoor = 0; // the door whose status has just been changed (as result of mouse action).
+ bool m_bOneDieCase = false; // this variable is always false unless doors 7, 8, and 9 are FIEXD.
//other objects for animation...
CRect Paper,
@@ -110,18 +110,18 @@ protected:
Hat6,
UmbrStand;
- bool m_bGameActive;
- bool m_bPause;
- bool m_bIgnoreScrollClick;
- bool m_bSound;
- CSound *m_psndBkgndMusic;
+ bool m_bGameActive = false;
+ bool m_bPause = false;
+ bool m_bIgnoreScrollClick = false;
+ bool m_bSound = false;
+ CSound *m_psndBkgndMusic = nullptr;
- CSprite *m_pCLRollingDie;
- CSprite *m_pCRRollingDie;
- CSprite *m_pCSingleRollingDie; //unused in v.1.5 or later.
+ CSprite *m_pCLRollingDie = nullptr;
+ CSprite *m_pCRRollingDie = nullptr;
+ CSprite *m_pCSingleRollingDie = nullptr; //unused in v.1.5 or later.
private:
- bool m_bDiceBmpsLoaded;
+ bool m_bDiceBmpsLoaded = false;
CString gWndClass;
void AnimateDice();
diff --git a/engines/bagel/hodjnpodj/pdq/main.h b/engines/bagel/hodjnpodj/pdq/main.h
index 938e1f63c7f..541b53e1a2b 100644
--- a/engines/bagel/hodjnpodj/pdq/main.h
+++ b/engines/bagel/hodjnpodj/pdq/main.h
@@ -71,14 +71,14 @@ protected:
DECLARE_MESSAGE_MAP()
- CRect m_rNewGameButton;
- CSprite *m_pCategories[N_CATEGORIES];
- CSprite *m_pScrollSprite = nullptr;
- CGuessDlg *m_pDlgGuess = nullptr;
- CSound *m_pSoundTrack = nullptr;
- int m_iLastType = 0;
- bool m_bInMenu = false;
- bool m_bInGuess = false;
+ CRect m_rNewGameButton;
+ CSprite *m_pCategories[N_CATEGORIES] = {};
+ CSprite *m_pScrollSprite = nullptr;
+ CGuessDlg *m_pDlgGuess = nullptr;
+ CSound *m_pSoundTrack = nullptr;
+ int m_iLastType = 0;
+ bool m_bInMenu = false;
+ bool m_bInGuess = false;
};
} // namespace PDQ
diff --git a/engines/bagel/hodjnpodj/peggle/game.h b/engines/bagel/hodjnpodj/peggle/game.h
index f8245d9100f..ac08437fff4 100644
--- a/engines/bagel/hodjnpodj/peggle/game.h
+++ b/engines/bagel/hodjnpodj/peggle/game.h
@@ -70,8 +70,8 @@ public:
void UndoTurn();
private:
- bool m_bProgramActive;
- HWND m_hCallAppWnd;
+ bool m_bProgramActive = false;
+ HWND m_hCallAppWnd = nullptr;
CRect ScrollRect;
void OnSoundNotify(CSound *pSound);
diff --git a/engines/bagel/hodjnpodj/poker/dialogs.h b/engines/bagel/hodjnpodj/poker/dialogs.h
index 5568d24a799..66987861a02 100644
--- a/engines/bagel/hodjnpodj/poker/dialogs.h
+++ b/engines/bagel/hodjnpodj/poker/dialogs.h
@@ -37,8 +37,8 @@ namespace Poker {
//////////////////////////////////////////////////////////////////////////////
class COptionsDlg : public CBmpDialog {
private:
- bool m_bSoundOn; // bool for telling me should I play sounds or not
- bool m_bDisableSets; // bool for telling me should I disable the
+ bool m_bSoundOn = false; // bool for telling me should I play sounds or not
+ bool m_bDisableSets = false; // bool for telling me should I disable the
// "Set Amount" and "Set Payoffs" buttons
public:
@@ -60,8 +60,8 @@ protected:
//////////////////////////////////////////////////////////////////////////////
class CSetAmountDlg : public CBmpDialog {
private:
- int m_nCurrentAmount; // contains the current amount set
- char m_cAmount [6];
+ int m_nCurrentAmount = 0; // contains the current amount set
+ char m_cAmount[6] = {};
CRect rectDisplayAmount;
public:
@@ -85,18 +85,18 @@ protected:
//////////////////////////////////////////////////////////////////////////////
class CSetPayoffsDlg : public CBmpDialog {
private:
- char m_cPair[6];
- char m_cPairJacksPlus[6];
- char m_cTwoPair[6];
- char m_cThreeOAK[6];
- char m_cStriaght[6];
- char m_cFlush[6];
- char m_cFullHouse[6];
- char m_cFourOAK[6];
- char m_cStraightFlush[6];
- char m_cRoyalFlush[6];
- int m_nSetOfOdds;
- bool m_bJustDisplay;
+ char m_cPair[6] = {};
+ char m_cPairJacksPlus[6] = {};
+ char m_cTwoPair[6] = {};
+ char m_cThreeOAK[6] = {};
+ char m_cStriaght[6] = {};
+ char m_cFlush[6] = {};
+ char m_cFullHouse[6] = {};
+ char m_cFourOAK[6] = {};
+ char m_cStraightFlush[6] = {};
+ char m_cRoyalFlush[6] = {};
+ int m_nSetOfOdds = 0;
+ bool m_bJustDisplay = false;
CRect crectRedraw;
CRect rectPair, rectPairJacks;
CRect rectTwoPair, rectThree;
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index 34c355d541a..2adae68d6f7 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -164,20 +164,20 @@ protected:
DECLARE_MESSAGE_MAP()
CRect m_rNewGameButton;
- CMyEdit *m_pEditText;
- CPalette *m_pGamePalette;
- CBmpButton *m_pScrollButton;
- RIDDLE *m_pRiddle;
- CSprite *m_pSunDial;
- CSound *m_pSoundTrack;
- int m_nTimeLimit;
- int m_nInitTimeLimit;
- int m_nTimer;
- int m_nDifficultyLevel;
- unsigned int m_nRiddleNumber;
- bool m_bGameActive;
- bool m_bPause;
- bool m_bIgnoreScrollClick;
+ CMyEdit *m_pEditText = nullptr;
+ CPalette *m_pGamePalette = nullptr;
+ CBmpButton *m_pScrollButton = nullptr;
+ RIDDLE *m_pRiddle = nullptr;
+ CSprite *m_pSunDial = nullptr;
+ CSound *m_pSoundTrack = nullptr;
+ int m_nTimeLimit = 0;
+ int m_nInitTimeLimit = 0;
+ int m_nTimer = 0;
+ int m_nDifficultyLevel = 0;
+ unsigned int m_nRiddleNumber = 0;
+ bool m_bGameActive = false;
+ bool m_bPause = false;
+ bool m_bIgnoreScrollClick = false;
};
} // namespace Riddles
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.h b/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
index 5516a359104..9685b6fefff 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
@@ -123,18 +123,18 @@ namespace WordSearch {
class CMainWSWindow : public CFrameWnd {
public:
- unsigned int m_nTimeForGame;
- bool m_bShowWordList;
- bool m_bWordsForwardOnly;
+ unsigned int m_nTimeForGame = 0;
+ bool m_bShowWordList = false;
+ bool m_bWordsForwardOnly = false;
private:
- bool m_bPlaySounds; // bool for am I playing a certain # of rounds
- HWND m_hCallAppWnd;
- LPGAMESTRUCT m_lpGameStruct;
- bool m_bMouseCaptured;
- long m_lScore;
+ bool m_bPlaySounds = false; // bool for am I playing a certain # of rounds
+ HWND m_hCallAppWnd = nullptr;
+ LPGAMESTRUCT m_lpGameStruct = nullptr;
+ bool m_bMouseCaptured = false;
+ long m_lScore = 0;
CString m_alpszCurrectGrid[NUMBEROFROWS * NUMBEROFCOLS];
- bool m_bNoGrid;
+ bool m_bNoGrid = false;
CRect MainRect; // screen area spanned by the game window
CRect OptionRect; // screen area spanned by the option button
CRect rNewGame;
@@ -144,7 +144,7 @@ private:
CRect rScore;
CString astrCurrentDisplay[NUMBEROFROWS];
- char acGameGrid[NUMBEROFROWS][NUMBEROFCOLS];
+ char acGameGrid[NUMBEROFROWS][NUMBEROFCOLS] = {};
CRect arWordDisplay[WORDSPERLIST];
CString _strGameList[WORDSPERLIST];
More information about the Scummvm-git-logs
mailing list