[Scummvm-git-logs] scummvm master -> ad9922b9712b689a7d21535d45dbd4a9ec37d827
dreammaster
noreply at scummvm.org
Mon Sep 15 05:39:27 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:
ad0eb6e7b0 BAGEL: In progress fixing compiler warnings
fd68b1c0fa BAGEL: Further compiler warning fixes
ad9922b971 BAGEL: DEMO: Don't enable Options button for Peggleboz
Commit: ad0eb6e7b035a461623fed22974c9c8d9ea2a3c5
https://github.com/scummvm/scummvm/commit/ad0eb6e7b035a461623fed22974c9c8d9ea2a3c5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-14T16:11:41-07:00
Commit Message:
BAGEL: In progress fixing compiler warnings
Changed paths:
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
engines/bagel/hodjnpodj/metagame/gtl/store.cpp
engines/bagel/mfc/cmd_target.cpp
engines/bagel/mfc/dc.cpp
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index 24036828766..fe605a59387 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -50,10 +50,6 @@ namespace Frame {
#define CONTROL_PHYSICAL_MEMORY true
-
-void InitBFCInfo(CBfcMgr *);
-void FreeBFCInfo(CBfcMgr *);
-
// Movie Identifiers
#define MOVIE_ID_NONE 0
#define MOVIE_ID_LOGO 1
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
index 9de1044cb94..bbc683edca4 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
@@ -53,6 +53,7 @@ namespace Frame {
extern CBfcMgr *lpMetaGame;
extern void InitBFCInfo(CBfcMgr *pBfcMgr);
+extern void FreeBFCInfo(CBfcMgr *pBfcMgr);
/////////////////////////////////////////////////////////////////////////////
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.cpp b/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.cpp
index f0cf77539b3..0689dc1e990 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.cpp
@@ -125,7 +125,7 @@ void CMapDialog::OnPaint() {
pDC = GetDC();
- Common::sprintf_s(buf, "");
+ Common::strcpy_s(buf, "");
bSuccess = (*m_pTextMessage).DisplayString(pDC, buf, 20, FW_BOLD, TEXT_COLOR);
ASSERT(bSuccess);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
index dae53b67f45..e63f82937e7 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
@@ -616,7 +616,7 @@ bool CGtlData::AddLink(CNode FAR * lpNode, int iLink)
bFound = lpNode->m_iLinks[iK] == iLink ;
if (!bFound) {
- if (lpNode->m_iNumLinks >= DIMENSION(lpNode->m_iLinks)) {
+ if ((uint)lpNode->m_iNumLinks >= DIMENSION(lpNode->m_iLinks)) {
iError = 100 ;
ErrorMsg(nullptr, "Too many links for node.") ;
goto cleanup ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
index 37f97a95785..3d17e9afdf9 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
@@ -259,47 +259,7 @@ void CGtlFrame::RecalcLayout(bool bNotify)
RETURN_VOID ;
}
-#if OLD_CODE
-
-////* CGtlFrame::CallOnFileNew --
-void CGtlFrame::CallOnFileNew()
-// returns: true if error, false otherwise
-{
- JXENTER(CGtlFrame::CallOnFileNew) ;
- int iError = 0 ; // error code
- CGtlApp * xpGtlApp = (CGtlApp *)AfxGetApp() ; // get application
-
- xpGtlApp->CallOnFileNew() ;
-
-//cleanup:
-
- JXELEAVE(CGtlFrame::CallOnFileNew) ;
- RETURN_VOID ;
-}
-
-////* CGtlFrame::CallOnFileOpen --
-void CGtlFrame::CallOnFileOpen()
-// returns: true if error, false otherwise
-{
- JXENTER(CGtlFrame::CallOnFileOpen) ;
- int iError = 0 ; // error code
- CGtlApp * xpGtlApp = (CGtlApp *)AfxGetApp() ; // get application
-
- xpGtlApp->CallOnFileOpen() ;
-
-//cleanup:
-
- JXELEAVE(CGtlFrame::CallOnFileOpen) ;
- RETURN_VOID ;
-}
-
-#endif /* OLD_CODE */
-
void CGtlFrame::ProcessMiniGameReturn() {
- //
- // Obsolete function
- //
- assert(0);
}
void CGtlFrame::ShowOptions(CPalette *pPalette) {
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
index 57f1c172782..7e6f32e7f13 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
@@ -286,7 +286,7 @@ bool CGtlData::InitProblem()
iSecondaryInfo = 0 ;
int iObjectClues[MAX_CLUES], iSecondaryClues[MAX_CLUES],
- iMishMoshClues[MAX_CLUES], iMoneyClues[MAX_CLUES] ;
+ iMishMoshClues[MAX_CLUES];
int iObjectCount, iSecondaryCount, iMishMoshCount, iMoneyCount ;
//int iMoneyClue = 0 ; // number of chosen money clue
const CClueTable * xpClueTable, *xpClueEntry ;
@@ -362,7 +362,8 @@ bool CGtlData::InitProblem()
break ;
case MG_CLUE_CROWNS: /* need some crowns */
- iMoneyClues[iMoneyCount++] = iIndex ;
+ //iMoneyClues[iMoneyCount++] = iIndex ;
+ break;
default:
break ;
@@ -376,22 +377,9 @@ bool CGtlData::InitProblem()
goto cleanup ;
}
- //iMoneyClue = iMoneyClues[m_cGenUtil.RandomInteger(1,
- // iMoneyCount) - 1] ;
-
- // if money clue is option
- // add a money clue to the list of objects
-// if (!bMoneyRequired)
-// iObjectClues[iObjectCount++] = iMoneyClue ;
-
m_cGenUtil.RandomSelection(iObjectClues, iObjectCount,
iNumObjects) ;
- // if money clue is required, then replace first clue with
- // money clue. (Clues will be re-permuted below.)
-// if (bMoneyRequired)
-// iObjectClues[0] = iMoneyClue ;
-
for (iK = 0 ; iK < iNumObjects ; ++iK) {
xpClueEntry = xpClueTable + iObjectClues[iK] ;
if (xpClueEntry->m_iClueCode == MG_CLUE_NEED)
@@ -979,7 +967,7 @@ bool CGtlData::SwitchPlayers()
SetFurlongs(m_xpCurXodj);
- if (!bExitDll && m_xpCurXodj->m_iFurlongs >= 0 && m_xpCurXodj->m_iFurlongs < DIMENSION(m_lpFurlongMaps) && ((lpMap = m_lpFurlongMaps[m_xpCurXodj->m_iFurlongs]) != nullptr) && lpMap->m_lpcBgbObject)
+ if (!bExitDll && m_xpCurXodj->m_iFurlongs >= 0 && (uint)m_xpCurXodj->m_iFurlongs < DIMENSION(m_lpFurlongMaps) && ((lpMap = m_lpFurlongMaps[m_xpCurXodj->m_iFurlongs]) != nullptr) && lpMap->m_lpcBgbObject)
DrawABitmap(nullptr, lpMap->m_lpcBgbObject);
return (bAgain);
@@ -1240,7 +1228,7 @@ bool CGtlData::InitInterface(int iCode, bool & bExitDll)
m_xpCurXodj->m_pBlackMarket, m_xpCurXodj->m_pGenStore,
ENC_BOOBYTRAP, m_xpCurXodj->m_iFurlongs,
nPSector, nOSector,
- m_xpCurXodj->m_bHodj ? lpMetaGameStruct->m_bTraps : lpMetaGameStruct->m_bTraps);
+ lpMetaGameStruct->m_bTraps);
// if this is a transport code
//
@@ -1932,7 +1920,7 @@ bool CGtlData::TakeIneligibleAction(CXodj *xpXodj, int iFunctionCode, int iLocat
break;
case MG_LOC_CORRAL:
- iSoundCode = (xpXodj->m_bHodj ? MG_SOUND_OLN9 : MG_SOUND_OLN9);
+ iSoundCode = MG_SOUND_OLN9;
break;
case MG_LOC_BEAVER:
@@ -3232,7 +3220,7 @@ bool CGtlData::DetermineGameEligibility(CXodj *xpXodj, int iGameCode, bool bExec
if (iGameCode >= MG_GAME_BASE && iGameCode <= MG_GAME_MAX) {
- for (iK = 0 ; iLast < 0 && iK < DIMENSION(xpXodj->m_iGameHistory) && ((iGame = xpXodj->m_iGameHistory[iK]) != 0); ++iK)
+ for (iK = 0 ; iLast < 0 && (uint)iK < DIMENSION(xpXodj->m_iGameHistory) && ((iGame = xpXodj->m_iGameHistory[iK]) != 0); ++iK)
if (iGame == iGameCode)
iLast = iK ;
@@ -3354,7 +3342,7 @@ bool CGtlData::DetermineInfoEligibility(CXodj * xpXodj, int iLocationCode, bool
// table -- which means that I've received a clue telling me
// to go there to get information
- for (iK = 0; iFound < 0 && iK < DIMENSION(xpXodj->m_iSecondaryLoc) && ((iLoc = xpXodj->m_iSecondaryLoc[iK]) != 0); ++iK)
+ for (iK = 0; iFound < 0 && (uint)iK < DIMENSION(xpXodj->m_iSecondaryLoc) && ((iLoc = xpXodj->m_iSecondaryLoc[iK]) != 0); ++iK)
if (iLoc == iLocationCode)
iFound = iK ;
@@ -3367,7 +3355,7 @@ bool CGtlData::DetermineInfoEligibility(CXodj * xpXodj, int iLocationCode, bool
bEligibility = true ; // then we're indeed eligible
// to get information from this location
if (bExecute) // if we want to execute on eligibility
- for (iK = iFound ; iK < DIMENSION(xpXodj->m_iSecondaryLoc)
+ for (iK = iFound ; (uint)iK < DIMENSION(xpXodj->m_iSecondaryLoc)
; ++iK)
xpXodj->m_iSecondaryLoc[iK] =
xpXodj->m_iSecondaryLoc[iK + 1] ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
index c83300f73aa..d632977ea45 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
@@ -667,7 +667,7 @@ bool CGtlData::AdjustToView(CGtlView *xpGtlView)
int iFurlong = 10 * lpMap->m_szLabel[1] + lpMap->m_szLabel[2] - 11 * '0' ;
- if (iFurlong >= 0 && iFurlong < DIMENSION(m_lpFurlongMaps))
+ if (iFurlong >= 0 && (uint)iFurlong < DIMENSION(m_lpFurlongMaps))
m_lpFurlongMaps[iFurlong] = lpMap ;
lpMap->m_bSpecialPaint = true ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
index c71ba73f3c3..5577490d72f 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
@@ -523,7 +523,7 @@ void CGeneralStore::UpdateCrowns(CDC *pDC) {
if ((pItem == nullptr) ||
((*pItem).GetQuantity() < 1)) {
if (bPlayingHodj)
- Common::strcpy_s(chBuffer, "Podj has no Crowns");
+ Common::strcpy_s(chBuffer, "Hodj has no Crowns");
else
Common::strcpy_s(chBuffer, "Podj has no Crowns");
} else {
diff --git a/engines/bagel/mfc/cmd_target.cpp b/engines/bagel/mfc/cmd_target.cpp
index d341ce9539c..1f8917c020a 100644
--- a/engines/bagel/mfc/cmd_target.cpp
+++ b/engines/bagel/mfc/cmd_target.cpp
@@ -69,7 +69,7 @@ bool CCmdTarget::OnCmdMsg(unsigned int nID, int nCode, void *pExtra,
const AFX_MSGMAP_ENTRY *lpEntry;
unsigned int nMsg = 0;
- if (nCode != CN_UPDATE_COMMAND_UI) {
+ if ((uint)nCode != CN_UPDATE_COMMAND_UI) {
nMsg = HIWORD(nCode);
nCode = LOWORD(nCode);
}
@@ -189,7 +189,7 @@ bool CCmdTarget::_AfxDispatchCmdMsg(CCmdTarget *pTarget, unsigned int nID, int n
case AfxSig_cmdui: {
// ON_UPDATE_COMMAND_UI or ON_UPDATE_COMMAND_UI_REFLECT case
assert(CN_UPDATE_COMMAND_UI == (unsigned int)-1);
- assert(nCode == CN_UPDATE_COMMAND_UI || nCode == 0xFFFF);
+ assert((uint)nCode == CN_UPDATE_COMMAND_UI || nCode == 0xFFFF);
assert(pExtra != nullptr);
CCmdUI *pCmdUI = (CCmdUI *)pExtra;
assert(!pCmdUI->m_bContinueRouting); // idle - not set
@@ -201,7 +201,7 @@ bool CCmdTarget::_AfxDispatchCmdMsg(CCmdTarget *pTarget, unsigned int nID, int n
case AfxSig_cmduiw: {
// ON_UPDATE_COMMAND_UI case
- assert(nCode == CN_UPDATE_COMMAND_UI);
+ assert((uint)nCode == CN_UPDATE_COMMAND_UI);
assert(pExtra != nullptr);
CCmdUI *pCmdUI = (CCmdUI *)pExtra;
assert(pCmdUI->m_nID == (int)nID); // sanity assert
diff --git a/engines/bagel/mfc/dc.cpp b/engines/bagel/mfc/dc.cpp
index 44925a5726b..abe2ec5f0c4 100644
--- a/engines/bagel/mfc/dc.cpp
+++ b/engines/bagel/mfc/dc.cpp
@@ -1255,8 +1255,6 @@ bool CDC::Impl::getTextMetrics(LPTEXTMETRIC lpMetrics) const {
TEXTMETRIC &tm = *lpMetrics;
Gfx::Font *font = *(CFont::Impl *)_font;
- memset(&tm, 0, sizeof(TEXTMETRIC)); // Initialize to zero
-
tm.tmInternalLeading = 0;
tm.tmExternalLeading = 0;
Commit: fd68b1c0fa7022c610896bca42dd96fd02a24bcf
https://github.com/scummvm/scummvm/commit/fd68b1c0fa7022c610896bca42dd96fd02a24bcf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-14T22:34:39-07:00
Commit Message:
BAGEL: Further compiler warning fixes
Changed paths:
engines/bagel/hodjnpodj/artparts/artparts.cpp
engines/bagel/hodjnpodj/barbershop/paint.cpp
engines/bagel/hodjnpodj/barbershop/paint.h
engines/bagel/hodjnpodj/crypt/optn.h
engines/bagel/hodjnpodj/dfa/optdlg.cpp
engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
engines/bagel/hodjnpodj/life/game.cpp
engines/bagel/hodjnpodj/life/game.h
engines/bagel/hodjnpodj/life/life.cpp
engines/bagel/hodjnpodj/mankala/mnklog.cpp
engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
engines/bagel/hodjnpodj/peggle/game.cpp
engines/bagel/hodjnpodj/peggle/game2.h
engines/bagel/hodjnpodj/poker/poker.cpp
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.cpp b/engines/bagel/hodjnpodj/artparts/artparts.cpp
index 80fe459c013..2dde605581c 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.cpp
+++ b/engines/bagel/hodjnpodj/artparts/artparts.cpp
@@ -270,12 +270,7 @@ void CMainWindow::SplashScratch() {
pPalOld = (*pDC).SelectPalette(pGamePalette, false); // Select Game Palette
(*pDC).RealizePalette(); // Use it
- if (bFramed) { // In framed mode
- pDC->BitBlt(SIDE_BORDER, TOP_BORDER, ART_WIDTH, ART_HEIGHT, pScratch2DC, 0, 0, SRCCOPY); // Draw Scratch2
- } else {
- pDC->BitBlt(SIDE_BORDER, TOP_BORDER, ART_WIDTH, ART_HEIGHT, pScratch2DC, 0, 0, SRCCOPY); // Draw Scratch2
-
- } //...on screen
+ pDC->BitBlt(SIDE_BORDER, TOP_BORDER, ART_WIDTH, ART_HEIGHT, pScratch2DC, 0, 0, SRCCOPY); // Draw Scratch2
(*pDC).SelectPalette(pPalOld, false); // Select back old palette
ReleaseDC(pDC); // Release the DC
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.cpp b/engines/bagel/hodjnpodj/barbershop/paint.cpp
index c9dac08586a..9228208d740 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/paint.cpp
@@ -28,6 +28,17 @@ namespace Bagel {
namespace HodjNPodj {
namespace Barbershop {
+static const char *DECKS[] = { // bitmap loading
+ "art\\deck0.bmp",
+ "art\\deck1.bmp",
+ "art\\deck2.bmp",
+ "art\\deck3.bmp",
+ "art\\deck4.bmp",
+ "art\\deck5.bmp",
+ "art\\deck6.bmp",
+ "art\\deck7.bmp"
+};
+
/*****************************************************************
*
* CPaint
@@ -60,7 +71,7 @@ CPaint::CPaint(CDC *pDC) {
int i, j;
for (i = 0; i < CARDS_PER_COL; i++) { // Initialize master alphabet list
- pBmpCardSet = FetchBitmap(pDC, (CPalette**) nullptr, lpszDeck[i]);
+ pBmpCardSet = FetchBitmap(pDC, (CPalette**) nullptr, DECKS[i]);
ASSERT(pBmpCardSet);
for (j = 0; j < CARDS_PER_ROW; j ++) {
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.h b/engines/bagel/hodjnpodj/barbershop/paint.h
index dcdfcf82c7c..4dee515fbcb 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.h
+++ b/engines/bagel/hodjnpodj/barbershop/paint.h
@@ -86,17 +86,6 @@ namespace Barbershop {
#define CARD_BACK1B_BMP "art\\card-bk3.bmp" // card back option #1
#define CARD_BACK2B_BMP "art\\card-bk4.bmp" // card back option #2
-static const char *lpszDeck[] = { // bitmap loading
- "art\\deck0.bmp",
- "art\\deck1.bmp",
- "art\\deck2.bmp",
- "art\\deck3.bmp",
- "art\\deck4.bmp",
- "art\\deck5.bmp",
- "art\\deck6.bmp",
- "art\\deck7.bmp"
-};
-
class CPaint {
private: // vars
OSpr *m_cCardSet[CARD_SET];
diff --git a/engines/bagel/hodjnpodj/crypt/optn.h b/engines/bagel/hodjnpodj/crypt/optn.h
index 3c73ede8fbb..405198a3434 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.h
+++ b/engines/bagel/hodjnpodj/crypt/optn.h
@@ -53,14 +53,14 @@ namespace Crypt {
class COptn : public CBmpDialog {
private:
CString m_chTime[TIME_TABLE];
- int m_nTimeIndex[TIME_TABLE];
- CText *m_pLttrsSlvd, *m_pTime;
- CPalette *pGamePalette;
+ int m_nTimeIndex[TIME_TABLE] = {};
+ CText *m_pLttrsSlvd = nullptr, *m_pTime = nullptr;
+ CPalette *pGamePalette = nullptr;
int TimeToIndex(int nTime);
public:
- COptn(CWnd* pParent = nullptr, CPalette *pGamePalette = nullptr, int nLttrsSolvd = false, int nTime = false); // standard constructor
+ COptn(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, int nLttrsSolvd = false, int nTime = false); // standard constructor
~COptn();
void ClearDialogImage();
diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index 1eef0e1c0e0..c049e916c79 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -27,13 +27,13 @@ namespace Bagel {
namespace HodjNPodj {
namespace DFA {
-#define GAMETIMEMAX 5
-#define GAMETIMEMIN 1
-#define GAMESTEP 1
+constexpr int GAMETIMEMAX = 5;
+constexpr int GAMETIMEMIN = 1;
+constexpr int GAMESTEP = 1;
-#define BEAVERTIMEMAX 4
-#define BEAVERTIMEMIN 1
-#define BEAVERSTEP 1
+constexpr int BEAVERTIMEMAX = 4;
+constexpr int BEAVERTIMEMIN = 1;
+constexpr int BEAVERSTEP = 1;
static CPalette *pPackRatOptPalette;
CText *ptxtGTime;
@@ -360,12 +360,9 @@ void CDFAOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar*
int oldAmnt = 0;
int newAmnt = 0;
CDC *pDC;
- //int nJunk = 0;
char cGDisplay[12];
char cBDisplay[12];
- //nJunk = pScrollBar->GetDlgCtrlID();
-
// first set the range of the scoll bar
if (pScrollBar->GetDlgCtrlID() == IDC_GAMETIME)
pScrollBar->SetScrollRange(GAMETIMEMIN, GAMETIMEMAX, true);
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index 13bb46397aa..ad8afce3046 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -958,7 +958,7 @@ void CMainWindow::NewGame() {
(*m_pSignText).DisplayString(pDC, msg, 32, FW_NORMAL, SIGN_COLOR);
} else {
m_bPlaying = true; // Make sure we can play music
- Common::sprintf_s(msg, "");
+ Common::strcpy_s(msg, "");
(*m_pSignText).DisplayString(pDC, msg, 32, FW_NORMAL, SIGN_COLOR);
}
diff --git a/engines/bagel/hodjnpodj/life/game.cpp b/engines/bagel/hodjnpodj/life/game.cpp
index cbafe905cb7..8655ccc4d3c 100644
--- a/engines/bagel/hodjnpodj/life/game.cpp
+++ b/engines/bagel/hodjnpodj/life/game.cpp
@@ -1340,7 +1340,7 @@ void CMainWindow::RefreshStats() {
bAssertCheck = m_cLife->pYearsText2->DisplayString(pDC, buf, STATS_FONT_SIZE, FW_BOLD, STATS_COLOR);
ASSERT(bAssertCheck); // paint the text
} else {
- Common::sprintf_s(buf, "");
+ Common::strcat_s(buf, "");
bAssertCheck = m_cLife->pYears->DisplayString(pDC, buf, STATS_FONT_SIZE, FW_BOLD, STATS_COLOR);
ASSERT(bAssertCheck); // paint the text
@@ -1359,7 +1359,7 @@ void CMainWindow::RefreshStats() {
bAssertCheck = m_cLife->pColonyStat->DisplayString(pDC, buf, STATS_FONT_SIZE, FW_BOLD, STATS_COLOR);
ASSERT(bAssertCheck); // paint the text
- Common::sprintf_s(buf, "");
+ Common::strcat_s(buf, "");
bAssertCheck = m_cLife->pColonyStatText1->DisplayString(pDC, buf, STATS_FONT_SIZE, FW_BOLD, STATS_COLOR);
ASSERT(bAssertCheck); // paint the text
} else {
diff --git a/engines/bagel/hodjnpodj/life/game.h b/engines/bagel/hodjnpodj/life/game.h
index 992b357bcda..0e81b220857 100644
--- a/engines/bagel/hodjnpodj/life/game.h
+++ b/engines/bagel/hodjnpodj/life/game.h
@@ -31,13 +31,6 @@ namespace Life {
#define SPLASHSPEC ".\\art\\backgrnd.BMP"
-static const char *curly[5] = {
- ".\\art\\Colony1.BMP",
- ".\\art\\Colony2.BMP",
- ".\\art\\Colony3.BMP",
- ".\\art\\Colony4.BMP",
- ".\\art\\Colony5.BMP"
-};
#define CURLY_X 25 // Colony dimensions
#define CURLY_Y 24
@@ -48,21 +41,6 @@ static const char *curly[5] = {
#define OFFSET_X 6
#define OFFSET_Y 4
-static const char *months[12] = {
- ".\\art\\jan.BMP",
- ".\\art\\feb.BMP",
- ".\\art\\mar.BMP",
- ".\\art\\apr.BMP",
- ".\\art\\may.BMP",
- ".\\art\\jun.BMP",
- ".\\art\\jul.BMP",
- ".\\art\\aug.BMP",
- ".\\art\\sep.BMP",
- ".\\art\\oct.BMP",
- ".\\art\\nov.BMP",
- ".\\art\\dec.BMP"
-};
-
#define SCROLL_BUTTON ".\\art\\SCROLBTN.BMP" // scroll commands button bmp
#define CALENDAR_BMP ".\\ART\\CALENDAR.BMP" // the blank calendar artwork
diff --git a/engines/bagel/hodjnpodj/life/life.cpp b/engines/bagel/hodjnpodj/life/life.cpp
index 54eb3542936..07e59786cc3 100644
--- a/engines/bagel/hodjnpodj/life/life.cpp
+++ b/engines/bagel/hodjnpodj/life/life.cpp
@@ -31,6 +31,29 @@ namespace Bagel {
namespace HodjNPodj {
namespace Life {
+static const char *curly[5] = {
+ ".\\art\\Colony1.BMP",
+ ".\\art\\Colony2.BMP",
+ ".\\art\\Colony3.BMP",
+ ".\\art\\Colony4.BMP",
+ ".\\art\\Colony5.BMP"
+};
+
+static const char *months[12] = {
+ ".\\art\\jan.BMP",
+ ".\\art\\feb.BMP",
+ ".\\art\\mar.BMP",
+ ".\\art\\apr.BMP",
+ ".\\art\\may.BMP",
+ ".\\art\\jun.BMP",
+ ".\\art\\jul.BMP",
+ ".\\art\\aug.BMP",
+ ".\\art\\sep.BMP",
+ ".\\art\\oct.BMP",
+ ".\\art\\nov.BMP",
+ ".\\art\\dec.BMP"
+};
+
// Globals!
extern int nSpeed, nCountDown, nLife;
extern int nTurnCounter, nLifeCounter;
diff --git a/engines/bagel/hodjnpodj/mankala/mnklog.cpp b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
index 43d47cf0347..79923fbaca4 100644
--- a/engines/bagel/hodjnpodj/mankala/mnklog.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
@@ -435,7 +435,7 @@ bool CMnk::CountConfigurations()
bool CMnk::PopulateTable() {
JXENTER(CMnk::PopulateTable) ;
int iError = 0 ; // error code
- long lConfigIndex ; // loop variable
+ uint lConfigIndex ; // loop variable
CMove cMove ; // move structure
m_iCurrentMaxDepth = 3 ; // minimax depth is 3 for table populate
@@ -606,7 +606,7 @@ bool CMnk::UnmapConfiguration(CMove * xpcMove)
long lValue = 0L, lValueNew ; // table values
char szDebugStr[200] ; // debugging string
- if (lConfigIndex < 0 || lConfigIndex >= MAXCONFIGS) {
+ if (lConfigIndex < 0 || (uint)lConfigIndex >= MAXCONFIGS) {
iError = 100 ; // config index is out of range
goto cleanup ;
}
@@ -1703,7 +1703,7 @@ bool CMnk::GetBestWinCount(CMove * xpcMove)
{
JXENTER(CMnk::GetBestWinCount) ;
int iError = 0 ; // error code
- long lIndex = xpcMove->m_lConfigIndex ;
+ uint lIndex = xpcMove->m_lConfigIndex;
int iValue = 0; // value from table
struct FIVE * hpFive ; // ptr to structure of 8 5-bit values
@@ -1780,7 +1780,7 @@ bool CMnk::SetBestWinCount(CMove * xpcMove)
JXENTER(CMnk::SetBestWinCount) ;
int iError = 0 ; // error code
struct FIVE * hpFive ; // ptr to structure of 8 5-bit values
- long lIndex = xpcMove->m_lConfigIndex ;
+ uint lIndex = xpcMove->m_lConfigIndex;
int iValue = xpcMove->m_iBestWinValue ; // value from table
bool bTest = false ; // debugging test
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
index 082bfc0796b..2d80562778a 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
@@ -176,7 +176,7 @@ void ConvertToSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
assert(pSaveGameInfo != nullptr);
// reset entire info structure
- memset(pSaveGameInfo, 0, sizeof(SAVEGAME_INFO));
+ *pSaveGameInfo = SAVEGAME_INFO();
pSaveGameInfo->m_lBoffoGameID = BOFFO_GAME_ID;
pSaveGameInfo->m_nFixedRecordSize = sizeof(SAVEGAME_INFO);
diff --git a/engines/bagel/hodjnpodj/peggle/game.cpp b/engines/bagel/hodjnpodj/peggle/game.cpp
index bfa1bb7731b..c2d6fd509b8 100644
--- a/engines/bagel/hodjnpodj/peggle/game.cpp
+++ b/engines/bagel/hodjnpodj/peggle/game.cpp
@@ -42,6 +42,46 @@ namespace Peggle {
#define SHOW_CURSOR true
+// Board definitions:
+
+static const int8 Board_Triangle[GRID_SIZE][GRID_SIZE] = {
+ {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+ {PEGGED, EMPTY, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE},
+ {PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+ {PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+ {PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+ {NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+ {NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+};
+static const int8 Board_TrianglePlus[GRID_SIZE][GRID_SIZE] = {
+ {NO_HOLE, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, PEGGED},
+ {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
+ {NO_HOLE, PEGGED, EMPTY, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+ {NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE},
+ {NO_HOLE, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+ {NO_HOLE, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+ {PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
+};
+static const int8 Board_CrossPlus[GRID_SIZE][GRID_SIZE] = {
+ {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+ {NO_HOLE, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, NO_HOLE},
+ {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
+ {PEGGED, PEGGED, PEGGED, EMPTY, PEGGED, PEGGED, PEGGED},
+ {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
+ {NO_HOLE, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, NO_HOLE},
+ {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+};
+static const int8 Board_Cross[GRID_SIZE][GRID_SIZE] = {
+ {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+ {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+ {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
+ {PEGGED, PEGGED, PEGGED, EMPTY, PEGGED, PEGGED, PEGGED},
+ {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
+ {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+ {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
+};
+
+
extern LPGAMESTRUCT pGameInfo;
void setup_cursor();
diff --git a/engines/bagel/hodjnpodj/peggle/game2.h b/engines/bagel/hodjnpodj/peggle/game2.h
index 1b774f87c64..8c626d46728 100644
--- a/engines/bagel/hodjnpodj/peggle/game2.h
+++ b/engines/bagel/hodjnpodj/peggle/game2.h
@@ -179,45 +179,6 @@ namespace Peggle {
#define HAND_SIZE 48
-// Board definitions:
-
-static int8 Board_Triangle[GRID_SIZE][GRID_SIZE] = {
- {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
- {PEGGED, EMPTY, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE},
- {PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
- {PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
- {PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
- {NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
- {NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
-};
-static char Board_TrianglePlus[GRID_SIZE][GRID_SIZE] = {
- {NO_HOLE, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, PEGGED},
- {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
- {NO_HOLE, PEGGED, EMPTY, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
- {NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE},
- {NO_HOLE, PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
- {NO_HOLE, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
- {PEGGED, PEGGED, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE, NO_HOLE},
-};
-static char Board_CrossPlus[GRID_SIZE][GRID_SIZE] = {
- {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
- {NO_HOLE, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, NO_HOLE},
- {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
- {PEGGED, PEGGED, PEGGED, EMPTY, PEGGED, PEGGED, PEGGED},
- {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
- {NO_HOLE, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, NO_HOLE},
- {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
-};
-static int8 Board_Cross[GRID_SIZE][GRID_SIZE] = {
- {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
- {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
- {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
- {PEGGED, PEGGED, PEGGED, EMPTY, PEGGED, PEGGED, PEGGED},
- {PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED, PEGGED},
- {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
- {NO_HOLE, NO_HOLE, PEGGED, PEGGED, PEGGED, NO_HOLE, NO_HOLE},
-};
-
} // namespace Peggle
} // namespace HodjNPodj
} // namespace Bagel
diff --git a/engines/bagel/hodjnpodj/poker/poker.cpp b/engines/bagel/hodjnpodj/poker/poker.cpp
index 7493a9bef23..c8115c16db2 100644
--- a/engines/bagel/hodjnpodj/poker/poker.cpp
+++ b/engines/bagel/hodjnpodj/poker/poker.cpp
@@ -63,10 +63,6 @@ namespace Poker {
#define MAXBET 10000
-void PlayEasterEgg(CDC *pDC, CWnd *pWnd, CPalette *pPalette,
- const char *pszAnimFile, const char *pszSoundFile,
- int nNumCels, int nXLoc, int nYLoc, int nSleep, bool bPlaySound);
-
extern CMainPokerWindow *pcwndPoker;
CPalette *pGamePalette = nullptr; // Palette to be used throughout the game
Commit: ad9922b9712b689a7d21535d45dbd4a9ec37d827
https://github.com/scummvm/scummvm/commit/ad9922b9712b689a7d21535d45dbd4a9ec37d827
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-14T22:39:18-07:00
Commit Message:
BAGEL: DEMO: Don't enable Options button for Peggleboz
Changed paths:
engines/bagel/hodjnpodj/peggle/optsub.cpp
diff --git a/engines/bagel/hodjnpodj/peggle/optsub.cpp b/engines/bagel/hodjnpodj/peggle/optsub.cpp
index bed49bc4900..d0358b62545 100644
--- a/engines/bagel/hodjnpodj/peggle/optsub.cpp
+++ b/engines/bagel/hodjnpodj/peggle/optsub.cpp
@@ -26,6 +26,7 @@
#include "bagel/hodjnpodj/hnplibs/button.h"
#include "bagel/hodjnpodj/peggle/options.h"
#include "bagel/hodjnpodj/peggle/resource.h"
+#include "bagel/hodjnpodj/hodjnpodj.h"
namespace Bagel {
namespace HodjNPodj {
@@ -187,24 +188,24 @@ bool COptions::OnInitDialog() {
bSuccess = (*pCancelButton).SetControl(IDC_SUB_CANCEL, this);
}
- #if DEMO_FLAG
- if (m_iDlgId == IDD_OPTIONS_DIALOG) {
- pButton = GetDlgItem(IDC_OPTIONS_OPTIONS); // get the window for the options button
- ASSERT(pButton != nullptr); // ... and verify we have it
- (*pButton).EnableWindow(false);
- }
- #else
- if ((*pGameInfo).bPlayingMetagame) {
+ if (g_engine->isDemo()) {
if (m_iDlgId == IDD_OPTIONS_DIALOG) {
pButton = GetDlgItem(IDC_OPTIONS_OPTIONS); // get the window for the options button
ASSERT(pButton != nullptr); // ... and verify we have it
(*pButton).EnableWindow(false);
- pButton = GetDlgItem(IDC_OPTIONS_NEWGAME); // get the window for the options button
- ASSERT(pButton != nullptr); // ... and verify we have it
- (*pButton).EnableWindow(false);
+ }
+ } else {
+ if ((*pGameInfo).bPlayingMetagame) {
+ if (m_iDlgId == IDD_OPTIONS_DIALOG) {
+ pButton = GetDlgItem(IDC_OPTIONS_OPTIONS); // get the window for the options button
+ ASSERT(pButton != nullptr); // ... and verify we have it
+ (*pButton).EnableWindow(false);
+ pButton = GetDlgItem(IDC_OPTIONS_NEWGAME); // get the window for the options button
+ ASSERT(pButton != nullptr); // ... and verify we have it
+ (*pButton).EnableWindow(false);
+ }
}
}
- #endif
(void)bSuccess; // suppress unused variable warning
More information about the Scummvm-git-logs
mailing list