[Scummvm-git-logs] scummvm master -> c89c9cc751e8d069d9b180c1b2b62dcb4bda4e5f
bluegr
noreply at scummvm.org
Sat Sep 6 22:02:59 UTC 2025
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
8ece46c294 BAGEL: VOID -> void
28448b5fe6 BAGEL: DWORD -> uint32
f03c0fb7c5 BAGEL: CHAR -> char and FLOAT -> float
6e1be64fad BAGEL: INT -> int, SIZE_T -> size_t, LONG -> long
517514c6aa BAGEL: Fix the parameter types of LineDDA()
2254bfc0b7 BAGEL: LPINT -> int *, Fix spacing
49688b9972 BAGEL: LPVOID -> void *
7bdda2ff77 BAGEL: Fix change from conflict resolution
c89c9cc751 BAGEL: Fix parameter type
Commit: 8ece46c294ca0e35d9639c2e34eb4cd9b864f3c7
https://github.com/scummvm/scummvm/commit/8ece46c294ca0e35d9639c2e34eb4cd9b864f3c7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:21+03:00
Commit Message:
BAGEL: VOID -> void
Changed paths:
engines/bagel/boflib/misc.cpp
engines/bagel/boflib/misc.h
engines/bagel/hodjnpodj/archeroids/main.cpp
engines/bagel/hodjnpodj/archeroids/main.h
engines/bagel/hodjnpodj/archeroids/usercfg.cpp
engines/bagel/hodjnpodj/artparts/artparts.h
engines/bagel/hodjnpodj/barbershop/main.cpp
engines/bagel/hodjnpodj/barbershop/main.h
engines/bagel/hodjnpodj/battlefish/bfish.cpp
engines/bagel/hodjnpodj/battlefish/bfish.h
engines/bagel/hodjnpodj/battlefish/usercfg.cpp
engines/bagel/hodjnpodj/battlefish/usercfg.h
engines/bagel/hodjnpodj/crypt/main.cpp
engines/bagel/hodjnpodj/crypt/main.h
engines/bagel/hodjnpodj/dfa/dfa.cpp
engines/bagel/hodjnpodj/fuge/fuge.cpp
engines/bagel/hodjnpodj/fuge/fuge.h
engines/bagel/hodjnpodj/fuge/usercfg.cpp
engines/bagel/hodjnpodj/fuge/usercfg.h
engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
engines/bagel/hodjnpodj/hnplibs/audiocfg.h
engines/bagel/hodjnpodj/hnplibs/stdinc.h
engines/bagel/hodjnpodj/life/game.cpp
engines/bagel/hodjnpodj/mankala/mnk.h
engines/bagel/hodjnpodj/mankala/mnkui.cpp
engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
engines/bagel/hodjnpodj/metagame/bgen/bgb.h
engines/bagel/hodjnpodj/metagame/bgen/bgen.h
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
engines/bagel/hodjnpodj/metagame/saves/savedlg.h
engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
engines/bagel/hodjnpodj/novacancy/main.cpp
engines/bagel/hodjnpodj/novacancy/main.h
engines/bagel/hodjnpodj/pdq/game.cpp
engines/bagel/hodjnpodj/pdq/game.h
engines/bagel/hodjnpodj/pdq/guess.h
engines/bagel/hodjnpodj/pdq/main.cpp
engines/bagel/hodjnpodj/pdq/main.h
engines/bagel/hodjnpodj/pdq/usercfg.cpp
engines/bagel/hodjnpodj/riddles/riddles.cpp
engines/bagel/hodjnpodj/riddles/riddles.h
engines/bagel/hodjnpodj/riddles/usercfg.cpp
engines/bagel/mfc/wingdi.cpp
engines/bagel/mfc/wingdi.h
engines/bagel/mfc/winnt.h
diff --git a/engines/bagel/boflib/misc.cpp b/engines/bagel/boflib/misc.cpp
index 32d64b77907..bf07df3d077 100644
--- a/engines/bagel/boflib/misc.cpp
+++ b/engines/bagel/boflib/misc.cpp
@@ -415,7 +415,7 @@ CHAR *StriStr(CHAR *s1, const CHAR *s2) {
return (p);
}
-VOID StrUprStr(CHAR *s1, const CHAR *s2) {
+void StrUprStr(CHAR *s1, const CHAR *s2) {
CHAR *p;
INT i, n;
@@ -449,7 +449,7 @@ VOID StrUprStr(CHAR *s1, const CHAR *s2) {
* returns Nothing
*
**/
-VOID StrCpyStripChar(CHAR *dest, const CHAR *source, CHAR c) {
+void StrCpyStripChar(CHAR *dest, const CHAR *source, CHAR c) {
/* can't access null pointers */
assert(dest != nullptr);
assert(source != nullptr);
diff --git a/engines/bagel/boflib/misc.h b/engines/bagel/boflib/misc.h
index e1b83e8d027..d7720661912 100644
--- a/engines/bagel/boflib/misc.h
+++ b/engines/bagel/boflib/misc.h
@@ -114,8 +114,8 @@ extern INT StrFreqMatch(const CHAR *, const CHAR *);
extern BOOL StrCompare(const CHAR *, const CHAR *, UINT);
extern INT StrCharCount(const CHAR *, CHAR);
extern CHAR *StriStr(CHAR *, const CHAR *);
-extern VOID StrUprStr(CHAR *, const CHAR *);
-extern VOID StrCpyStripChar(CHAR *, const CHAR *, CHAR);
+extern void StrUprStr(CHAR *, const CHAR *);
+extern void StrCpyStripChar(CHAR *, const CHAR *, CHAR);
extern CHAR *StrStripChar(CHAR *, CHAR);
extern CHAR *StrReplaceChar(CHAR *, CHAR, CHAR);
diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index 48c80e1a799..842cd636c23 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -138,7 +138,7 @@ const CHAR *INI_SECTION = "Archeroids";
// Local prototypes
//
-VOID CALLBACK GetGameParams(CWnd *);
+void CALLBACK GetGameParams(CWnd *);
//
// Globals
@@ -443,7 +443,7 @@ CMainWindow::CMainWindow() {
}
-VOID CMainWindow::InitializeJoystick(VOID) {
+void CMainWindow::InitializeJoystick(void) {
JOYINFO joyInfo;
if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, TRUE) == JOYERR_NOERROR) {
@@ -461,7 +461,7 @@ VOID CMainWindow::InitializeJoystick(VOID) {
}
-ERROR_CODE CMainWindow::LoadMasterSprites(VOID) {
+ERROR_CODE CMainWindow::LoadMasterSprites(void) {
CDC *pDC;
ERROR_CODE errCode;
@@ -746,7 +746,7 @@ ERROR_CODE CMainWindow::LoadMasterSprites(VOID) {
return errCode;
}
-VOID CMainWindow::ReleaseMasterSprites(VOID) {
+void CMainWindow::ReleaseMasterSprites(void) {
//
// free all master sprite objects
//
@@ -803,7 +803,7 @@ VOID CMainWindow::ReleaseMasterSprites(VOID) {
}
-ERROR_CODE CMainWindow::LoadMasterSounds(VOID) {
+ERROR_CODE CMainWindow::LoadMasterSounds(void) {
HANDLE hResInfo;
HINSTANCE hInst;
ERROR_CODE errCode;
@@ -909,7 +909,7 @@ ERROR_CODE CMainWindow::LoadMasterSounds(VOID) {
}
-VOID CMainWindow::ReleaseMasterSounds(VOID) {
+void CMainWindow::ReleaseMasterSounds(void) {
if (m_hExtraLifeRes != nullptr) {
FreeResource(m_hExtraLifeRes);
m_hExtraLifeRes = nullptr;
@@ -943,7 +943,7 @@ void CMainWindow::OnPaint() {
}
-VOID CMainWindow::PaintScreen() {
+void CMainWindow::PaintScreen() {
CDC *pDC;
ERROR_CODE errCode;
@@ -1444,7 +1444,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
}
-POINT CMainWindow::GetLeftMostBadGuy(VOID) {
+POINT CMainWindow::GetLeftMostBadGuy(void) {
POINT ptTmp, ptBest;
CLList *pList;
@@ -1684,7 +1684,7 @@ ERROR_CODE CMainWindow::CreateBadGuys() {
* RETURNS: nothing
*
*****************************************************************************/
-VOID CMainWindow::PlayGame(VOID) {
+void CMainWindow::PlayGame(void) {
ERROR_CODE errCode;
errCode = ERR_NONE; // assume no error
@@ -1724,7 +1724,7 @@ VOID CMainWindow::PlayGame(VOID) {
HandleError(errCode);
}
-VOID CMainWindow::PlayNextWave(VOID) {
+void CMainWindow::PlayNextWave(void) {
ERROR_CODE errCode;
// assume no error
@@ -1745,7 +1745,7 @@ VOID CMainWindow::PlayNextWave(VOID) {
HandleError(errCode);
}
-VOID CMainWindow::WaveReset(VOID) {
+void CMainWindow::WaveReset(void) {
CDC *pDC;
INT i;
@@ -1876,7 +1876,7 @@ void CMainWindow::GameReset() {
m_nWave = 0; // reset to Wave 1
}
-VOID CMainWindow::KillAnimation(VOID) {
+void CMainWindow::KillAnimation(void) {
CLList *pList;
// delete the Special FX list
@@ -1892,7 +1892,7 @@ VOID CMainWindow::KillAnimation(VOID) {
}
-VOID CMainWindow::LoadIniSettings() {
+void CMainWindow::LoadIniSettings() {
INT nVal;
if (pGameParams->bPlayingMetagame) {
@@ -1962,7 +1962,7 @@ VOID CMainWindow::LoadIniSettings() {
}
-VOID CMainWindow::OnTimer(UINT_PTR nEventID) {
+void CMainWindow::OnTimer(UINT_PTR nEventID) {
KillTimer(nEventID);
while (m_bTimerActive) {
@@ -2248,7 +2248,7 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
return FALSE;
}
-BOOL CMainWindow::CheckMessages(VOID) {
+BOOL CMainWindow::CheckMessages(void) {
JOYINFO joyInfo;
MSG msg;
BOOL bEndTask = FALSE;
@@ -2565,7 +2565,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
}
-VOID CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
+void CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
CHAR szTmpBuf[40];
CSprite *pSprite;
//CSound *pSound;
@@ -2680,7 +2680,7 @@ VOID CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
}
}
-VOID CMainWindow::PruneDeadBadGuys() {
+void CMainWindow::PruneDeadBadGuys() {
CLList *pList, *pNext;
CSprite *pSprite;
@@ -2707,7 +2707,7 @@ VOID CMainWindow::PruneDeadBadGuys() {
}
}
-VOID CMainWindow::DestroyBadGuy(CLList *pList, CDC *pDC) {
+void CMainWindow::DestroyBadGuy(CLList *pList, CDC *pDC) {
CSprite *pSprite, *pNewSprite;
CLList *pNewList;
POINT point;
@@ -2803,7 +2803,7 @@ VOID CMainWindow::DestroyBadGuy(CLList *pList, CDC *pDC) {
}
}
-VOID CMainWindow::DestroyHay(CLList *pList, CRect rect, CDC *pDC, BOOL bAnimate) {
+void CMainWindow::DestroyHay(CLList *pList, CRect rect, CDC *pDC, BOOL bAnimate) {
CSprite *pSprite;
CRect tmpRect, overlappedRect;
POINT ptTmp, point;
@@ -2874,7 +2874,7 @@ VOID CMainWindow::DestroyHay(CLList *pList, CRect rect, CDC *pDC, BOOL bAnimate)
}
}
-VOID CMainWindow::DestroyGoodArrow(CLList *pList) {
+void CMainWindow::DestroyGoodArrow(CLList *pList) {
// can't access a null pointer
assert(pList != nullptr);
@@ -2897,7 +2897,7 @@ VOID CMainWindow::DestroyGoodArrow(CLList *pList) {
}
-VOID CMainWindow::DestroyBadArrow(CLList *pList) {
+void CMainWindow::DestroyBadArrow(CLList *pList) {
// can't access a null pointer
assert(pList != nullptr);
@@ -2920,7 +2920,7 @@ VOID CMainWindow::DestroyBadArrow(CLList *pList) {
}
-VOID CMainWindow::DeleteSprite(CSprite *pSprite) {
+void CMainWindow::DeleteSprite(CSprite *pSprite) {
CDC *pDC;
// can't delete a null pointer
@@ -3048,7 +3048,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
}
}
-VOID CMainWindow::MoveHodj(INT y) {
+void CMainWindow::MoveHodj(INT y) {
POINT point;
CDC *pDC;
@@ -3094,7 +3094,7 @@ VOID CMainWindow::MoveHodj(INT y) {
}
-VOID CMainWindow::HandleError(ERROR_CODE errCode) {
+void CMainWindow::HandleError(ERROR_CODE errCode) {
//
// Exit this application on fatal errors
//
@@ -3115,7 +3115,7 @@ VOID CMainWindow::HandleError(ERROR_CODE errCode) {
}
-VOID CMainWindow::OnClose() {
+void CMainWindow::OnClose() {
CBrush myBrush;
CRect myRect;
CDC *pDC;
@@ -3195,7 +3195,7 @@ LONG CMainWindow::OnJoyStick(UINT wParam, LONG lParam) {
return 0;
}
-VOID CMainWindow::GamePause(VOID) {
+void CMainWindow::GamePause(void) {
m_bPause = TRUE;
if (m_bMoveMode) {
m_bMoveMode = FALSE;
@@ -3204,7 +3204,7 @@ VOID CMainWindow::GamePause(VOID) {
};
-VOID CMainWindow::GameResume(VOID) {
+void CMainWindow::GameResume(void) {
m_bPause = FALSE;
if (m_bMoveMode)
@@ -3293,7 +3293,7 @@ void CMainWindow::OnSoundNotify(CSound *) {
//
}
-VOID CMainWindow::FlushInputEvents(VOID) {
+void CMainWindow::FlushInputEvents(void) {
MSG msg;
// find and remove all keyboard events
@@ -3332,7 +3332,7 @@ BEGIN_MESSAGE_MAP(CMainWindow, CFrameWnd)
END_MESSAGE_MAP()
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
//
// Our user preference dialog box is self contained in this object
//
diff --git a/engines/bagel/hodjnpodj/archeroids/main.h b/engines/bagel/hodjnpodj/archeroids/main.h
index f55f7f450df..a4d99d51039 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.h
+++ b/engines/bagel/hodjnpodj/archeroids/main.h
@@ -38,61 +38,61 @@ namespace Archeroids {
class CMainWindow : public CFrameWnd {
public:
CMainWindow();
- VOID PlayGame(VOID);
- VOID PlayNextWave(VOID);
- VOID PaintScreen(VOID);
+ void PlayGame(void);
+ void PlayNextWave(void);
+ void PaintScreen(void);
ERROR_CODE RepaintSpriteList(CDC *);
- VOID LoadIniSettings(VOID);
- BOOL MainLoop(VOID);
+ void LoadIniSettings(void);
+ BOOL MainLoop(void);
protected:
- VOID FlushInputEvents(VOID);
- BOOL CheckMessages(VOID);
- ERROR_CODE LoadMasterSprites(VOID);
- VOID ReleaseMasterSprites(VOID);
- ERROR_CODE LoadMasterSounds(VOID);
- VOID ReleaseMasterSounds(VOID);
- VOID InitializeJoystick(VOID);
- VOID GameReset(VOID);
- VOID WaveReset(VOID);
+ void FlushInputEvents(void);
+ BOOL CheckMessages(void);
+ ERROR_CODE LoadMasterSprites(void);
+ void ReleaseMasterSprites(void);
+ ERROR_CODE LoadMasterSounds(void);
+ void ReleaseMasterSounds(void);
+ void InitializeJoystick(void);
+ void GameReset(void);
+ void WaveReset(void);
CSprite *NewLife(INT);
- ERROR_CODE CreateLives(VOID);
- ERROR_CODE CreateGoodGuy(VOID);
- ERROR_CODE CreateBadGuys(VOID);
- ERROR_CODE CreateHay(VOID);
+ ERROR_CODE CreateLives(void);
+ ERROR_CODE CreateGoodGuy(void);
+ ERROR_CODE CreateBadGuys(void);
+ ERROR_CODE CreateHay(void);
ERROR_CODE CreateBurningHay(CPoint);
- ERROR_CODE CreateGoodArrow(VOID);
+ ERROR_CODE CreateGoodArrow(void);
ERROR_CODE CreateBadArrow(CSprite *);
- VOID GamePause(VOID);
- VOID GameResume(VOID);
-
- VOID DestroyGoodArrow(CLList *);
- VOID DestroyBadArrow(CLList *);
- VOID DestroyBadGuy(CLList *, CDC *);
- VOID PruneDeadBadGuys(VOID);
- VOID DestroyHay(CLList *, CRect, CDC *, BOOL);
- VOID DeleteSprite(CSprite *);
+ void GamePause(void);
+ void GameResume(void);
+
+ void DestroyGoodArrow(CLList *);
+ void DestroyBadArrow(CLList *);
+ void DestroyBadGuy(CLList *, CDC *);
+ void PruneDeadBadGuys(void);
+ void DestroyHay(CLList *, CRect, CDC *, BOOL);
+ void DeleteSprite(CSprite *);
BOOL MoveArrows(CDC *);
BOOL MoveBadGuys(CDC *);
- VOID MoveHodj(INT);
- VOID LoseLife(CDC *, BOOL);
- VOID HandleError(ERROR_CODE);
- VOID KillAnimation(VOID);
- VOID OnSoundNotify(CSound *pSound);
- POINT GetLeftMostBadGuy(VOID);
+ void MoveHodj(INT);
+ void LoseLife(CDC *, BOOL);
+ void HandleError(ERROR_CODE);
+ void KillAnimation(void);
+ void OnSoundNotify(CSound *pSound);
+ POINT GetLeftMostBadGuy(void);
virtual BOOL OnCommand(WPARAM, LPARAM) override;
- VOID OnPaint(VOID);
- VOID OnSysKeyDown(UINT, UINT, UINT);
- VOID OnKeyDown(UINT, UINT, UINT);
- VOID OnSysChar(UINT, UINT, UINT);
- VOID OnTimer(UINT_PTR);
- VOID OnClose(void);
+ void OnPaint(void);
+ void OnSysKeyDown(UINT, UINT, UINT);
+ void OnKeyDown(UINT, UINT, UINT);
+ void OnSysChar(UINT, UINT, UINT);
+ void OnTimer(UINT_PTR);
+ void OnClose(void);
LONG OnJoyStick(UINT, LONG);
- VOID OnActivate(UINT, CWnd *, BOOL) override;
- VOID OnLButtonDown(UINT, CPoint);
- VOID OnRButtonUp(UINT, CPoint);
- VOID OnMouseMove(UINT, CPoint);
+ void OnActivate(UINT, CWnd *, BOOL) override;
+ void OnLButtonDown(UINT, CPoint);
+ void OnRButtonUp(UINT, CPoint);
+ void OnMouseMove(UINT, CPoint);
LRESULT OnMCINotify(WPARAM, LPARAM);
LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
index 93ad1b4be4f..8caf9308b0e 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
@@ -134,7 +134,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
}
-VOID CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
CHAR szBuf[40];
CDC *pDC;
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.h b/engines/bagel/hodjnpodj/artparts/artparts.h
index 947136a3918..df20819be7a 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.h
+++ b/engines/bagel/hodjnpodj/artparts/artparts.h
@@ -175,7 +175,7 @@ private:
private:
void initStatics();
- VOID OnSoundNotify(CSound *pSound);
+ void OnSoundNotify(CSound *pSound);
static BOOL CopyPaletteContents(CPalette *pSource, CPalette *pDest);
void MyFocusRect(CDC *pDC, CRect rect, int nDrawMode);
static void GetSubOptions(CWnd *pParentWind);
diff --git a/engines/bagel/hodjnpodj/barbershop/main.cpp b/engines/bagel/hodjnpodj/barbershop/main.cpp
index 302d17202e1..7e383202a46 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/main.cpp
@@ -67,7 +67,7 @@ namespace Barbershop {
// Local Prototypes
//
-VOID CALLBACK GetGameParams(CWnd *);
+void CALLBACK GetGameParams(CWnd *);
//
// Globals
@@ -78,7 +78,7 @@ int g_nCardBack;
extern HWND ghParentWnd;
-CMainWindow::CMainWindow(VOID) {
+CMainWindow::CMainWindow(void) {
CString WndClass;
CRect tmpRect;
CDC *pDC = nullptr;
@@ -251,7 +251,7 @@ CMainWindow::CMainWindow(VOID) {
HandleError(errCode);
}
-VOID CMainWindow::HandleError(ERROR_CODE errCode) {
+void CMainWindow::HandleError(ERROR_CODE errCode) {
//
// Exit this application on fatal errors
//
@@ -272,7 +272,7 @@ VOID CMainWindow::HandleError(ERROR_CODE errCode) {
}
-VOID CMainWindow::OnPaint() {
+void CMainWindow::OnPaint() {
PAINTSTRUCT lpPaint;
Invalidate(FALSE);
@@ -282,7 +282,7 @@ VOID CMainWindow::OnPaint() {
}
-VOID CMainWindow::PaintScreen() {
+void CMainWindow::PaintScreen() {
//CSprite *pSprite;
CDibDoc myDoc;
CRect rcDest;
@@ -432,15 +432,15 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
}
-VOID CMainWindow::GamePause(VOID) {
+void CMainWindow::GamePause(void) {
m_bPause = TRUE;
}
-VOID CMainWindow::GameResume(VOID) {
+void CMainWindow::GameResume(void) {
m_bPause = FALSE;
}
-VOID CMainWindow::PlayGame() {
+void CMainWindow::PlayGame() {
CDC *pDC;
ERROR_CODE errCode;
@@ -480,20 +480,20 @@ VOID CMainWindow::PlayGame() {
HandleError(errCode);
}
-VOID CMainWindow::LoadIniSettings(VOID) {
+void CMainWindow::LoadIniSettings(void) {
}
-VOID CMainWindow::SaveIniSettings(VOID) {
+void CMainWindow::SaveIniSettings(void) {
}
-VOID CMainWindow::GameReset(VOID) {
+void CMainWindow::GameReset(void) {
//sndPlaySound(nullptr, SND_SYNC); // stop all sounds
}
-VOID CMainWindow::OnTimer(UINT_PTR nEvent) {
+void CMainWindow::OnTimer(UINT_PTR nEvent) {
//CDC *pDC;
// continue as long as there is a currently active non-paused game
@@ -504,7 +504,7 @@ VOID CMainWindow::OnTimer(UINT_PTR nEvent) {
}
-VOID CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
CDC *pDC;
SetCursor(LoadCursor(nullptr, IDC_ARROW));
@@ -517,7 +517,7 @@ VOID CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
}
-VOID CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
CPoint UndoPoint(UNDO_LEF + (UNDO_RIG - UNDO_LEF) / 2, UNDO_TOP + (UNDO_BOT - UNDO_TOP) / 2);
if (m_pBarb->m_pCrd != nullptr) // r we currently moving a card?
@@ -532,7 +532,7 @@ VOID CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
}
}
-VOID CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
CDC *pDC;
char buf[32];
CRect tmpRect;
@@ -636,7 +636,7 @@ VOID CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
}
-VOID CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
char buf[32];
CRect tmpRect;
@@ -744,7 +744,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
point = CPoint(0, 0);
}
-VOID CMainWindow::DeleteSprite(CSprite *pSprite) {
+void CMainWindow::DeleteSprite(CSprite *pSprite) {
CDC *pDC;
// can't delete a null pointer
@@ -878,7 +878,7 @@ LRESULT CMainWindow::OnMMIONotify(WPARAM wParam, LPARAM lParam) {
return 0;
}
-VOID CMainWindow::OnClose() {
+void CMainWindow::OnClose() {
CDC *pDC = GetDC();
CRect rctFillRect(0, 0, GAME_WIDTH, GAME_HEIGHT);
CBrush Brush(RGB(0, 0, 0));
@@ -947,7 +947,7 @@ BEGIN_MESSAGE_MAP(CMainWindow, CFrameWnd)
ON_MESSAGE(MM_WOM_DONE, CMainWindow::OnMMIONotify)
END_MESSAGE_MAP()
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
//
// Our user preference dialog box is self contained in this object
//
diff --git a/engines/bagel/hodjnpodj/barbershop/main.h b/engines/bagel/hodjnpodj/barbershop/main.h
index d4b7ce97c5c..b1b24bcbb1e 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.h
+++ b/engines/bagel/hodjnpodj/barbershop/main.h
@@ -44,35 +44,35 @@ private:
BOOL m_bMIDIPlaying;
public:
- CMainWindow(VOID);
- VOID PlayGame(VOID);
- VOID PaintScreen(VOID);
- VOID LoadIniSettings(VOID);
- VOID SaveIniSettings(VOID);
+ CMainWindow(void);
+ void PlayGame(void);
+ void PaintScreen(void);
+ void LoadIniSettings(void);
+ void SaveIniSettings(void);
void FlushInputEvents();
LRESULT OnMCINotify(WPARAM, LPARAM);
LRESULT OnMMIONotify(WPARAM, LPARAM);
protected:
- VOID GameReset(VOID);
- VOID GamePause(VOID);
- VOID GameResume(VOID);
+ void GameReset(void);
+ void GamePause(void);
+ void GameResume(void);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
- VOID HandleError(ERROR_CODE);
- VOID DeleteSprite(CSprite *);
+ void HandleError(ERROR_CODE);
+ void DeleteSprite(CSprite *);
- VOID OnPaint(VOID);
- VOID OnTimer(UINT_PTR);
- VOID OnMouseMove(UINT, CPoint);
- VOID OnLButtonDown(UINT, CPoint);
- VOID OnLButtonDblClk(UINT, CPoint);
- VOID OnRButtonDown(UINT, CPoint);
- VOID OnSysChar(UINT, UINT, UINT);
- VOID OnSysKeyDown(UINT, UINT, UINT);
- VOID OnKeyDown(UINT, UINT, UINT);
- VOID OnActivate(UINT, CWnd *, BOOL) override;
- VOID OnClose(VOID);
- VOID OnLButtonUp(UINT, CPoint);
+ void OnPaint(void);
+ void OnTimer(UINT_PTR);
+ void OnMouseMove(UINT, CPoint);
+ void OnLButtonDown(UINT, CPoint);
+ void OnLButtonDblClk(UINT, CPoint);
+ void OnRButtonDown(UINT, CPoint);
+ void OnSysChar(UINT, UINT, UINT);
+ void OnSysKeyDown(UINT, UINT, UINT);
+ void OnKeyDown(UINT, UINT, UINT);
+ void OnActivate(UINT, CWnd *, BOOL) override;
+ void OnClose(void);
+ void OnLButtonUp(UINT, CPoint);
DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index 9f625390764..3ad9768268e 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -229,7 +229,7 @@ STATIC const CHAR *pszFishSound[MAX_FISH] = {
// Local Prototypes
//
-VOID CALLBACK GetGameParams(CWnd *);
+void CALLBACK GetGameParams(CWnd *);
//
// Globals
@@ -284,7 +284,7 @@ POINT gRightGrid[GRID_ROWS][GRID_COLS] = {
* None
*
****************************************************************/
-CBFishWindow::CBFishWindow(VOID) {
+CBFishWindow::CBFishWindow(void) {
CString WndClass;
CRect tmpRect;
CDC *pDC;
@@ -451,7 +451,7 @@ CBFishWindow::CBFishWindow(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::HandleError(ERROR_CODE errCode) {
+void CBFishWindow::HandleError(ERROR_CODE errCode) {
//
// Exit this application on fatal errors
//
@@ -471,7 +471,7 @@ VOID CBFishWindow::HandleError(ERROR_CODE errCode) {
}
}
-ERROR_CODE CBFishWindow::LoadMasterSprites(VOID) {
+ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
CDC *pDC;
INT i;
ERROR_CODE errCode;
@@ -649,7 +649,7 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(VOID) {
}
-VOID CBFishWindow::ReleaseMasterSprites(VOID) {
+void CBFishWindow::ReleaseMasterSprites(void) {
INT i;
// free the hooked fish, and the users fish
@@ -718,7 +718,7 @@ VOID CBFishWindow::ReleaseMasterSprites(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::OnPaint() {
+void CBFishWindow::OnPaint() {
PAINTSTRUCT lpPaint;
Invalidate(FALSE);
@@ -745,7 +745,7 @@ VOID CBFishWindow::OnPaint() {
* None
*
****************************************************************/
-VOID CBFishWindow::PaintScreen() {
+void CBFishWindow::PaintScreen() {
CDibDoc myDoc;
CRect rcDest;
CRect rcDIB;
@@ -1028,7 +1028,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
return FALSE;
}
-VOID CBFishWindow::PlaceTurnHarpoons(VOID) {
+void CBFishWindow::PlaceTurnHarpoons(void) {
CSprite *pSprite;
CDC *pDC;
INT i;
@@ -1062,7 +1062,7 @@ VOID CBFishWindow::PlaceTurnHarpoons(VOID) {
HandleError(errCode);
}
-VOID CBFishWindow::RemoveTurnHarpoon(VOID) {
+void CBFishWindow::RemoveTurnHarpoon(void) {
assert(m_nTurns >= 0 && m_nTurns < MAX_TURNS);
assert(m_pHarpoons[m_nTurns] != nullptr);
@@ -1088,7 +1088,7 @@ VOID CBFishWindow::RemoveTurnHarpoon(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::GamePause(VOID) {
+void CBFishWindow::GamePause(void) {
m_bPause = TRUE;
};
@@ -1110,7 +1110,7 @@ VOID CBFishWindow::GamePause(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::GameResume(VOID) {
+void CBFishWindow::GameResume(void) {
m_bPause = FALSE;
};
@@ -1132,7 +1132,7 @@ VOID CBFishWindow::GameResume(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::PlayGame(VOID) {
+void CBFishWindow::PlayGame(void) {
CRect rTmpRect;
CDC *pDC;
INT i;
@@ -1193,7 +1193,7 @@ VOID CBFishWindow::PlayGame(VOID) {
}
-VOID CBFishWindow::PlaceUserFish(VOID) {
+void CBFishWindow::PlaceUserFish(void) {
//
// Initiate User-Edit-Mode (Allow user to drag and drop fish to grid)
//
@@ -1201,7 +1201,7 @@ VOID CBFishWindow::PlaceUserFish(VOID) {
}
-VOID CBFishWindow::PlaceEnemyFish(VOID) {
+void CBFishWindow::PlaceEnemyFish(void) {
INT i, j, k;
INT row, col, rowTmp, colTmp;
BOOL bFound;
@@ -1308,7 +1308,7 @@ VOID CBFishWindow::PlaceEnemyFish(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::LoadIniSettings(VOID) {
+void CBFishWindow::LoadIniSettings(void) {
INT nVal;
if (pGameParams->bPlayingMetagame) {
@@ -1369,7 +1369,7 @@ VOID CBFishWindow::LoadIniSettings(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::SaveIniSettings(VOID) {
+void CBFishWindow::SaveIniSettings(void) {
}
@@ -1390,7 +1390,7 @@ VOID CBFishWindow::SaveIniSettings(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::GameReset(VOID) {
+void CBFishWindow::GameReset(void) {
CDC *pDC;
INT i;
@@ -1577,7 +1577,7 @@ void CBFishWindow::RotateFish(INT nFishIndex) {
}
}
-VOID CBFishWindow::AssignFishToGrid(INT nFishIndex) {
+void CBFishWindow::AssignFishToGrid(INT nFishIndex) {
CPoint point;
INT i, nRow, nCol, nRowTmp, nColTmp;
@@ -1703,7 +1703,7 @@ INT CBFishWindow::GetFishIndex(CSprite *pSprite) {
* None
*
****************************************************************/
-VOID CBFishWindow::OnRButtonDown(UINT, CPoint point) {
+void CBFishWindow::OnRButtonDown(UINT, CPoint point) {
CRect tmpRect;
INT i;
@@ -1748,7 +1748,7 @@ VOID CBFishWindow::OnRButtonDown(UINT, CPoint point) {
* None
*
****************************************************************/
-VOID CBFishWindow::OnLButtonDown(UINT, CPoint point) {
+void CBFishWindow::OnLButtonDown(UINT, CPoint point) {
CRect tmpRect,
winRect,
trawlerRect,
@@ -2089,7 +2089,7 @@ BOOL CBFishWindow::OkToPlaceFish(INT nFishIndex, CPoint point, BOOL bRotated) {
return bOk;
}
-VOID CBFishWindow::PlaceFish(INT nFishIndex, CPoint point) {
+void CBFishWindow::PlaceFish(INT nFishIndex, CPoint point) {
INT i, nRow, nCol, nGridIndex, nID;
nID = IndexToId(nFishIndex);
@@ -2189,7 +2189,7 @@ CPoint CBFishWindow::SnapToGrid(CPoint point) {
* None
*
****************************************************************/
-VOID CBFishWindow::OnMouseMove(UINT, CPoint point) {
+void CBFishWindow::OnMouseMove(UINT, CPoint point) {
CSize size;
HCURSOR hCursor;
CDC *pDC;
@@ -2216,7 +2216,7 @@ VOID CBFishWindow::OnMouseMove(UINT, CPoint point) {
}
-VOID CBFishWindow::UsersTurn(INT nGridIndex) {
+void CBFishWindow::UsersTurn(INT nGridIndex) {
//CSound *pSound;
INT nRow, nCol, nSquare;
INT nFishIndex;
@@ -2347,7 +2347,7 @@ VOID CBFishWindow::UsersTurn(INT nGridIndex) {
}
}
-VOID CBFishWindow::SinkEnemyFish(INT nFishIndex) {
+void CBFishWindow::SinkEnemyFish(INT nFishIndex) {
CSprite *pSprite;
CDC *pDC;
@@ -2370,7 +2370,7 @@ VOID CBFishWindow::SinkEnemyFish(INT nFishIndex) {
}
-VOID CBFishWindow::ComputersTurn(VOID) {
+void CBFishWindow::ComputersTurn(void) {
STATIC INT nLastRow, nLastCol;
//CSound *pSound;
INT nRow, nCol, nFishIndex, nGridIndex;
@@ -2494,7 +2494,7 @@ VOID CBFishWindow::ComputersTurn(VOID) {
}
-VOID CBFishWindow::SinkUserFish(INT nFishIndex) {
+void CBFishWindow::SinkUserFish(INT nFishIndex) {
INT i, nRow, nCol;
for (i = 0; i < GRID_ROWS * GRID_COLS; i++) {
@@ -2509,7 +2509,7 @@ VOID CBFishWindow::SinkUserFish(INT nFishIndex) {
}
-INT CBFishWindow::SelectRandomTarget(VOID) {
+INT CBFishWindow::SelectRandomTarget(void) {
INT n;
INT nRow, nCol;
@@ -2536,7 +2536,7 @@ INT CBFishWindow::SelectRandomTarget(VOID) {
}
-INT CBFishWindow::SelectBurningTarget(VOID) {
+INT CBFishWindow::SelectBurningTarget(void) {
INT i, nGridIndex, nRow, nCol;
BOOL bFound;
@@ -2565,7 +2565,7 @@ INT CBFishWindow::SelectBurningTarget(VOID) {
return nGridIndex;
}
-INT CBFishWindow::SelectBestFitTarget(VOID) {
+INT CBFishWindow::SelectBestFitTarget(void) {
INT nRow, nCol, nFishIndex, nGridIndex;
INT counter, i;
@@ -3183,7 +3183,7 @@ INT CBFishWindow::FindMatch(INT nLastHitRow, INT nLastHitCol) {
#endif
-VOID CBFishWindow::CreatePlume(CPoint point) {
+void CBFishWindow::CreatePlume(CPoint point) {
CDC *pDC;
CSprite *pSprite;
INT i;
@@ -3249,7 +3249,7 @@ VOID CBFishWindow::CreatePlume(CPoint point) {
}
-VOID CBFishWindow::CreateHarpoon(CPoint point) {
+void CBFishWindow::CreateHarpoon(CPoint point) {
CDC *pDC;
CSprite *pSprite;
INT i;
@@ -3394,7 +3394,7 @@ INT CBFishWindow::GetEnemyGridIndex(CPoint point) {
* None
*
****************************************************************/
-VOID CBFishWindow::DeleteSprite(CSprite *pSprite) {
+void CBFishWindow::DeleteSprite(CSprite *pSprite) {
CDC *pDC;
// can't delete a null pointer
@@ -3567,7 +3567,7 @@ void CBFishWindow::OnActivate(UINT nState, CWnd *, BOOL bMinimized) {
}
}
-VOID CBFishWindow::FlushInputEvents(VOID) {
+void CBFishWindow::FlushInputEvents(void) {
MSG msg;
// find and remove all keyboard events
@@ -3603,7 +3603,7 @@ VOID CBFishWindow::FlushInputEvents(VOID) {
* None
*
****************************************************************/
-VOID CBFishWindow::OnClose() {
+void CBFishWindow::OnClose() {
CBrush myBrush;
CRect rMyRect;
CDC *pDC;
@@ -3707,7 +3707,7 @@ BEGIN_MESSAGE_MAP(CBFishWindow, CFrameWnd)
ON_MESSAGE(MM_WOM_DONE, CBFishWindow::OnMMIONotify)
END_MESSAGE_MAP()
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
//
// Our user preference dialog box is self contained in this object
//
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index 1394de1a9b4..b8e4caece79 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -47,65 +47,65 @@ typedef struct {
class CBFishWindow : public CFrameWnd {
public:
- CBFishWindow(VOID);
- VOID PlayGame(VOID);
- VOID PaintScreen(VOID);
- VOID LoadIniSettings(VOID);
- VOID SaveIniSettings(VOID);
+ CBFishWindow(void);
+ void PlayGame(void);
+ void PaintScreen(void);
+ void LoadIniSettings(void);
+ void SaveIniSettings(void);
protected:
- VOID FlushInputEvents(VOID);
- VOID GameReset(VOID);
- VOID GamePause(VOID);
- VOID GameResume(VOID);
- VOID HandleError(ERROR_CODE);
- VOID DeleteSprite(CSprite *);
+ void FlushInputEvents(void);
+ void GameReset(void);
+ void GamePause(void);
+ void GameResume(void);
+ void HandleError(ERROR_CODE);
+ void DeleteSprite(CSprite *);
ERROR_CODE RepaintSpriteList(CDC *);
- ERROR_CODE LoadMasterSprites(VOID);
- VOID ReleaseMasterSprites(VOID);
- VOID PlaceUserFish(VOID);
- VOID PlaceEnemyFish(VOID);
- VOID RotateFish(INT);
- VOID AssignFishToGrid(INT);
+ ERROR_CODE LoadMasterSprites(void);
+ void ReleaseMasterSprites(void);
+ void PlaceUserFish(void);
+ void PlaceEnemyFish(void);
+ void RotateFish(INT);
+ void AssignFishToGrid(INT);
INT GetEnemyGridIndex(CPoint);
INT GetUserGridIndex(CPoint);
INT GetFishIndex(CSprite *);
BOOL OkToPlaceFish(INT, CPoint, BOOL);
- VOID PlaceFish(INT, CPoint);
+ void PlaceFish(INT, CPoint);
INT IndexToId(INT);
INT IdToIndex(INT);
CPoint SnapToGrid(CPoint);
- VOID UsersTurn(INT);
- VOID ComputersTurn(VOID);
- INT SelectRandomTarget(VOID);
- INT SelectBurningTarget(VOID);
- INT SelectBestFitTarget(VOID);
+ void UsersTurn(INT);
+ void ComputersTurn(void);
+ INT SelectRandomTarget(void);
+ INT SelectBurningTarget(void);
+ INT SelectBestFitTarget(void);
INT FindNeighborTarget(INT, INT);
INT FindTarget(INT, INT);
INT FindMatch(INT, INT);
BOOL FishFits(INT, INT, INT);
INT GetNeighbors(INT, INT);
- VOID CreatePlume(CPoint);
- VOID CreateHarpoon(CPoint);
- VOID SinkUserFish(INT);
- VOID SinkEnemyFish(INT);
- VOID PlaceTurnHarpoons(VOID);
- VOID RemoveTurnHarpoon(VOID);
+ void CreatePlume(CPoint);
+ void CreateHarpoon(CPoint);
+ void SinkUserFish(INT);
+ void SinkEnemyFish(INT);
+ void PlaceTurnHarpoons(void);
+ void RemoveTurnHarpoon(void);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
LRESULT OnMCINotify(WPARAM, LPARAM);
LRESULT OnMMIONotify(WPARAM, LPARAM);
- VOID OnSoundNotify(CSound *);
- VOID OnPaint(VOID);
- VOID OnMouseMove(UINT, CPoint);
- VOID OnRButtonDown(UINT, CPoint);
- VOID OnLButtonDown(UINT, CPoint);
- VOID OnLButtonUp(UINT, CPoint);
- VOID OnSysChar(UINT, UINT, UINT);
- VOID OnSysKeyDown(UINT, UINT, UINT);
- VOID OnKeyDown(UINT, UINT, UINT);
- VOID OnActivate(UINT, CWnd *, BOOL) override;
- VOID OnClose(VOID);
+ void OnSoundNotify(CSound *);
+ void OnPaint(void);
+ void OnMouseMove(UINT, CPoint);
+ void OnRButtonDown(UINT, CPoint);
+ void OnLButtonDown(UINT, CPoint);
+ void OnLButtonUp(UINT, CPoint);
+ void OnSysChar(UINT, UINT, UINT);
+ void OnSysKeyDown(UINT, UINT, UINT);
+ void OnKeyDown(UINT, UINT, UINT);
+ void OnActivate(UINT, CWnd *, BOOL) override;
+ void OnClose(void);
DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
index ab3485bdb41..872aca4fad8 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
@@ -195,7 +195,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
return CBmpDialog::OnCommand(wParam, lParam);
}
-VOID CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
switch (nSBCode) {
case SB_LEFT:
@@ -264,7 +264,7 @@ VOID CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
* None
*
****************************************************************/
-VOID CUserCfgDlg::LoadIniSettings(VOID) {
+void CUserCfgDlg::LoadIniSettings(void) {
INT nVal;
// Get the Difficulty level (0..2)
@@ -280,7 +280,7 @@ VOID CUserCfgDlg::LoadIniSettings(VOID) {
m_bUserGoesFirst = (nVal == 0 ? FALSE : TRUE);
}
-VOID CUserCfgDlg::SaveIniSettings() {
+void CUserCfgDlg::SaveIniSettings() {
WritePrivateProfileString(INI_SECTION,
"DifficultyLevel",
Common::String::format("%d", m_nDifficultyLevel).c_str(),
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.h b/engines/bagel/hodjnpodj/battlefish/usercfg.h
index fd319df5025..82fcdc0e1e2 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.h
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.h
@@ -50,8 +50,8 @@ protected:
void PutDlgData(void);
void GetDlgData(void);
void DispLimit(void);
- VOID LoadIniSettings(VOID);
- VOID SaveIniSettings(VOID);
+ void LoadIniSettings(void);
+ void SaveIniSettings(void);
void OnHScroll(UINT, UINT, CScrollBar *);
void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/crypt/main.cpp b/engines/bagel/hodjnpodj/crypt/main.cpp
index b0cbdc60449..00cbd070c38 100644
--- a/engines/bagel/hodjnpodj/crypt/main.cpp
+++ b/engines/bagel/hodjnpodj/crypt/main.cpp
@@ -41,7 +41,7 @@ namespace Crypt {
#define IDB_HOUR 301
-VOID CALLBACK GetGameParams(CWnd *pParentWnd);
+void CALLBACK GetGameParams(CWnd *pParentWnd);
/***********
* Globals! *
@@ -1332,7 +1332,7 @@ BEGIN_MESSAGE_MAP(CMainWindow, CFrameWnd)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
//
// Our user preference dialog box is self contained in this object
//
diff --git a/engines/bagel/hodjnpodj/crypt/main.h b/engines/bagel/hodjnpodj/crypt/main.h
index fab619966f9..ad360760b8c 100644
--- a/engines/bagel/hodjnpodj/crypt/main.h
+++ b/engines/bagel/hodjnpodj/crypt/main.h
@@ -169,7 +169,7 @@ private:
// BOOL m_bPause;
private:
- VOID OnSoundNotify(CSound *pSound);
+ void OnSoundNotify(CSound *pSound);
protected:
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.cpp b/engines/bagel/hodjnpodj/dfa/dfa.cpp
index 89473027999..a1b971e06b3 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.cpp
+++ b/engines/bagel/hodjnpodj/dfa/dfa.cpp
@@ -1208,7 +1208,7 @@ void CMainDFAWindow::OnSoundNotify(CSound *pSound) {
//
}
-BOOL CMainDFAWindow::LoadBeaverSounds(VOID) {
+BOOL CMainDFAWindow::LoadBeaverSounds(void) {
HANDLE hResInfo;
HINSTANCE hInst;
BOOL bSuccess;
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index 5a680379193..51c3b27e2a8 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -352,7 +352,7 @@ STATIC const SIZE ptBrickSize[N_BRICKS] = {
// Local Prototypes
//
-VOID CALLBACK GetGameParams(CWnd *);
+void CALLBACK GetGameParams(CWnd *);
CFugeWindow::CFugeWindow() : gvCenter(CENTER_X, CENTER_Y) {
CString WndClass;
@@ -545,7 +545,7 @@ void CFugeWindow::initStatics() {
&vBrickCritPoints[0][0]);
}
-VOID CFugeWindow::InitializeJoystick(VOID) {
+void CFugeWindow::InitializeJoystick(void) {
JOYINFO joyInfo;
if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, TRUE) == JOYERR_NOERROR) {
@@ -564,7 +564,7 @@ VOID CFugeWindow::InitializeJoystick(VOID) {
}
-VOID CFugeWindow::RealignVectors(VOID) {
+void CFugeWindow::RealignVectors(void) {
CVector vTmp;
INT i, j;
@@ -579,7 +579,7 @@ VOID CFugeWindow::RealignVectors(VOID) {
}
-ERROR_CODE CFugeWindow::LoadMasterSprites(VOID) {
+ERROR_CODE CFugeWindow::LoadMasterSprites(void) {
CDC *pDC;
ERROR_CODE errCode;
@@ -627,7 +627,7 @@ ERROR_CODE CFugeWindow::LoadMasterSprites(VOID) {
return errCode;
}
-VOID CFugeWindow::ReleaseMasterSprites(VOID) {
+void CFugeWindow::ReleaseMasterSprites(void) {
assert(m_pBall != nullptr);
if (m_pBall != nullptr) {
delete m_pBall;
@@ -641,7 +641,7 @@ VOID CFugeWindow::ReleaseMasterSprites(VOID) {
}
}
-VOID CFugeWindow::HandleError(ERROR_CODE errCode) {
+void CFugeWindow::HandleError(ERROR_CODE errCode) {
//
// Exit this application on fatal errors
//
@@ -662,7 +662,7 @@ VOID CFugeWindow::HandleError(ERROR_CODE errCode) {
}
-VOID CFugeWindow::OnPaint() {
+void CFugeWindow::OnPaint() {
PAINTSTRUCT lpPaint;
Invalidate(FALSE);
@@ -672,7 +672,7 @@ VOID CFugeWindow::OnPaint() {
}
-VOID CFugeWindow::PaintScreen() {
+void CFugeWindow::PaintScreen() {
CDC *pDC;
//
@@ -706,7 +706,7 @@ VOID CFugeWindow::PaintScreen() {
* RETURNS: ERROR_CODE = error return code
*
*****************************************************************************/
-VOID CFugeWindow::RepaintSpriteList(CDC *pDC) {
+void CFugeWindow::RepaintSpriteList(CDC *pDC) {
CSprite *pSprite;
// can't use a null pointer
@@ -809,18 +809,18 @@ BOOL CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
}
-VOID CFugeWindow::GamePause(VOID) {
+void CFugeWindow::GamePause(void) {
m_bPause = TRUE;
};
-VOID CFugeWindow::GameResume(VOID) {
+void CFugeWindow::GameResume(void) {
if (!m_bBallOnPaddle && m_bMovingPaddle)
m_bPause = FALSE;
};
-VOID CFugeWindow::PlayGame(VOID) {
+void CFugeWindow::PlayGame(void) {
ERROR_CODE errCode;
// assume no error
@@ -911,7 +911,7 @@ ERROR_CODE CFugeWindow::LoadNewPaddle(INT nNewSize) {
}
-ERROR_CODE CFugeWindow::LoadMasterSounds(VOID) {
+ERROR_CODE CFugeWindow::LoadMasterSounds(void) {
HANDLE hResInfo;
HINSTANCE hInst;
ERROR_CODE errCode;
@@ -999,7 +999,7 @@ ERROR_CODE CFugeWindow::LoadMasterSounds(VOID) {
}
-VOID CFugeWindow::ReleaseMasterSounds(VOID) {
+void CFugeWindow::ReleaseMasterSounds(void) {
if (m_hExtraLifeRes != nullptr) {
FreeResource(m_hExtraLifeRes);
m_hExtraLifeRes = nullptr;
@@ -1019,7 +1019,7 @@ VOID CFugeWindow::ReleaseMasterSounds(VOID) {
}
-VOID CFugeWindow::EndBall(VOID) {
+void CFugeWindow::EndBall(void) {
CDC *pDC;
assert(m_pBall != nullptr);
@@ -1033,7 +1033,7 @@ VOID CFugeWindow::EndBall(VOID) {
}
-VOID CFugeWindow::StartBall(VOID) {
+void CFugeWindow::StartBall(void) {
CDC *pDC;
assert(m_pBall != nullptr);
@@ -1051,7 +1051,7 @@ VOID CFugeWindow::StartBall(VOID) {
}
-CVector CFugeWindow::BallOnPaddle(VOID) {
+CVector CFugeWindow::BallOnPaddle(void) {
CVector vBall(0, -(PADDLE_RADIUS + BALL_RADIUS));
vBall.Rotate(fPaddleAngles[m_nInitPaddleSize] / 2);
@@ -1066,7 +1066,7 @@ CVector CFugeWindow::BallOnPaddle(VOID) {
}
-VOID CFugeWindow::PaintBall(VOID) {
+void CFugeWindow::PaintBall(void) {
CPoint ptLast;
CVector vBall, vGravity;
DOUBLE length;
@@ -1254,7 +1254,7 @@ VOID CFugeWindow::PaintBall(VOID) {
#define N_CRIT_POINTS 7
-VOID CFugeWindow::BallvsPaddle(VOID) {
+void CFugeWindow::BallvsPaddle(void) {
CVector vPoints[N_CRIT_POINTS];
CVector vTmp, vPaddle, vFace, vBallCenter, vBallEdge;
DOUBLE a1, a2;
@@ -1518,7 +1518,7 @@ VOID CFugeWindow::BallvsPaddle(VOID) {
#define MAX_BRICK_HITS 6
-VOID CFugeWindow::BallvsBrick(DOUBLE length) {
+void CFugeWindow::BallvsBrick(DOUBLE length) {
CHAR buf1[32], buf2[32];
CVector vPoints[N_BRICK_POINTS];
CVector vBrick, vBallCenter, vOrigin, vTmp;
@@ -1896,7 +1896,7 @@ VOID CFugeWindow::BallvsBrick(DOUBLE length) {
}
-VOID CFugeWindow::EraseBrick(CDC *pDC, INT nBrickIndex) {
+void CFugeWindow::EraseBrick(CDC *pDC, INT nBrickIndex) {
assert(pDC != nullptr);
assert((nBrickIndex >= 0) && (nBrickIndex < N_BRICKS));
@@ -1909,7 +1909,7 @@ VOID CFugeWindow::EraseBrick(CDC *pDC, INT nBrickIndex) {
}
-VOID CFugeWindow::LoseBall(VOID) {
+void CFugeWindow::LoseBall(void) {
CHAR buf1[32], buf2[32];
CDC *pDC;
ERROR_CODE errCode;
@@ -2032,7 +2032,7 @@ VOID CFugeWindow::LoseBall(VOID) {
}
-VOID CFugeWindow::StartPaddle(VOID) {
+void CFugeWindow::StartPaddle(void) {
assert(m_pPaddle != nullptr);
if (m_pPaddle != nullptr)
@@ -2044,7 +2044,7 @@ VOID CFugeWindow::StartPaddle(VOID) {
}
-VOID CFugeWindow::EndPaddle(VOID) {
+void CFugeWindow::EndPaddle(void) {
CDC *pDC;
assert(m_pPaddle != nullptr);
@@ -2058,7 +2058,7 @@ VOID CFugeWindow::EndPaddle(VOID) {
}
}
-VOID CFugeWindow::LaunchBall(VOID) {
+void CFugeWindow::LaunchBall(void) {
assert(m_bGameActive);
assert(m_bBallOnPaddle);
@@ -2077,7 +2077,7 @@ VOID CFugeWindow::LaunchBall(VOID) {
}
-VOID CFugeWindow::PaintPaddle(BOOL bPaint) {
+void CFugeWindow::PaintPaddle(BOOL bPaint) {
CVector vPaddle;
CDC *pDC;
INT nOldIndex;
@@ -2175,7 +2175,7 @@ VOID CFugeWindow::PaintPaddle(BOOL bPaint) {
}
-VOID CFugeWindow::StartBricks(VOID) {
+void CFugeWindow::StartBricks(void) {
CDC *pDC;
INT i, nBricks;
@@ -2195,7 +2195,7 @@ VOID CFugeWindow::StartBricks(VOID) {
}
-VOID CFugeWindow::PaintBricks(CDC *pDC) {
+void CFugeWindow::PaintBricks(CDC *pDC) {
CSize size;
CDC *pMemDC;
CBitmap *pBmp, *pMemBmp;
@@ -2283,13 +2283,13 @@ VOID CFugeWindow::PaintBricks(CDC *pDC) {
}
-VOID CFugeWindow::EndBricks(VOID) {
+void CFugeWindow::EndBricks(void) {
memset(m_bBrickVisible, 0, sizeof(BOOL) * N_BRICKS);
}
-VOID CFugeWindow::LoadIniSettings(VOID) {
+void CFugeWindow::LoadIniSettings(void) {
if (pGameParams->bPlayingMetagame) {
m_bOutterWall = FALSE;
@@ -2343,7 +2343,7 @@ VOID CFugeWindow::LoadIniSettings(VOID) {
}
-VOID CFugeWindow::GameReset(VOID) {
+void CFugeWindow::GameReset(void) {
KillTimer(TIMER_ID); // stop the timer
if (pGameParams->bSoundEffectsEnabled) {
@@ -2383,7 +2383,7 @@ VOID CFugeWindow::GameReset(VOID) {
}
-VOID CFugeWindow::OnTimer(UINT_PTR nEvent) {
+void CFugeWindow::OnTimer(UINT_PTR nEvent) {
// there should be only one timer
assert(nEvent == TIMER_ID);
@@ -2472,7 +2472,7 @@ LONG CFugeWindow::OnJoyStick(UINT wParam, LONG lParam) {
}
-VOID CFugeWindow::OnMouseMove(UINT, CPoint point) {
+void CFugeWindow::OnMouseMove(UINT, CPoint point) {
INT nMove;
if (m_bGameActive && m_bMovingPaddle) {
@@ -2508,7 +2508,7 @@ VOID CFugeWindow::OnMouseMove(UINT, CPoint point) {
-VOID CFugeWindow::OnRButtonUp(UINT nFlags, CPoint point) {
+void CFugeWindow::OnRButtonUp(UINT nFlags, CPoint point) {
if (m_bGameActive) {
// toggle move paddle mode
@@ -2532,7 +2532,7 @@ VOID CFugeWindow::OnRButtonUp(UINT nFlags, CPoint point) {
}
-VOID CFugeWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CFugeWindow::OnLButtonDown(UINT nFlags, CPoint point) {
CRect boothRect,
tentRect,
peopRect,
@@ -2794,7 +2794,7 @@ LRESULT CFugeWindow::OnMMIONotify(WPARAM wParam, LPARAM lParam) {
}
-VOID CFugeWindow::OnSoundNotify(CSound *) {
+void CFugeWindow::OnSoundNotify(CSound *) {
//
// Add your code to process explicit notification of a sound "done" event here.
// pSound is a pointer to a CSound object for which you requested SOUND_NOTIFY.
@@ -2802,7 +2802,7 @@ VOID CFugeWindow::OnSoundNotify(CSound *) {
}
-VOID CFugeWindow::OnClose() {
+void CFugeWindow::OnClose() {
CBrush myBrush;
CRect myRect;
CDC *pDC;
@@ -2884,7 +2884,7 @@ END_MESSAGE_MAP()
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
//
// Our user preference dialog box is self contained in this object
//
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index df82d30d4c0..dce53816b44 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -41,57 +41,57 @@ namespace Fuge {
class CFugeWindow : public CFrameWnd {
public:
- CFugeWindow(VOID);
- VOID PlayGame(VOID);
- VOID PaintScreen(VOID);
- VOID LoadIniSettings(VOID);
+ CFugeWindow(void);
+ void PlayGame(void);
+ void PaintScreen(void);
+ void LoadIniSettings(void);
protected:
void initMembers();
void initStatics();
- VOID GameReset(VOID);
- VOID GamePause(VOID);
- VOID GameResume(VOID);
- VOID HandleError(ERROR_CODE);
- VOID RealignVectors(VOID);
- ERROR_CODE LoadMasterSprites(VOID);
- VOID ReleaseMasterSprites(VOID);
- ERROR_CODE LoadMasterSounds(VOID);
- VOID ReleaseMasterSounds(VOID);
+ void GameReset(void);
+ void GamePause(void);
+ void GameResume(void);
+ void HandleError(ERROR_CODE);
+ void RealignVectors(void);
+ ERROR_CODE LoadMasterSprites(void);
+ void ReleaseMasterSprites(void);
+ ERROR_CODE LoadMasterSounds(void);
+ void ReleaseMasterSounds(void);
ERROR_CODE LoadNewPaddle(INT);
- VOID InitializeJoystick(VOID);
- VOID RepaintSpriteList(CDC *);
- VOID PaintBricks(CDC *);
- VOID StartBall(VOID);
- VOID EndBall(VOID);
- VOID PaintBall(VOID);
- VOID LaunchBall(VOID);
- VOID StartPaddle(VOID);
- VOID EndPaddle(VOID);
- VOID PaintPaddle(BOOL);
- CVector BallOnPaddle(VOID);
- VOID StartBricks(VOID);
- VOID EndBricks(VOID);
- VOID EraseBrick(CDC *, INT);
- VOID LoseBall(VOID);
- VOID BallvsPaddle(VOID);
- VOID BallvsBrick(DOUBLE);
+ void InitializeJoystick(void);
+ void RepaintSpriteList(CDC *);
+ void PaintBricks(CDC *);
+ void StartBall(void);
+ void EndBall(void);
+ void PaintBall(void);
+ void LaunchBall(void);
+ void StartPaddle(void);
+ void EndPaddle(void);
+ void PaintPaddle(BOOL);
+ CVector BallOnPaddle(void);
+ void StartBricks(void);
+ void EndBricks(void);
+ void EraseBrick(CDC *, INT);
+ void LoseBall(void);
+ void BallvsPaddle(void);
+ void BallvsBrick(DOUBLE);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
LONG OnJoyStick(UINT, LONG);
- VOID OnPaint(VOID);
- VOID OnTimer(UINT_PTR);
- VOID OnMouseMove(UINT, CPoint);
- VOID OnRButtonUp(UINT, CPoint);
- VOID OnLButtonDown(UINT, CPoint);
- VOID OnSysChar(UINT, UINT, UINT);
- VOID OnSysKeyDown(UINT, UINT, UINT);
- VOID OnKeyDown(UINT, UINT, UINT);
- VOID OnActivate(UINT, CWnd *, BOOL) override;
+ void OnPaint(void);
+ void OnTimer(UINT_PTR);
+ void OnMouseMove(UINT, CPoint);
+ void OnRButtonUp(UINT, CPoint);
+ void OnLButtonDown(UINT, CPoint);
+ void OnSysChar(UINT, UINT, UINT);
+ void OnSysKeyDown(UINT, UINT, UINT);
+ void OnKeyDown(UINT, UINT, UINT);
+ void OnActivate(UINT, CWnd *, BOOL) override;
LRESULT OnMCINotify(WPARAM, LPARAM);
LRESULT OnMMIONotify(WPARAM, LPARAM);
- VOID OnSoundNotify(CSound *);
- VOID OnClose(VOID);
+ void OnSoundNotify(CSound *);
+ void OnClose(void);
DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index ab446ae1282..8cb71d69337 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -139,7 +139,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
return CBmpDialog::OnCommand(wParam, lParam);
}
-VOID CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
CHAR buf[40];
INT nMin, nMax, nVal;
CDC *pDC;
@@ -349,7 +349,7 @@ void CUserCfgDlg::OnPaint(void) {
UpdateOptions();
}
-VOID CUserCfgDlg::UpdateOptions(VOID) {
+void CUserCfgDlg::UpdateOptions(void) {
CHAR buf[40];
CDC *pDC;
@@ -482,7 +482,7 @@ void CUserCfgDlg::ClearDialogImage(void) {
}
-VOID CUserCfgDlg::LoadIniSettings(VOID) {
+void CUserCfgDlg::LoadIniSettings(void) {
m_nNumBalls = GetPrivateProfileInt(INI_SECTION, "NumberOfBalls", BALLS_DEF, INI_FILENAME);
if ((m_nNumBalls < BALLS_MIN) || (m_nNumBalls > BALLS_MAX))
m_nNumBalls = BALLS_DEF;
@@ -504,7 +504,7 @@ VOID CUserCfgDlg::LoadIniSettings(VOID) {
m_bOutterWall = TRUE;
}
-VOID CUserCfgDlg::SaveIniSettings(VOID) {
+void CUserCfgDlg::SaveIniSettings(void) {
WritePrivateProfileString(INI_SECTION, "NumberOfBalls", Common::String::format("%d", m_nNumBalls).c_str(), INI_FILENAME);
WritePrivateProfileString(INI_SECTION, "StartingLevel", Common::String::format("%d", m_nStartLevel).c_str(), INI_FILENAME);
WritePrivateProfileString(INI_SECTION, "BallSpeed", Common::String::format("%d", m_nBallSpeed).c_str(), INI_FILENAME);
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.h b/engines/bagel/hodjnpodj/fuge/usercfg.h
index d71961d3049..1d9f29fcf9b 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.h
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.h
@@ -58,21 +58,21 @@ public:
protected:
- virtual VOID DoDataExchange(CDataExchange *) override;
+ virtual void DoDataExchange(CDataExchange *) override;
virtual BOOL OnCommand(WPARAM, LPARAM) override;
- virtual BOOL OnInitDialog(VOID) override;
- VOID PutDlgData(VOID);
- VOID GetDlgData(VOID);
- VOID LoadIniSettings(VOID);
- VOID SaveIniSettings(VOID);
- VOID UpdateOptions(VOID);
- VOID ClearDialogImage(VOID);
+ virtual BOOL OnInitDialog(void) override;
+ void PutDlgData(void);
+ void GetDlgData(void);
+ void LoadIniSettings(void);
+ void SaveIniSettings(void);
+ void UpdateOptions(void);
+ void ClearDialogImage(void);
afx_msg BOOL OnEraseBkgnd(CDC *);
- VOID OnHScroll(UINT, UINT, CScrollBar *);
- VOID OnClose();
- VOID OnDestroy();
- VOID OnPaint();
+ void OnHScroll(UINT, UINT, CScrollBar *);
+ void OnClose();
+ void OnDestroy();
+ void OnPaint();
DECLARE_MESSAGE_MAP()
CText *m_pTxtNumBalls;
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
index ba6a5f14d06..43620e50f62 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
@@ -110,7 +110,7 @@ BOOL CAudioCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
return CBmpDialog::OnCommand(wParam, lParam);
}
-VOID CAudioCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CAudioCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
INT nMin = 0, nMax = 0, nVal = 0;
if (pScroll == m_pScrollBar1) {
@@ -236,7 +236,7 @@ void CAudioCfgDlg::OnPaint(void) {
}
-VOID CAudioCfgDlg::UpdateOptions(VOID) {
+void CAudioCfgDlg::UpdateOptions(void) {
CHAR buf[40];
CDC *pDC;
@@ -308,7 +308,7 @@ void CAudioCfgDlg::ClearDialogImage(void) {
}
-VOID CAudioCfgDlg::LoadIniSettings(VOID) {
+void CAudioCfgDlg::LoadIniSettings(void) {
int nMidiVolume, nWaveVolume;
m_bMusic = GetPrivateProfileInt("Meta", "Music", TRUE, "HODJPODJ.INI");
@@ -328,7 +328,7 @@ VOID CAudioCfgDlg::LoadIniSettings(VOID) {
CSound::setVolume(m_nVolume, m_nVolume);
}
-VOID CAudioCfgDlg::SaveIniSettings() {
+void CAudioCfgDlg::SaveIniSettings() {
WritePrivateProfileString("Meta", "Music", Common::String::format("%d", m_bMusic ? 1 : 0).c_str(), "HODJPODJ.INI");
WritePrivateProfileString("Meta", "SoundEffects", Common::String::format("%d", m_bSound ? 1 : 0).c_str(), "HODJPODJ.INI");
WritePrivateProfileString("Meta", "WaveVolume", Common::String::format("%d", m_nVolume).c_str(), "HODJPODJ.INI");
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
index f56309b3847..c3c1e6da2ab 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
@@ -42,21 +42,21 @@ public:
protected:
- virtual VOID DoDataExchange(CDataExchange *) override;
+ virtual void DoDataExchange(CDataExchange *) override;
virtual BOOL OnCommand(WPARAM, LPARAM) override;
- virtual BOOL OnInitDialog(VOID) override;
- VOID PutDlgData(VOID);
- VOID GetDlgData(VOID);
- VOID LoadIniSettings(VOID);
- VOID SaveIniSettings(VOID);
- VOID UpdateOptions(VOID);
- VOID ClearDialogImage(VOID);
+ virtual BOOL OnInitDialog(void) override;
+ void PutDlgData(void);
+ void GetDlgData(void);
+ void LoadIniSettings(void);
+ void SaveIniSettings(void);
+ void UpdateOptions(void);
+ void ClearDialogImage(void);
afx_msg BOOL OnEraseBkgnd(CDC *);
- VOID OnHScroll(UINT, UINT, CScrollBar *);
- VOID OnClose();
- VOID OnDestroy();
- VOID OnPaint();
+ void OnHScroll(UINT, UINT, CScrollBar *);
+ void OnClose();
+ void OnDestroy();
+ void OnPaint();
DECLARE_MESSAGE_MAP()
CScrollBar *m_pScrollBar1;
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdinc.h b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
index fd47c7cda53..6efff8a4e3f 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdinc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
@@ -67,7 +67,7 @@ typedef uint16 USHORT;
typedef unsigned long ULONG;
#define FLOAT float
#define DOUBLE double
-#define VOID void
+#define void void
#define CONST const
enum {
diff --git a/engines/bagel/hodjnpodj/life/game.cpp b/engines/bagel/hodjnpodj/life/game.cpp
index 2297a733329..1d9a952208a 100644
--- a/engines/bagel/hodjnpodj/life/game.cpp
+++ b/engines/bagel/hodjnpodj/life/game.cpp
@@ -71,7 +71,7 @@ CSprite *pScrollSprite = nullptr; // Commands button
CSprite *pCalendarSprite = nullptr; // Blank calendar
HWND hWndParent;
-VOID CALLBACK GetGameParams(CWnd *pParentWnd);
+void CALLBACK GetGameParams(CWnd *pParentWnd);
/*****************************************************************
*
@@ -1493,7 +1493,7 @@ END_MESSAGE_MAP()
* [Discuss return value]
*
****************************************************************/
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
gbNewGame = FALSE;
CUserCfgDlg dlgUserCfg(pParentWnd, pGamePalette, IDD_USERCFG);
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.h b/engines/bagel/hodjnpodj/mankala/mnk.h
index 66b2821d960..28379dbbd97 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.h
+++ b/engines/bagel/hodjnpodj/mankala/mnk.h
@@ -512,7 +512,7 @@ public: BOOL MoveStoneDisplay(CPitWnd * xpcFromPit,
private: BOOL AdjustPitDisplay(CPitWnd * xpcPit,
BOOL bForcePaint PDFT(FALSE)) ;
//- PaintScreen -- paint screen for mankala game
-private: VOID PaintScreen(void) ;
+private: void PaintScreen(void) ;
//- ProcessDc -- handle processing of device context
private: BOOL ProcessDc(BOOL bAlloc PDFT(TRUE)) ;
//- AllocatePits -- allocate pits (including home bin/hand)
diff --git a/engines/bagel/hodjnpodj/mankala/mnkui.cpp b/engines/bagel/hodjnpodj/mankala/mnkui.cpp
index faaaecdf213..b947018505c 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkui.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnkui.cpp
@@ -691,8 +691,8 @@ BOOL CMnkWindow::AdjustPitDisplay(CPitWnd * xpcPit,
}
//* CMnkWindow::PaintScreen -- paint screen for mankala game
-VOID CMnkWindow::PaintScreen(void)
-// returns: VOID
+void CMnkWindow::PaintScreen(void)
+// returns: void
{
JXENTER(CMnkWindow::PaintScreen) ;
int iPlayer, iPit ; // loop variables
@@ -1064,7 +1064,7 @@ BOOL FAR PASCAL CMnkWindow::UserDialog(void)
}
////* CallUserDialog --
-VOID CALLBACK CallUserDialog(CWnd * xpcWindow) {
+void CALLBACK CallUserDialog(CWnd * xpcWindow) {
// returns: TRUE if error, FALSE otherwise
JXENTER(CallUserDialog) ;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
index 00487e4a240..047cf6fc6aa 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
@@ -46,7 +46,7 @@ CBdbgMgr::CBdbgMgr(void) {
//* CBdbgMgr::~CBdbgMgr -- destructor
CBdbgMgr::~CBdbgMgr(void)
-// returns: VOID
+// returns: void
{
JXENTER(CBdbgMgr::~CBdbgMgr) ;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
index 5548e828e56..9ee3306585a 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
@@ -230,7 +230,7 @@ BOOL CBgbMgr::InitBitmapObject(CBgbObject *pBgbObject, XPSTR pszFileName) {
*
*
*****************************************************************************/
-VOID CBgbMgr::CacheLoadObject(CBgbObject *pBgbObject) {
+void CBgbMgr::CacheLoadObject(CBgbObject *pBgbObject) {
CSprite *pSprite;
BOOL bSuccess;
@@ -374,7 +374,7 @@ VOID CBgbMgr::CacheLoadObject(CBgbObject *pBgbObject) {
*
*
*****************************************************************************/
-VOID CBgbMgr::CacheReleaseObject(CBgbObject *pBgbObject) {
+void CBgbMgr::CacheReleaseObject(CBgbObject *pBgbObject) {
// can't access a null pointer
assert(pBgbObject != nullptr);
@@ -444,7 +444,7 @@ VOID CBgbMgr::CacheReleaseObject(CBgbObject *pBgbObject) {
* ULONG lReqSpace; Ammount of requested free space
*
*****************************************************************************/
-VOID CBgbMgr::CacheOptimize(ULONG lReqSpace) {
+void CBgbMgr::CacheOptimize(ULONG lReqSpace) {
CBgbObject *pBgbObject;
ULONG lAvgAge;
INT nObjects;
@@ -507,7 +507,7 @@ VOID CBgbMgr::CacheOptimize(ULONG lReqSpace) {
* SAMPLE USAGE: CacheFlush();
*
*****************************************************************************/
-VOID CBgbMgr::CacheFlush(VOID) {
+void CBgbMgr::CacheFlush(void) {
CBgbObject *pBgbObject;
//ErrorLog("DEBUG.LOG", "CBgbMgr::CacheFlush");
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.h b/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
index d51f666035f..87984965133 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
@@ -93,21 +93,21 @@ public:
BOOL ReleaseDc(void);
BOOL ClearBitmapObject(CBgbObject *lpcBgbObject);
BOOL ReleaseResources(void);
- VOID DoAnimations(VOID);
- VOID PauseAnimations(VOID) {
+ void DoAnimations(void);
+ void PauseAnimations(void) {
m_bAnimationsPaused = TRUE;
}
- VOID ResumeAnimations(VOID) {
+ void ResumeAnimations(void) {
m_bAnimationsPaused = FALSE;
}
- BOOL AnimationsActive(VOID) const {
+ BOOL AnimationsActive(void) const {
return !m_bAnimationsPaused;
}
- VOID CacheLoadObject(CBgbObject *);
- VOID CacheReleaseObject(CBgbObject *);
- VOID CacheFlush(VOID);
- VOID CacheOptimize(ULONG);
+ void CacheLoadObject(CBgbObject *);
+ void CacheReleaseObject(CBgbObject *);
+ void CacheFlush(void);
+ void CacheOptimize(ULONG);
};
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
index b374c293f23..9138fa1e13a 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
@@ -52,7 +52,7 @@ typedef LPSTR *LPLPSTR ;
typedef int *XPINT ;
typedef int *LPINT ;
typedef char *XPCHAR ;
-#define VOID void
+#define void void
typedef void *XPVOID ;
typedef void *LPVOID ;
//typedef unsigned int WORD ;
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index 94759f7c257..72835eaab24 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -51,8 +51,8 @@ namespace Frame {
#define CONTROL_PHYSICAL_MEMORY TRUE
-VOID InitBFCInfo(CBfcMgr *);
-VOID FreeBFCInfo(CBfcMgr *);
+void InitBFCInfo(CBfcMgr *);
+void FreeBFCInfo(CBfcMgr *);
// Movie Identifiers
#define MOVIE_ID_NONE 0
@@ -1793,7 +1793,7 @@ void CHodjPodjWindow::ReleaseResources(void) {
}
}
-VOID FreeBFCInfo(CBfcMgr *pBfcMgr) {
+void FreeBFCInfo(CBfcMgr *pBfcMgr) {
CHodjPodj *pPlayer;
int i, k;
@@ -1855,7 +1855,7 @@ VOID FreeBFCInfo(CBfcMgr *pBfcMgr) {
}
-VOID InitBFCInfo(CBfcMgr *pBfcMgr) {
+void InitBFCInfo(CBfcMgr *pBfcMgr) {
const CClueTable *pClueTable;
CHodjPodj *pPlayer;
CItem *pItem;
@@ -2098,7 +2098,7 @@ BOOL CHodjPodjWindow::Restore() {
}
-VOID CHodjPodjWindow::ShowCredits(VOID) {
+void CHodjPodjWindow::ShowCredits(void) {
MSG msg;
LONG lTimeElapsed, lStart;
ULONG lGoal, lWait;
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
index 27feb929a1b..924949c7ee3 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
@@ -52,7 +52,7 @@ namespace Frame {
extern CBfcMgr *lpMetaGame;
-extern VOID InitBFCInfo(CBfcMgr *pBfcMgr);
+extern void InitBFCInfo(CBfcMgr *pBfcMgr);
/////////////////////////////////////////////////////////////////////////////
@@ -99,8 +99,8 @@ public:
BOOL CheckLowMemory(void);
- BOOL Restore(VOID);
- VOID ShowCredits(VOID);
+ BOOL Restore(void);
+ void ShowCredits(void);
static void ReleaseResources(void);
static void FlushInputEvents(void);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
index c0ad18261bf..6ba122eebac 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
@@ -143,8 +143,8 @@ class CGtlView;
class CMemDC {
public:
- CMemDC(VOID);
- ~CMemDC(VOID);
+ CMemDC(void);
+ ~CMemDC(void);
CDC *m_pDC;
CPalette *m_pPalOld;
@@ -496,11 +496,11 @@ public:
CGtlData(void) ;
~CGtlData(void) ;
- VOID CreateOffScreenBmp(VOID);
- VOID DeleteOffScreenBmp(VOID);
- VOID PaintOffScreenBmp(VOID);
- CMemDC *GetMemDC(VOID);
- VOID ReleaseMemDC(CMemDC *);
+ void CreateOffScreenBmp(void);
+ void DeleteOffScreenBmp(void);
+ void PaintOffScreenBmp(void);
+ CMemDC *GetMemDC(void);
+ void ReleaseMemDC(CMemDC *);
BOOL SetColors(void) ;
@@ -592,7 +592,7 @@ private:
BOOL MoveNode(CNode FAR * lpNode, CRPoint crPosition) ;
int DoSpecialTravel(int, BOOL);
- VOID LoadCharDirection(CBgbObject *, CPoint, CPoint);
+ void LoadCharDirection(CBgbObject *, CPoint, CPoint);
//- CreateLink -- create link between two nodes
BOOL CreateLink(CNode FAR * lpNode1, CNode FAR * lpNode2) ;
@@ -702,7 +702,7 @@ private:
// grab Mish and Mosh from current location
BOOL DetermineMishMoshEligibility(CXodj *, int);
- VOID DoTransport(CXodj *, INT);
+ void DoTransport(CXodj *, INT);
// gtlcmp.cpp -- meta game computer play
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
index 54a18ebe9b2..0d8dd00788c 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
@@ -86,7 +86,7 @@ void CGtlDoc::DeleteContents() {
//* CGtlDoc::InitDocument -- initialize document to specified file
void CGtlDoc::InitDocument(const char *xpszPathName)
// xpszPathName -- filename to be opened
-// returns: Void
+// returns: void
{
CGtlApp * xpGtlApp = (CGtlApp *)AfxGetApp() ; // get application
memset(&m_cStartData, 0, &m_cEndData - &m_cStartData) ;
@@ -149,7 +149,7 @@ void CGtlDoc::Serialize(CArchive& ar) {
//* CGtlDoc::OnChangedViewList -- called by MFC when a view is
// added or deleted
-VOID CGtlDoc::OnChangedViewList() {
+void CGtlDoc::OnChangedViewList() {
JXENTER(CGtlDoc::OnChangedViewList) ;
POSITION nViewPosition = GetFirstViewPosition() ;
CGtlView *xpGtlView ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
index 53386e5d4ed..5b176f1b60e 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
@@ -81,7 +81,7 @@ public:
private:
//- OnChangedViewList -- called by MFC when a view is
// added or deleted
- virtual VOID OnChangedViewList(void) override;
+ virtual void OnChangedViewList(void) override;
public:
//- FixChecks -- fix dialog box check marks
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
index 63b5f160d9e..4bdd8d4c3c9 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
@@ -232,7 +232,7 @@ BOOL CGtlFrame::PreCreateWindow(CREATESTRUCT& cCs)
//* CGtlFrame::RecalcLayout -- override CFrameWnd::RecalcLayout
void CGtlFrame::RecalcLayout(BOOL bNotify)
-// returns: VOID
+// returns: void
{
JXENTER(CGtlFrame::RecalcLayout) ;
CRect cParamRect, cClientRect(0, 0, 200, 200) ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
index 6eedf7c81c6..c7fed6c47db 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
@@ -630,7 +630,7 @@ int CGtlData::FindNodeId(const char *pszLabel) {
return (iNodeID);
}
-VOID CGtlData::LoadCharDirection(CBgbObject *pBgbSprite, CPoint ptOld, CPoint ptNew) {
+void CGtlData::LoadCharDirection(CBgbObject *pBgbSprite, CPoint ptOld, CPoint ptNew) {
#if 1
CHAR chOldChar, chNewChar = '1';
INT x, y;
@@ -1153,7 +1153,7 @@ CNode FAR *CGtlData::LocationToNode(int iLocationCode)
// HACK-O-RAMA
-VOID CGtlData::SetFurlongs(CXodj *pXodj) {
+void CGtlData::SetFurlongs(CXodj *pXodj) {
assert(pXodj != nullptr);
if (pXodj->m_bHodj) {
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
index 982ce4f8452..79f5e10f635 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
@@ -685,7 +685,7 @@ void CGtlData::CheckForTransport(CXodj *pXodj, int nNewSector)
}
-VOID CGtlData::DoTransport(CXodj *pXodj, INT iNode) {
+void CGtlData::DoTransport(CXodj *pXodj, INT iNode) {
CHAR szOldFileName[128];
CBgbObject *pCurPlayer;
CPoint point;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
index e3e0f865ad8..92dc8479f6d 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
@@ -109,7 +109,7 @@ CGtlData::~CGtlData(void) {
RETURN_VOID ;
}
-VOID CGtlData::CreateOffScreenBmp(VOID) {
+void CGtlData::CreateOffScreenBmp(void) {
CDC *pScreenDC;
CGtlApp *xpGtlApp = (CGtlApp *)AfxGetApp();
@@ -132,14 +132,14 @@ VOID CGtlData::CreateOffScreenBmp(VOID) {
}
}
-VOID CGtlData::DeleteOffScreenBmp(VOID) {
+void CGtlData::DeleteOffScreenBmp(void) {
if (m_pOffScreenBmp != nullptr) {
delete m_pOffScreenBmp;
m_pOffScreenBmp = nullptr;
}
}
-VOID CGtlData::PaintOffScreenBmp(VOID) {
+void CGtlData::PaintOffScreenBmp(void) {
CDC *pScreenDC;
CMemDC *pMemDC;
CPalette *pScreenPalOld;
@@ -159,19 +159,19 @@ VOID CGtlData::PaintOffScreenBmp(VOID) {
}
}
}
-CMemDC::CMemDC(VOID) {
+CMemDC::CMemDC(void) {
m_pDC = new CDC;
assert(m_pDC != nullptr);
}
-CMemDC::~CMemDC(VOID) {
+CMemDC::~CMemDC(void) {
if (m_pDC != nullptr) {
delete m_pDC;
m_pDC = nullptr;
}
}
-CMemDC *CGtlData::GetMemDC(VOID) {
+CMemDC *CGtlData::GetMemDC(void) {
CMemDC *pMemDC;
if ((pMemDC = new CMemDC) != nullptr) {
@@ -186,7 +186,7 @@ CMemDC *CGtlData::GetMemDC(VOID) {
return (pMemDC);
}
-VOID CGtlData::ReleaseMemDC(CMemDC *pMemDC) {
+void CGtlData::ReleaseMemDC(CMemDC *pMemDC) {
assert(pMemDC != nullptr);
if (pMemDC != nullptr) {
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
index 230ddc2c421..3cfddb52407 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
@@ -112,7 +112,7 @@ void CSaveDlg::OnCancel(void) {
EndDialog(-1);
}
-VOID CSaveDlg::EditDescription(INT nNewSlot) {
+void CSaveDlg::EditDescription(INT nNewSlot) {
CHAR szBuf[40];
// abort any other edits the user was making
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
index efe507412c7..f27b9fc666b 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
@@ -38,8 +38,8 @@ public:
CSaveDlg(CHAR *[], CWnd *, CPalette *);
protected:
- VOID ClearDialogImage(VOID);
- VOID EditDescription(INT);
+ void ClearDialogImage(void);
+ void EditDescription(INT);
//{{AFX_MSG(COptions)
virtual BOOL OnCommand(WPARAM, LPARAM) override;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
index 53695163b37..1933459bd61 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
@@ -52,7 +52,7 @@ struct stInventoryInfo {
} stPlayerBuf[MAX_PLAYERS];
// Local prototypes
-static ERROR_CODE GetSaveGameDescriptions(VOID);
+static ERROR_CODE GetSaveGameDescriptions(void);
static void WipeBFC(CBfcMgr *pBfcMgr);
BOOL SaveGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
@@ -164,7 +164,7 @@ BOOL RestoreGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
return bRestored;
}
-VOID ConvertToSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
+void ConvertToSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
CHodjPodj *pPlayer;
CInventory *pInv;
CItem *pItem;
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index 273e830b83c..cae5b05892a 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -68,7 +68,7 @@ static int gnLDieLeftFinal, // final positions of dice.
extern HWND ghParentWnd;
-CMainWindow::CMainWindow(VOID) {
+CMainWindow::CMainWindow(void) {
CString WndClass;
CRect tmpRect;
CDibDoc *pDibDoc;
@@ -240,7 +240,7 @@ CMainWindow::CMainWindow(VOID) {
HandleError(errCode);
}
-VOID CMainWindow::HandleError(ERROR_CODE errCode) {
+void CMainWindow::HandleError(ERROR_CODE errCode) {
// Exit this application on fatal errors
if (errCode != ERR_NONE) {
// pause the current game (if any)
@@ -258,7 +258,7 @@ VOID CMainWindow::HandleError(ERROR_CODE errCode) {
}
-VOID CMainWindow::OnPaint() {
+void CMainWindow::OnPaint() {
PAINTSTRUCT lpPaint;
Invalidate(FALSE);
@@ -269,7 +269,7 @@ VOID CMainWindow::OnPaint() {
}
-VOID CMainWindow::PaintScreen() {
+void CMainWindow::PaintScreen() {
CDibDoc myDoc;
CRect rcDest;
char szMapFile[256];
@@ -427,16 +427,16 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
}
-VOID CMainWindow::GamePause(VOID) {
+void CMainWindow::GamePause(void) {
m_bPause = TRUE;
};
-VOID CMainWindow::GameResume(VOID) {
+void CMainWindow::GameResume(void) {
m_bPause = FALSE;
};
-VOID CMainWindow::PlayGame() {
+void CMainWindow::PlayGame() {
ERROR_CODE errCode;
CDibDoc myDoc;
CRect rcDest;
@@ -572,7 +572,7 @@ VOID CMainWindow::PlayGame() {
-VOID CMainWindow::GameReset(VOID) {
+void CMainWindow::GameReset(void) {
m_bGameActive = FALSE; // there is no currently active game
for (short i = 0; i < 10; i++) {
@@ -621,7 +621,7 @@ VOID CMainWindow::GameReset(VOID) {
*
***********************************************************************************************************************************
*/
-VOID CMainWindow::OnMouseMove(UINT, CPoint) {
+void CMainWindow::OnMouseMove(UINT, CPoint) {
SetCursor(LoadCursor(nullptr, IDC_ARROW));
}
@@ -663,7 +663,7 @@ VOID CMainWindow::OnMouseMove(UINT, CPoint) {
***********************************************************************************************************************************
*/
-VOID CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
short i,
iDoor;
short jj;
@@ -1148,7 +1148,7 @@ LRESULT CMainWindow::OnMMIONotify(WPARAM wParam, LPARAM lParam) {
*
***********************************************************************************************************************************
*/
-VOID CMainWindow::DeleteSprite(CSprite *pSprite) {
+void CMainWindow::DeleteSprite(CSprite *pSprite) {
CDC *pDC;
// can't delete a null pointer
@@ -1602,7 +1602,7 @@ BOOL CMainWindow::IsThrowDoable(BYTE DiceSum) {
#pragma warning(default: 4135)
-VOID CMainWindow::OnClose() {
+void CMainWindow::OnClose() {
CBrush cbrBlack;
CRect crectSplashScr;
CDC *pDC;
diff --git a/engines/bagel/hodjnpodj/novacancy/main.h b/engines/bagel/hodjnpodj/novacancy/main.h
index a28cebfd3d0..b849bd40b9c 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.h
+++ b/engines/bagel/hodjnpodj/novacancy/main.h
@@ -38,31 +38,31 @@ char *GetStringFromResource(UINT);
class CMainWindow : public CFrameWnd {
public:
- CMainWindow(VOID);
- VOID PlayGame(VOID);
- VOID PaintScreen(VOID);
- VOID LoadIniSettings(VOID);
- VOID SaveIniSettings(VOID);
+ CMainWindow(void);
+ void PlayGame(void);
+ void PaintScreen(void);
+ void LoadIniSettings(void);
+ void SaveIniSettings(void);
protected:
- VOID GameReset(VOID);
- VOID GamePause(VOID);
- VOID GameResume(VOID);
+ void GameReset(void);
+ void GamePause(void);
+ void GameResume(void);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
- VOID HandleError(ERROR_CODE);
- VOID DeleteSprite(CSprite *);
-
- VOID OnPaint(VOID);
- VOID OnTimer(UINT_PTR);
- VOID OnMouseMove(UINT, CPoint);
- virtual VOID OnLButtonDown(UINT, CPoint);
- virtual VOID OnRButtonDown(UINT, CPoint);
- VOID OnSysChar(UINT, UINT, UINT);
- virtual VOID OnSysKeyDown(UINT, UINT, UINT);
- virtual VOID OnKeyDown(UINT, UINT, UINT);
- VOID OnActivate(UINT, CWnd *, BOOL) override;
- VOID OnClose(VOID);
+ void HandleError(ERROR_CODE);
+ void DeleteSprite(CSprite *);
+
+ void OnPaint(void);
+ void OnTimer(UINT_PTR);
+ void OnMouseMove(UINT, CPoint);
+ virtual void OnLButtonDown(UINT, CPoint);
+ virtual void OnRButtonDown(UINT, CPoint);
+ void OnSysChar(UINT, UINT, UINT);
+ virtual void OnSysKeyDown(UINT, UINT, UINT);
+ virtual void OnKeyDown(UINT, UINT, UINT);
+ void OnActivate(UINT, CWnd *, BOOL) override;
+ void OnClose(void);
virtual LRESULT OnMCINotify(WPARAM, LPARAM);
virtual LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index 9061073203e..5ef4a36b7d2 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -73,19 +73,19 @@ STATIC const CHAR *pszCategorySounds[N_CATEGORIES] = {
*
*/
ERROR_CODE CleanScreen(CDC *);
-ERROR_CODE LoadNewPhrase(VOID);
+ERROR_CODE LoadNewPhrase(void);
ERROR_CODE BuildSpriteList(CDC *);
-VOID KillCurPhrase(VOID);
-VOID BuildRandomPhraseOrder();
-bool RevealNextLetter(VOID);
-VOID CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, DWORD);
+void KillCurPhrase(void);
+void BuildRandomPhraseOrder();
+bool RevealNextLetter(void);
+void CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, DWORD);
INT StrLenNoSpaces(const CHAR *);
INT GetIndex(CSprite *);
-VOID LoadGameCfg(VOID);
-VOID SaveGameCfg(VOID);
+void LoadGameCfg(void);
+void SaveGameCfg(void);
ERROR_CODE ValidatePhrase(PHRASES *);
-VOID UpdateScore(UINT, UINT, UINT, UINT);
-INT NumLinkedSprites(VOID);
+void UpdateScore(UINT, UINT, UINT, UINT);
+INT NumLinkedSprites(void);
#define TIMER_ID 50
#define START_X_ODD 318
@@ -138,7 +138,7 @@ INT nPhrasePixelLength;
* returns errCode - Error return code
*
**/
-ERROR_CODE LoadNewPhrase(VOID) {
+ERROR_CODE LoadNewPhrase(void) {
STATIC int nLast;
CHAR *p, buf[MAX_PLENGTH_S + 2];
INT i, n, nType;
@@ -249,7 +249,7 @@ ERROR_CODE LoadNewPhrase(VOID) {
* returns Nothing
*
**/
-VOID BuildRandomPhraseOrder() {
+void BuildRandomPhraseOrder() {
UBYTE *curPhraseOrder;
INT i, j, n, newIndex;
bool use;
@@ -391,7 +391,7 @@ ERROR_CODE BuildSpriteList(CDC *pDC) {
* returns Nothing
*
**/
-VOID KillCurPhrase() {
+void KillCurPhrase() {
INT i, n;
if (curPhrase != nullptr) {
@@ -673,7 +673,7 @@ ERROR_CODE CleanScreen(CDC *pDC) {
* returns Nothing
*
**/
-VOID CALLBACK GameTimerHook(HWND hWnd, UINT, UINT_PTR nEventID, DWORD) {
+void CALLBACK GameTimerHook(HWND hWnd, UINT, UINT_PTR nEventID, DWORD) {
CDC *pDC;
HDC hDC;
BOOL done;
@@ -748,7 +748,7 @@ VOID CALLBACK GameTimerHook(HWND hWnd, UINT, UINT_PTR nEventID, DWORD) {
* returns Nothing
*
**/
-VOID GameStopTimer() {
+void GameStopTimer() {
KillTimer(gGameWnd, TIMER_ID);
}
@@ -764,11 +764,11 @@ ERROR_CODE GameStartTimer() {
return errCode;
}
-VOID GamePauseTimer() {
+void GamePauseTimer() {
bPause = TRUE;
}
-VOID GameResumeTimer() {
+void GameResumeTimer() {
bPause = FALSE;
}
@@ -841,7 +841,7 @@ ERROR_CODE EndGame(CDC *pDC) {
return errCode;
}
-VOID WinGame() {
+void WinGame() {
UINT n;
// update the final score
@@ -863,7 +863,7 @@ VOID WinGame() {
* returns Nothing
*
**/
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
/*
* Our user preference dialog box is self contained in this object
*/
@@ -885,7 +885,7 @@ VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
* returns Nothing
*
**/
-VOID LoadGameCfg() {
+void LoadGameCfg() {
CHAR buf[10];
INT n;
@@ -969,7 +969,7 @@ VOID LoadGameCfg() {
* returns Nothing
*
**/
-VOID SaveGameCfg() {
+void SaveGameCfg() {
WritePrivateProfileString(INI_SECTION, "RandomLetters",
gGameCfg.bRandomLetters ? "Yes" : "No", INI_FILENAME);
WritePrivateProfileString(INI_SECTION, "NumStartingLetters",
@@ -1091,7 +1091,7 @@ ERROR_CODE ValidatePhrase(PHRASES *phrase) {
}
-VOID GameGetScore(UINT *nLeft, UINT *nTotal, UINT *nLeftAvg, UINT *nTotalAvg) {
+void GameGetScore(UINT *nLeft, UINT *nTotal, UINT *nLeftAvg, UINT *nTotalAvg) {
/* can't write to null pointers */
assert(nLeft != nullptr);
assert(nTotal != nullptr);
@@ -1121,7 +1121,7 @@ VOID GameGetScore(UINT *nLeft, UINT *nTotal, UINT *nLeftAvg, UINT *nTotalAvg) {
* returns nSprites = number of sprites in linked list
*
**/
-INT NumLinkedSprites(VOID) {
+INT NumLinkedSprites(void) {
CSprite *pSprite;
INT i = 0;
diff --git a/engines/bagel/hodjnpodj/pdq/game.h b/engines/bagel/hodjnpodj/pdq/game.h
index 47d51b19d8f..dc3d30ee5d5 100644
--- a/engines/bagel/hodjnpodj/pdq/game.h
+++ b/engines/bagel/hodjnpodj/pdq/game.h
@@ -85,16 +85,16 @@ namespace PDQ {
*/
extern ERROR_CODE InitGame(HWND, CDC *);
extern ERROR_CODE StartGame(CDC *);
-extern VOID GameStopTimer(VOID);
-extern ERROR_CODE GameStartTimer(VOID);
-extern VOID GamePauseTimer(VOID);
-extern VOID GameResumeTimer(VOID);
+extern void GameStopTimer(void);
+extern ERROR_CODE GameStartTimer(void);
+extern void GamePauseTimer(void);
+extern void GameResumeTimer(void);
extern ERROR_CODE EndGame(CDC *);
-extern VOID WinGame(VOID);
+extern void WinGame(void);
extern ERROR_CODE RepaintSpriteList(CDC *);
extern bool CheckUserGuess(const CHAR *);
-extern VOID CALLBACK GetGameParams(CWnd *);
-extern VOID GameGetScore(UINT *, UINT *, UINT *, UINT *);
+extern void CALLBACK GetGameParams(CWnd *);
+extern void GameGetScore(UINT *, UINT *, UINT *, UINT *);
} // namespace PDQ
} // namespace HodjNPodj
diff --git a/engines/bagel/hodjnpodj/pdq/guess.h b/engines/bagel/hodjnpodj/pdq/guess.h
index 656ac33ae9a..0c62845d8a8 100644
--- a/engines/bagel/hodjnpodj/pdq/guess.h
+++ b/engines/bagel/hodjnpodj/pdq/guess.h
@@ -45,7 +45,7 @@ protected:
virtual void DoDataExchange(CDataExchange *) override; // DDX/DDV support
BOOL OnInitDialog(void) override;
void OnTimer(UINT_PTR);
- void OnPaint(VOID);
+ void OnPaint(void);
void OnSetFocus(CWnd *);
void OnActivate(UINT, CWnd *, BOOL) override;
BOOL OnEraseBkgnd(CDC *);
diff --git a/engines/bagel/hodjnpodj/pdq/main.cpp b/engines/bagel/hodjnpodj/pdq/main.cpp
index 4eb00ca791f..1cb7ab5d368 100644
--- a/engines/bagel/hodjnpodj/pdq/main.cpp
+++ b/engines/bagel/hodjnpodj/pdq/main.cpp
@@ -72,7 +72,7 @@ STATIC const CHAR *pszCategoryBitmaps[N_CATEGORIES] = {
/*
* Local prototypes
*/
-VOID UpdateScore(UINT, UINT, UINT, UINT);
+void UpdateScore(UINT, UINT, UINT, UINT);
/*
* Globals
@@ -215,7 +215,7 @@ CMainWindow::CMainWindow() {
HandleError(errCode);
}
-ERROR_CODE CMainWindow::LoadCategoryNames(VOID) {
+ERROR_CODE CMainWindow::LoadCategoryNames(void) {
CDC *pDC;
INT i;
ERROR_CODE errCode;
@@ -250,7 +250,7 @@ ERROR_CODE CMainWindow::LoadCategoryNames(VOID) {
return errCode;
}
-VOID CMainWindow::ReleaseCategoryNames(VOID) {
+void CMainWindow::ReleaseCategoryNames(void) {
INT i;
for (i = N_CATEGORIES - 1; i >= 0; i--) {
@@ -262,7 +262,7 @@ VOID CMainWindow::ReleaseCategoryNames(VOID) {
}
-VOID CMainWindow::PaintCategory(INT iType) {
+void CMainWindow::PaintCategory(INT iType) {
CDC *pDC;
assert((iType >= 0) && (iType < N_CATEGORIES));
@@ -278,7 +278,7 @@ VOID CMainWindow::PaintCategory(INT iType) {
}
-VOID CMainWindow::EraseCategory(VOID) {
+void CMainWindow::EraseCategory(void) {
CDC *pDC;
assert((m_iLastType >= 0) && (m_iLastType < N_CATEGORIES));
@@ -292,7 +292,7 @@ VOID CMainWindow::EraseCategory(VOID) {
}
-VOID CMainWindow::HandleError(ERROR_CODE errCode) {
+void CMainWindow::HandleError(ERROR_CODE errCode) {
//
// Exit this application on fatal errors
//
@@ -705,7 +705,7 @@ void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
CWnd::OnChar(nChar, nRepCnt, nFlags);
}
-VOID UpdateScore(UINT nLeft, UINT nTotal, UINT nLeftAvg, UINT nTotalAvg) {
+void UpdateScore(UINT nLeft, UINT nTotal, UINT nLeftAvg, UINT nTotalAvg) {
char buf[40];
CDC *pDC;
diff --git a/engines/bagel/hodjnpodj/pdq/main.h b/engines/bagel/hodjnpodj/pdq/main.h
index f627f1e5876..6e233301d92 100644
--- a/engines/bagel/hodjnpodj/pdq/main.h
+++ b/engines/bagel/hodjnpodj/pdq/main.h
@@ -41,20 +41,20 @@ public:
CMainWindow();
~CMainWindow() override {}
- VOID PlayGame(void);
- VOID PaintScreen(VOID);
- VOID PaintCategory(INT);
- VOID EraseCategory(VOID);
+ void PlayGame(void);
+ void PaintScreen(void);
+ void PaintCategory(INT);
+ void EraseCategory(void);
int m_nTurnCount = 0;
protected:
- ERROR_CODE LoadCategoryNames(VOID);
- VOID ReleaseCategoryNames(VOID);
+ ERROR_CODE LoadCategoryNames(void);
+ void ReleaseCategoryNames(void);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
- VOID HandleError(ERROR_CODE);
- VOID OnSoundNotify(CSound *pSound);
+ void HandleError(ERROR_CODE);
+ void OnSoundNotify(CSound *pSound);
void OnPaint(void);
void OnChar(UINT, UINT, UINT);
diff --git a/engines/bagel/hodjnpodj/pdq/usercfg.cpp b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
index a40a0298f51..41e8c2e2f80 100644
--- a/engines/bagel/hodjnpodj/pdq/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
@@ -152,7 +152,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
}
-VOID CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
switch (pScroll->GetDlgCtrlID()) {
case ID_SPEED:
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.cpp b/engines/bagel/hodjnpodj/riddles/riddles.cpp
index 09023b68a9f..c695c52f4f8 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.cpp
+++ b/engines/bagel/hodjnpodj/riddles/riddles.cpp
@@ -130,7 +130,7 @@ namespace Riddles {
// local prototypes
//
-VOID CALLBACK GetGameParams(CWnd *);
+void CALLBACK GetGameParams(CWnd *);
//
// Globals
@@ -148,7 +148,7 @@ STATIC RIDDLE curRiddle;
STATIC CSprite *aMasterSpriteList[N_SPRITECHARS];
-CRiddlesWindow::CRiddlesWindow(VOID) :
+CRiddlesWindow::CRiddlesWindow(void) :
cBrush(PALETTEINDEX(11)) {
CString WndClass;
CRect tmpRect;
@@ -310,7 +310,7 @@ CRiddlesWindow::CRiddlesWindow(VOID) :
HandleError(errCode);
}
-VOID CRiddlesWindow::HandleError(ERROR_CODE errCode) {
+void CRiddlesWindow::HandleError(ERROR_CODE errCode) {
//
// Exit this application on fatal errors
//
@@ -331,7 +331,7 @@ VOID CRiddlesWindow::HandleError(ERROR_CODE errCode) {
}
-ERROR_CODE CRiddlesWindow::LoadMasterSprites(VOID) {
+ERROR_CODE CRiddlesWindow::LoadMasterSprites(void) {
CBitmap *pBmp, *pFontBmp;
CSprite *pSprite;
CDC *pDC;
@@ -397,7 +397,7 @@ ERROR_CODE CRiddlesWindow::LoadMasterSprites(VOID) {
}
-VOID CRiddlesWindow::OnPaint() {
+void CRiddlesWindow::OnPaint() {
PAINTSTRUCT lpPaint;
Invalidate(FALSE);
@@ -407,7 +407,7 @@ VOID CRiddlesWindow::OnPaint() {
}
-VOID CRiddlesWindow::PaintScreen() {
+void CRiddlesWindow::PaintScreen() {
CDibDoc myDoc;
CRect rcDest;
CRect rcDIB;
@@ -534,16 +534,16 @@ BOOL CRiddlesWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
}
-VOID CRiddlesWindow::GamePause(VOID) {
+void CRiddlesWindow::GamePause(void) {
m_bPause = TRUE;
};
-VOID CRiddlesWindow::GameResume(VOID) {
+void CRiddlesWindow::GameResume(void) {
m_bPause = FALSE;
};
-VOID CRiddlesWindow::PlayGame() {
+void CRiddlesWindow::PlayGame() {
CHAR szBuf[40];
ERROR_CODE errCode;
CSound *pRiddleReading = nullptr;
@@ -590,7 +590,7 @@ VOID CRiddlesWindow::PlayGame() {
HandleError(errCode);
}
-VOID CRiddlesWindow::LoadIniSettings() {
+void CRiddlesWindow::LoadIniSettings() {
INT nVal;
if (pGameParams->bPlayingMetagame) {
@@ -634,7 +634,7 @@ VOID CRiddlesWindow::LoadIniSettings() {
}
-VOID CRiddlesWindow::GameReset(VOID) {
+void CRiddlesWindow::GameReset(void) {
CDC *pDC;
pDC = GetDC(); // get the current device context
@@ -820,7 +820,7 @@ ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
}
-ERROR_CODE CRiddlesWindow::BuildSpriteList(VOID) {
+ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
CHAR *pRiddle, *p;
INT x, y;
UINT nCharsPerLine;
@@ -1075,7 +1075,7 @@ ERROR_CODE CRiddlesWindow::RepaintSpriteList() {
}
-VOID CRiddlesWindow::OnTimer(UINT_PTR nEvent) {
+void CRiddlesWindow::OnTimer(UINT_PTR nEvent) {
CDC *pDC;
// there should be only one timer
@@ -1147,7 +1147,7 @@ VOID CRiddlesWindow::OnTimer(UINT_PTR nEvent) {
}
-VOID CRiddlesWindow::OnMouseMove(UINT, CPoint) {
+void CRiddlesWindow::OnMouseMove(UINT, CPoint) {
SetCursor(LoadCursor(nullptr, IDC_ARROW));
}
@@ -1232,7 +1232,7 @@ void CMyEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
}
-VOID CMyEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMyEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
CHAR szBuf[MAX_ANSWER_LENGTH + 1];
//
@@ -1278,7 +1278,7 @@ BEGIN_MESSAGE_MAP(CMyEdit, CEdit)
ON_WM_SYSKEYDOWN()
END_MESSAGE_MAP()
-VOID CRiddlesWindow::ParseAnswer(const CHAR *pszAnswer) {
+void CRiddlesWindow::ParseAnswer(const CHAR *pszAnswer) {
if (m_bGameActive && !m_bPause) {
GamePause();
@@ -1334,7 +1334,7 @@ BOOL CRiddlesWindow::CheckUserGuess(const CHAR *pszGuess) {
return FALSE;
}
-VOID CRiddlesWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CRiddlesWindow::OnLButtonDown(UINT nFlags, CPoint point) {
CDC *pDC;
CRect animRect; // All three Easter Egg animations are in the same place
CRect col1Rect,
@@ -1442,12 +1442,12 @@ VOID CRiddlesWindow::OnLButtonDown(UINT nFlags, CPoint point) {
}
}
-VOID CRiddlesWindow::OnSetFocus(CWnd *) {
+void CRiddlesWindow::OnSetFocus(CWnd *) {
if (m_pEditText != nullptr)
m_pEditText->SetFocus();
}
-VOID CRiddlesWindow::DeleteSprite(CSprite *pSprite) {
+void CRiddlesWindow::DeleteSprite(CSprite *pSprite) {
CDC *pDC;
// can't delete a null pointer
@@ -1462,7 +1462,7 @@ VOID CRiddlesWindow::DeleteSprite(CSprite *pSprite) {
delete pSprite; // delete it
}
-VOID CRiddlesWindow::FlushInputEvents(VOID) {
+void CRiddlesWindow::FlushInputEvents(void) {
MSG msg;
// find and remove all keyboard events
@@ -1480,7 +1480,7 @@ VOID CRiddlesWindow::FlushInputEvents(VOID) {
}
}
-VOID CRiddlesWindow::OnClose() {
+void CRiddlesWindow::OnClose() {
CBrush myBrush;
CRect myRect;
CDC *pDC;
@@ -1597,7 +1597,7 @@ BEGIN_MESSAGE_MAP(CRiddlesWindow, CFrameWnd)
ON_MESSAGE(MM_WOM_DONE, CRiddlesWindow::OnMMIONotify)
END_MESSAGE_MAP()
-VOID CALLBACK GetGameParams(CWnd *pParentWnd) {
+void CALLBACK GetGameParams(CWnd *pParentWnd) {
//
// Our user preference dialog box is self contained in this object
//
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index e1eea10c049..fc6ef5a7c5f 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -112,10 +112,10 @@ struct RIDDLE {
class CMyEdit: public CEdit {
protected:
- VOID OnChar(UINT, UINT, UINT);
- VOID OnSysChar(UINT, UINT, UINT);
- VOID OnKeyDown(UINT, UINT, UINT);
- VOID OnSysKeyDown(UINT, UINT, UINT);
+ void OnChar(UINT, UINT, UINT);
+ void OnSysChar(UINT, UINT, UINT);
+ void OnKeyDown(UINT, UINT, UINT);
+ void OnSysKeyDown(UINT, UINT, UINT);
DECLARE_MESSAGE_MAP()
};
@@ -125,38 +125,38 @@ private:
CBrush cBrush;
public:
- CRiddlesWindow(VOID);
- VOID PlayGame(VOID);
- VOID PaintScreen(VOID);
- VOID LoadIniSettings(VOID);
- VOID ParseAnswer(const CHAR *);
- VOID GamePause(VOID);
- VOID GameResume(VOID);
+ CRiddlesWindow(void);
+ void PlayGame(void);
+ void PaintScreen(void);
+ void LoadIniSettings(void);
+ void ParseAnswer(const CHAR *);
+ void GamePause(void);
+ void GameResume(void);
private:
- VOID OnSoundNotify(CSound *pSound);
+ void OnSoundNotify(CSound *pSound);
protected:
- VOID FlushInputEvents(VOID);
+ void FlushInputEvents(void);
BOOL CheckUserGuess(const CHAR *);
- ERROR_CODE RepaintSpriteList(VOID);
- ERROR_CODE LoadRiddle(VOID);
- ERROR_CODE BuildSpriteList(VOID);
+ ERROR_CODE RepaintSpriteList(void);
+ ERROR_CODE LoadRiddle(void);
+ ERROR_CODE BuildSpriteList(void);
ERROR_CODE DisplayLine(const CHAR *, INT, INT, INT);
INT CharToIndex(CHAR);
ERROR_CODE ValidateRiddle(RIDDLE *);
- ERROR_CODE LoadMasterSprites(VOID);
- VOID GameReset(VOID);
+ ERROR_CODE LoadMasterSprites(void);
+ void GameReset(void);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
- VOID HandleError(ERROR_CODE);
- VOID DeleteSprite(CSprite *);
-
- VOID OnPaint();
- VOID OnMouseMove(UINT, CPoint);
- VOID OnLButtonDown(UINT, CPoint);
- VOID OnClose();
- VOID OnSetFocus(CWnd *);
- VOID OnTimer(UINT_PTR);
+ void HandleError(ERROR_CODE);
+ void DeleteSprite(CSprite *);
+
+ void OnPaint();
+ void OnMouseMove(UINT, CPoint);
+ void OnLButtonDown(UINT, CPoint);
+ void OnClose();
+ void OnSetFocus(CWnd *);
+ void OnTimer(UINT_PTR);
LRESULT OnMCINotify(WPARAM, LPARAM);
LRESULT OnMMIONotify(WPARAM, LPARAM);
HBRUSH OnCtlColor(CDC *, CWnd *, UINT);
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.cpp b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
index 2176a48b80f..89b9e018ac0 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
@@ -154,7 +154,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
return CDialog::OnCommand(wParam, lParam);
}
-VOID CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
UINT nCurPos;
// can't access a null pointer
@@ -341,7 +341,7 @@ void CUserCfgDlg::OnPaint(void) {
DispLevel();
}
-VOID CUserCfgDlg::OnLButtonDown(UINT nFlags, CPoint point) {
+void CUserCfgDlg::OnLButtonDown(UINT nFlags, CPoint point) {
CBmpDialog::OnLButtonDown(nFlags, point);
}
@@ -441,7 +441,7 @@ void CUserCfgDlg::ClearDialogImage(void) {
ValidateRect(nullptr);
}
-VOID CUserCfgDlg::DispLimit(VOID) {
+void CUserCfgDlg::DispLimit(void) {
CDC *pDC;
if ((pDC = GetDC()) != nullptr) {
@@ -451,7 +451,7 @@ VOID CUserCfgDlg::DispLimit(VOID) {
}
}
-VOID CUserCfgDlg::DispLevel(VOID) {
+void CUserCfgDlg::DispLevel(void) {
Common::String szBuf;
CDC *pDC;
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index a6cbc031c91..4107dd80870 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -167,7 +167,7 @@ UINT RealizePalette(HDC hdc) {
}
HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih, DWORD flInit,
- CONST VOID *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage) {
+ CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage) {
CBitmap::Impl *bitmap = new CBitmap::Impl();
// Figure out the pixel format
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index f882a605c4d..9932c90f73d 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -747,7 +747,7 @@ extern int GetWindowText(HWND hWnd, LPSTR lpszStringBuf, int nMaxCount);
extern BOOL ScreenToClient(HWND hWnd, LPPOINT lpPoint);
HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih,
- DWORD flInit, CONST VOID *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage);
+ DWORD flInit, CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage);
extern int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
LPVOID lpvBits, LPBITMAPINFO lpbmi, UINT usage);
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index 97a7c7c71b8..cd9532b98af 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -40,7 +40,6 @@ typedef int64 LONGLONG;
typedef uint64 ULONGLONG;
typedef size_t SIZE_T;
typedef float FLOAT;
-typedef void VOID;
typedef FLOAT *PFLOAT;
typedef BOOL *PBOOL;
typedef BOOL *LPBOOL;
Commit: 28448b5fe609408bdf26a082c78012b7f2d80096
https://github.com/scummvm/scummvm/commit/28448b5fe609408bdf26a082c78012b7f2d80096
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:23+03:00
Commit Message:
BAGEL: DWORD -> uint32
Changed paths:
engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
engines/bagel/hodjnpodj/hnplibs/bitmaps.h
engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
engines/bagel/hodjnpodj/hnplibs/dibapi.h
engines/bagel/hodjnpodj/hnplibs/rules.cpp
engines/bagel/hodjnpodj/hnplibs/sprite.cpp
engines/bagel/hodjnpodj/mankala/btimeut.cpp
engines/bagel/hodjnpodj/mankala/btimeut.h
engines/bagel/hodjnpodj/metagame/bgen/bfc.h
engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
engines/bagel/hodjnpodj/novacancy/main.cpp
engines/bagel/hodjnpodj/pdq/game.cpp
engines/bagel/hodjnpodj/peggle/gameinit.cpp
engines/bagel/mfc/afxmsg.h
engines/bagel/mfc/afxwin.h
engines/bagel/mfc/atltypes.h
engines/bagel/mfc/button.cpp
engines/bagel/mfc/dc.cpp
engines/bagel/mfc/dialog.cpp
engines/bagel/mfc/edit.cpp
engines/bagel/mfc/frame_wnd.cpp
engines/bagel/mfc/gfx/dialog_template.h
engines/bagel/mfc/global_functions.cpp
engines/bagel/mfc/global_functions.h
engines/bagel/mfc/libs/event_loop.cpp
engines/bagel/mfc/libs/event_loop.h
engines/bagel/mfc/minwindef.h
engines/bagel/mfc/scrollbar.cpp
engines/bagel/mfc/wingdi.cpp
engines/bagel/mfc/wingdi.h
engines/bagel/mfc/winnt.h
engines/bagel/mfc/wnd.cpp
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index 793190649ba..764c7cf63dd 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -1114,7 +1114,7 @@ void CMainWindow::PlayBackSeries(int nNumNotes) {
BOOL CMainWindow::wait_awhile(int nHundSecs) { // Given time is in hundreths of sec
- DWORD goal;
+ uint32 goal;
MSG msg;
goal = (nHundSecs * 10) + GetTickCount(); // time is in millisecs
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
index 3941138a7ac..177ed5d4b5e 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
@@ -252,7 +252,7 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
*
************************************************************************/
-BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, DWORD dwMode) {
+BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, uint32 dwMode) {
BOOL bSuccess = FALSE;
CDC *pWorkDC = nullptr;
CPalette *pPalOld = nullptr,
@@ -396,7 +396,7 @@ BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
pWorkOld = (*pWorkDC).SelectObject(pWork); // ... their contexts
dstRect.SetRect(0, 0, dx, dy);
- BltBitmap(pImageDC, pPalette, pBitmap, pSrcRect, &dstRect, (DWORD) SRCCOPY);
+ BltBitmap(pImageDC, pPalette, pBitmap, pSrcRect, &dstRect, (uint32) SRCCOPY);
if ((pMaskOld != nullptr) && // verify so far so good
(pWorkOld != nullptr)) {
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.h b/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
index 41276d2cbe4..7965194d72c 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
@@ -91,7 +91,7 @@ BOOL PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, int nBlock
BOOL PaintBlockEffect(CDC *pDC, CDibDoc *pDIB, CPalette *pPalette, int nBlockSize);
BOOL PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette *pPalette, int nBlockSize, int nX, int nY, int nWidth, int nHeight);
-BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, DWORD nMode);
+BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, uint32 nMode);
BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, const int x, const int y);
CSize GetBitmapSize(CBitmap *pBitmap);
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
index 5faa7e94750..8bcfd748fb9 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
@@ -270,11 +270,11 @@ LPSTR FindDIBBits(HDIB hDIB) {
return (LPSTR)hDIB->getPixels();
}
-DWORD DIBWidth(HDIB hDIB) {
+uint32 DIBWidth(HDIB hDIB) {
return hDIB->w;
}
-DWORD DIBHeight(HDIB hDIB) {
+uint32 DIBHeight(HDIB hDIB) {
return hDIB->h;
}
@@ -370,8 +370,8 @@ HBITMAP DIBtoBitmap(HDC hDC, HPALETTE hPalette, HDIB hDib) {
//---------------------------------------------------------------------
void WINAPI InitBitmapInfoHeader(LPBITMAPINFOHEADER lpBmInfoHdr,
- DWORD dwWidth,
- DWORD dwHeight,
+ uint32 dwWidth,
+ uint32 dwHeight,
int nBPP) {
memset(lpBmInfoHdr, 0, sizeof(BITMAPINFOHEADER));
@@ -416,7 +416,7 @@ HANDLE WINAPI CopyHandle(HANDLE h) {
BYTE *lpCopy;
BYTE *lp;
HANDLE hCopy;
- DWORD dwLen;
+ uint32 dwLen;
if (h == nullptr)
return nullptr;
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.h b/engines/bagel/hodjnpodj/hnplibs/dibapi.h
index 6921daa57c0..d51a6f14cd0 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.h
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.h
@@ -42,9 +42,9 @@ typedef Graphics::ManagedSurface *HDIB;
#define DeleteBitmap(hbm) DeleteObject((HGDIOBJ)(HBITMAP)(hbm))
#define SelectBitmap(hdc, hbm) ((HBITMAP)SelectObject((hdc),(HGDIOBJ)(HBITMAP)(hbm)))
-// WIDTHBYTES performs DWORD-aligning of DIB scanlines. The "bits"
+// WIDTHBYTES performs uint32-aligning of DIB scanlines. The "bits"
// parameter is the bit count for the scanline (biWidth * biBitCount),
-// and this macro returns the number of DWORD-aligned bytes needed
+// and this macro returns the number of uint32-aligned bytes needed
// to hold those bits.
#define WIDTHBYTES(bits) (((bits) + 31) / 32 * 4)
@@ -78,14 +78,14 @@ extern LPSTR FindDIBBits(HDIB lpbi);
* @param lpbi Bitmap pointer
* @return Width
*/
-extern DWORD DIBWidth(HDIB lpDIB);
+extern uint32 DIBWidth(HDIB lpDIB);
/**
* This function gets the height of the bitmap.
* @param lpbi Bitmap pointer
* @return Height
*/
-extern DWORD DIBHeight(HDIB lpDIB);
+extern uint32 DIBHeight(HDIB lpDIB);
/**
* Gets the size required to store the DIB's palette
@@ -137,8 +137,8 @@ extern HDIB ReadDIBFile(CFile &file);
extern HDIB ReadDIBResource(const char *pszPathName);
void InitBitmapInfoHeader(LPBITMAPINFOHEADER lpBmInfoHdr,
- DWORD dwWidth,
- DWORD dwHeight,
+ uint32 dwWidth,
+ uint32 dwHeight,
int nBPP);
void ShowMemoryInfo(const char *chMessage, const char *chTitle);
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.cpp b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
index e9c6236ad18..2cce5428694 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
@@ -112,9 +112,9 @@ static CDC *pScrollDC = nullptr, // device context for the scroll b
static CFont *pFont = nullptr; // font to use for displaying rules text
static char chPathName[128]; // buffer to hold path name of the rules file
static CFile *pHelpFile = nullptr; // the rules file
-static DWORD nHelpFileSize = 0; // size of rules file
+static uint32 nHelpFileSize = 0; // size of rules file
static int nHelpPage = 0; // current page of rules text
-static DWORD dwHelpPagePosition[100]; // position of each page (# chars from file start)
+static uint32 dwHelpPagePosition[100]; // position of each page (# chars from file start)
static BOOL dwHelpPageEOL[100]; // whether page starts with enforced line break
static BOOL bHelpEOF = FALSE; // whether end-of-file has been reached
static int tabstop = 20 + TEXT_LEFT_MARGIN;// pixels per tab stop
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
index f41916d5fa8..f4e7360fd84 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
@@ -2211,7 +2211,7 @@ BOOL CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint * pPoint) {
int dx, dy, // dimensions of context bitmaps
i, j;
size_t stN;
- DWORD dwN; //, dwByte; // delta sizes of work area's bitmap
+ uint32 dwN; //, dwByte; // delta sizes of work area's bitmap
BITMAP cBitmapData;
int bx, by, bdx, bdy;
diff --git a/engines/bagel/hodjnpodj/mankala/btimeut.cpp b/engines/bagel/hodjnpodj/mankala/btimeut.cpp
index a20c4079c78..80d0717c1d4 100644
--- a/engines/bagel/hodjnpodj/mankala/btimeut.cpp
+++ b/engines/bagel/hodjnpodj/mankala/btimeut.cpp
@@ -65,7 +65,7 @@ cleanup:
}
void CTimeUtil::DelayMsCallback(HWND hWnd, UINT uMsg,
- UINT_PTR uTimerId, DWORD dwTime) {
+ UINT_PTR uTimerId, uint32 dwTime) {
JXENTER(::DelayMsCallback) ;
//int iError = 0 ; // error code
bTimeDelayPassed = TRUE ; // elapsed time passed
diff --git a/engines/bagel/hodjnpodj/mankala/btimeut.h b/engines/bagel/hodjnpodj/mankala/btimeut.h
index 4223a277d29..16b24c356c4 100644
--- a/engines/bagel/hodjnpodj/mankala/btimeut.h
+++ b/engines/bagel/hodjnpodj/mankala/btimeut.h
@@ -52,7 +52,7 @@ private:
BOOL DelayMs(UINT uMs) ;
static void DelayMsCallback(HWND /* hWnd */,
- UINT /* uMsg */, UINT_PTR /* uTimerId */, DWORD /* dwTime */) ;
+ UINT /* uMsg */, UINT_PTR /* uTimerId */, uint32 /* dwTime */) ;
};
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bfc.h b/engines/bagel/hodjnpodj/metagame/bgen/bfc.h
index 0076f5be836..94041e5f46b 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bfc.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bfc.h
@@ -145,8 +145,8 @@ public:
// This field does NOT need to be save in the
// .SAV file.
- DWORD m_dwFreeSpaceMargin;
- DWORD m_dwFreePhysicalMargin;
+ uint32 m_dwFreeSpaceMargin;
+ uint32 m_dwFreePhysicalMargin;
int m_nInstallationCode;
char m_chHomePath[PATHSPECSIZE];
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
index 9ee3306585a..3e3101b55fa 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
@@ -36,10 +36,10 @@ namespace Gtl {
#define CONTROL_PHYSICAL_MEMORY TRUE
-typedef DWORD (FAR PASCAL * FPGETFREEMEMINFO)(void);
+typedef uint32 (FAR PASCAL * FPGETFREEMEMINFO)(void);
FPGETFREEMEMINFO lpfnGetFreeMemInfo;
-BOOL CheckLowMemory(DWORD);
-DWORD GetPhysicalMemory(void);
+BOOL CheckLowMemory(uint32);
+uint32 GetPhysicalMemory(void);
extern CBfcMgr *lpMetaGameStruct;
@@ -1079,9 +1079,9 @@ void CBgbMgr::DoAnimations(void) {
}
}
-BOOL CheckLowMemory(DWORD dwSpace) {
+BOOL CheckLowMemory(uint32 dwSpace) {
BOOL bMemoryProblem;
- DWORD dwFreeSpace;
+ uint32 dwFreeSpace;
bMemoryProblem = FALSE;
dwFreeSpace = GetFreeSpace(0);
@@ -1091,7 +1091,7 @@ BOOL CheckLowMemory(DWORD dwSpace) {
return bMemoryProblem;
}
-DWORD GetPhysicalMemory() {
+uint32 GetPhysicalMemory() {
return GetFreeSpace(0);
}
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
index 2b3d427a911..6eb77ad373a 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
@@ -30,7 +30,7 @@ namespace Metagame {
BOOL bTimeDelayPassed = TRUE ;
void CALLBACK DelayMsCallback(HWND /* hWnd */,
- UINT /* uMsg */, UINT /* uTimerId */, DWORD /* dwTime */);
+ UINT /* uMsg */, UINT /* uTimerId */, uint32 /* dwTime */);
//* CTimeUtil::DelayMs -- delay for specified # of milliseconds
@@ -66,7 +66,7 @@ cleanup:
///* DelayMsCallback -- SetTimer callback routine for DelayMs
void CTimeUtil::DelayMsCallback(HWND /* hWnd */,
- UINT /* uMsg */, UINT_PTR /* uTimerId */, DWORD /* dwTime */)
+ UINT /* uMsg */, UINT_PTR /* uTimerId */, uint32 /* dwTime */)
// hWnd -- handle of window (always nullptr in this case)
// uMsg -- WM_TIMER message
// uTimerId -- timer identifier
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
index d43207dbc04..70d5c2536c3 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
@@ -56,7 +56,7 @@ private:
* @param dwTime current system time
*/
static void DelayMsCallback(HWND hWnd, UINT uMsg,
- UINT_PTR uTimerId, DWORD dwTime);
+ UINT_PTR uTimerId, uint32 dwTime);
};
} // namespace Metagame
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
index 4f8a2aba867..fa6d007773b 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
@@ -82,7 +82,7 @@ static const char *lpsPlaceSoundSpec = nullptr; // spec for place sound fi
static CFont *pNoteFont = nullptr; // font to use for displaying notebook text
//static char chPathName[128]; // buffer to hold path name of the notebook file
//static CFile *pInfoFile = nullptr; // the notebook file
-//static DWORD nInfoFileSize = 0; // size of notebook file
+//static uint32 nInfoFileSize = 0; // size of notebook file
//static BOOL bInfoEOF = FALSE; // whether end-of-file has been reached
static BOOL bActiveWindow = FALSE; // whether our window is active
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index 72835eaab24..82571e9a584 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -81,7 +81,7 @@ using GrandTour::LPGRANDTRSTRUCT;
typedef HWND (FAR PASCAL *FPZOOMFUNCT)(HWND, BOOL);
typedef HWND (FAR PASCAL *FPGTFUNCT)(HWND, LPGRANDTRSTRUCT);
typedef HWND (FAR PASCAL *FPMETAFUNCT)(HWND, CBfcMgr *, BOOL);
-typedef DWORD (FAR PASCAL * FPGETFREEMEMINFO)(void);
+typedef uint32 (FAR PASCAL * FPGETFREEMEMINFO)(void);
// Flags when a .dll in the original is loaded
@@ -94,8 +94,8 @@ BOOL bScrollingEnabled = TRUE;
BOOL bSlowCPU = FALSE;
BOOL bLowMemory = FALSE;
-DWORD dwFreeSpaceMargin;
-DWORD dwFreePhysicalMargin;
+uint32 dwFreeSpaceMargin;
+uint32 dwFreePhysicalMargin;
int nMidiVolume;
int nWaveVolume;
@@ -375,7 +375,7 @@ BOOL CHodjPodjWindow::CheckConfig(CDC *pDC) {
BOOL CHodjPodjWindow::CheckLowMemory(void) {
BOOL bMemoryProblem;
- DWORD dwFreeSpace;
+ uint32 dwFreeSpace;
bMemoryProblem = FALSE;
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
index a411f1a8dab..29246bf72a5 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
@@ -1067,7 +1067,7 @@ void CMainGTWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
CRect rTempRect;
char cAlpha[27];
int i;
- DWORD dwTextWidth;
+ uint32 dwTextWidth;
int nLeft = SCROLL_LEFT;
int nTop = SCROLL_TOP;
CDC *pDC = nullptr;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
index 92dc8479f6d..3c641f5288d 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
@@ -45,7 +45,7 @@ namespace Gtl {
#define PODJ_SOUND_END 64000
#define PODJS_STARS_FILE ".\\ART\\PSTAR.BMP"
-extern DWORD GetPhysicalMemory(void);
+extern uint32 GetPhysicalMemory(void);
CNode::CNode() {
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
index ff7967556da..3e052f79dca 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
@@ -115,9 +115,9 @@ static CDC *pScrollDC = nullptr, // device context for the scroll
static CFont *pFont = nullptr; // font to use for displaying rules text
static char chPathName[128]; // buffer to hold path name of the rules file
static CFile *pHelpFile = nullptr; // the rules file
-static DWORD nHelpFileSize = 0; // size of rules file
+static uint32 nHelpFileSize = 0; // size of rules file
static int nHelpPage = 0; // current page of rules text
-static DWORD dwHelpPagePosition[100]; // position of each page (# chars from file start)
+static uint32 dwHelpPagePosition[100]; // position of each page (# chars from file start)
static BOOL dwHelpPageEOL[100]; // whether page starts with enforced line break
static BOOL bHelpEOF = FALSE; // whether end-of-file has been reached
static int tabstop = 20 + TEXT_LEFT_MARGIN;// pixels per tab stop
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp b/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
index e7d7cc2a882..216951bd379 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
@@ -272,7 +272,7 @@ void CSpinner::SetupSpinner(void) {
int CSpinner::Animate(int nX, int nY) {
int nValue = -1;
- DWORD goal;
+ uint32 goal;
m_nX = nX; // establish position
m_nY = nY;
@@ -410,11 +410,11 @@ int CSpinner::Spin(void) {
i = nValue / 10; // update spinner with actual value
srcRect.SetRect(i * SPINNER_SLOT_DDX, 0, (i + 1) * SPINNER_SLOT_DDX, SPINNER_SLOT_DDY);
- bSuccess = BltBitmap(m_pDC, pPalette, pBitmap, &srcRect, &dstARect, (DWORD) SRCCOPY);
+ bSuccess = BltBitmap(m_pDC, pPalette, pBitmap, &srcRect, &dstARect, (uint32) SRCCOPY);
if (bSuccess) {
j = nValue % 10;
srcRect.SetRect(j * SPINNER_SLOT_DDX, 0, (j + 1) * SPINNER_SLOT_DDX, SPINNER_SLOT_DDY);
- bSuccess = BltBitmap(m_pDC, pPalette, pBitmap, &srcRect, &dstBRect, (DWORD) SRCCOPY);
+ bSuccess = BltBitmap(m_pDC, pPalette, pBitmap, &srcRect, &dstBRect, (uint32) SRCCOPY);
}
app->pause();
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index cae5b05892a..03f7a5f2817 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -552,8 +552,8 @@ void CMainWindow::PlayGame() {
AnimateDice();
#pragma warning(disable: 4135)
- m_LDie = (BYTE)(((DWORD)(UINT)brand() * 6L) / ((DWORD)(UINT)RAND_MAX + 1L)) + 1;
- m_RDie = (BYTE)(((DWORD)(UINT)brand() * 6L) / ((DWORD)(UINT)RAND_MAX + 1L)) + 1;
+ m_LDie = (BYTE)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
+ m_RDie = (BYTE)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)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());
@@ -669,7 +669,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
short jj;
BOOL AllFxd, //flag to indicate all fixed (locked) doors.
AllClosed; //flag to indicate all closed doors.
- DWORD V;
+ uint32 V;
CDC* pDC;
short int cel;
CSprite* pBottleSprite,
@@ -800,9 +800,9 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
/* randomise throws */
#pragma warning(disable: 4135)
- V = (DWORD)((UINT)RAND_MAX + 1);
- m_LDie = (BYTE)(((DWORD)(UINT)brand() * 6L) / V) +1; // left Die
- m_RDie = m_bOneDieCase ? 0 : (BYTE)(((DWORD)(UINT)brand() * 6) / V) +1; // right Die
+ V = (uint32)((UINT)RAND_MAX + 1);
+ m_LDie = (BYTE)(((uint32)(UINT)brand() * 6L) / V) +1; // left Die
+ m_RDie = m_bOneDieCase ? 0 : (BYTE)(((uint32)(UINT)brand() * 6) / V) +1; // right Die
#pragma warning(default: 4135)
pDC = GetDC();
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index 5ef4a36b7d2..281656cc62d 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -78,7 +78,7 @@ ERROR_CODE BuildSpriteList(CDC *);
void KillCurPhrase(void);
void BuildRandomPhraseOrder();
bool RevealNextLetter(void);
-void CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, DWORD);
+void CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, uint32);
INT StrLenNoSpaces(const CHAR *);
INT GetIndex(CSprite *);
void LoadGameCfg(void);
@@ -664,7 +664,7 @@ ERROR_CODE CleanScreen(CDC *pDC) {
* HWND hWnd Handle of window that received WM_TIMER
* UINT nMsg WM_TIMER
* UINT nEventID TIMER_ID
-* DWORD dwTime time that event occured
+* uint32 dwTime time that event occured
*
* purpose To provide a callback routine for hooking the WM_TIMER.
* Usage: SetTimer(hWnd, tID, time, GameTimerHook);
@@ -673,7 +673,7 @@ ERROR_CODE CleanScreen(CDC *pDC) {
* returns Nothing
*
**/
-void CALLBACK GameTimerHook(HWND hWnd, UINT, UINT_PTR nEventID, DWORD) {
+void CALLBACK GameTimerHook(HWND hWnd, UINT, UINT_PTR nEventID, uint32) {
CDC *pDC;
HDC hDC;
BOOL done;
diff --git a/engines/bagel/hodjnpodj/peggle/gameinit.cpp b/engines/bagel/hodjnpodj/peggle/gameinit.cpp
index 175dba96049..f054c044651 100644
--- a/engines/bagel/hodjnpodj/peggle/gameinit.cpp
+++ b/engines/bagel/hodjnpodj/peggle/gameinit.cpp
@@ -44,11 +44,11 @@ int syscolorelements[SYSCOLORS] = {
// Place to save Windows colors being altered
-DWORD oldsyscolorvalues[SYSCOLORS];
+uint32 oldsyscolorvalues[SYSCOLORS];
// 8-Bit 256 color parameter values for Windows
-DWORD syscolorvalues_8bit[SYSCOLORS] = {
+uint32 syscolorvalues_8bit[SYSCOLORS] = {
RGB(207, 103, 123),
RGB(187, 147, 107),
RGB(147, 99, 79),
@@ -56,7 +56,7 @@ DWORD syscolorvalues_8bit[SYSCOLORS] = {
};
// Non-Palette oriented color parameter values for Windows
-DWORD syscolorvalues_moby[SYSCOLORS] = {
+uint32 syscolorvalues_moby[SYSCOLORS] = {
RGB(207, 103, 123),
RGB(187, 147, 107),
RGB(147, 99, 79),
diff --git a/engines/bagel/mfc/afxmsg.h b/engines/bagel/mfc/afxmsg.h
index ae9071fcaab..df1ac61057b 100644
--- a/engines/bagel/mfc/afxmsg.h
+++ b/engines/bagel/mfc/afxmsg.h
@@ -844,7 +844,7 @@ namespace MFC {
#define ON_WM_TCARD() \
{ WM_TCARD, 0, 0, 0, AfxSig_vwl, \
(AFX_PMSG)(AFX_PMSGW) \
- (static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, DWORD) > ( &ThisClass::OnTCard)) },
+ (static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, uint32) > ( &ThisClass::OnTCard)) },
#define ON_WM_TIMER() \
{ WM_TIMER, 0, 0, 0, AfxSig_vw, \
@@ -1209,7 +1209,7 @@ namespace MFC {
#define ON_WM_DWMCOLORIZATIONCOLORCHANGED() \
{ WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, 0, AfxSig_vww, \
(AFX_PMSG)(AFX_PMSGW) \
- (static_cast< void (AFX_MSG_CALL CWnd::*)(DWORD, BOOL) > ( &ThisClass::OnColorizationColorChanged)) },
+ (static_cast< void (AFX_MSG_CALL CWnd::*)(uint32, BOOL) > ( &ThisClass::OnColorizationColorChanged)) },
#define ON_WM_DWMWINDOWMAXIMIZEDCHANGE() \
{ WM_DWMWINDOWMAXIMIZEDCHANGE, 0, 0, 0, AfxSig_vb, \
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index d4dfb79a745..fcb66f19eae 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -750,9 +750,9 @@ public:
void ellipse(int x1, int y1, int x2, int y2);
void bitBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, DWORD dwRop);
+ int xSrc, int ySrc, uint32 dwRop);
void stretchBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, DWORD dwRop);
+ int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, uint32 dwRop);
void moveTo(int x, int y);
void lineTo(int x, int y);
@@ -863,9 +863,9 @@ public:
BOOL LPtoDP(LPPOINT lpPoints, int nCount = 1);
BOOL LPtoDP(RECT *lpRect);
BOOL BitBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, DWORD dwRop);
+ int xSrc, int ySrc, uint32 dwRop);
BOOL StretchBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, DWORD dwRop);
+ int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, uint32 dwRop);
void Ellipse(LPCRECT lpRect);
void Ellipse(int x1, int y1, int x2, int y2);
void FrameRect(LPCRECT lpRect, CBrush *pBrush);
@@ -1077,7 +1077,7 @@ typedef struct tagCREATESTRUCTA {
LONG style = 0;
LPCSTR lpszName = nullptr;
LPCSTR lpszClass = nullptr;
- DWORD dwExStyle = 0;
+ uint32 dwExStyle = 0;
} CREATESTRUCT, *LPCREATESTRUCT;
@@ -1127,7 +1127,7 @@ protected:
BOOL OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult);
- afx_msg void OnActivateApp(BOOL bActive, DWORD dwThreadID) {}
+ afx_msg void OnActivateApp(BOOL bActive, uint32 dwThreadID) {}
afx_msg LRESULT OnActivateTopLevel(WPARAM, LPARAM) {
return 0;
}
@@ -1175,7 +1175,7 @@ protected:
afx_msg void OnSetFocus(CWnd *pOldWnd) {}
afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
afx_msg void OnSize(UINT nType, int cx, int cy) {}
- afx_msg void OnTCard(UINT idAction, DWORD dwActionData) {}
+ afx_msg void OnTCard(UINT idAction, uint32 dwActionData) {}
afx_msg void OnSessionChange(UINT nSessionState, UINT nId) {}
afx_msg void OnChangeUIState(UINT nAction, UINT nUIElement) {}
@@ -1345,14 +1345,14 @@ public:
~CWnd() override;
BOOL Create(LPCSTR lpszClassName, LPCSTR lpszWindowName,
- DWORD dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID,
+ uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID,
CCreateContext *pContext = nullptr);
- BOOL CreateEx(DWORD dwExStyle, LPCTSTR lpszClassName,
- LPCTSTR lpszWindowName, DWORD dwStyle,
+ BOOL CreateEx(uint32 dwExStyle, LPCTSTR lpszClassName,
+ LPCTSTR lpszWindowName, uint32 dwStyle,
int x, int y, int nWidth, int nHeight,
HWND hWndParent, LPARAM nIDorHMenu, LPVOID lpParam = nullptr);
- BOOL CreateEx(DWORD dwExStyle, LPCSTR lpszClassName,
- LPCSTR lpszWindowName, DWORD dwStyle,
+ BOOL CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
+ LPCSTR lpszWindowName, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd, UINT nID,
LPVOID lpParam = nullptr);
@@ -1389,10 +1389,10 @@ public:
int GetWindowText(LPSTR lpszStringBuf, int nMaxCount) const;
BOOL SetWindowText(LPCSTR lpszString);
UINT GetState() const;
- DWORD GetStyle() const {
+ uint32 GetStyle() const {
return m_nStyle;
}
- void SetStyle(DWORD nStyle);
+ void SetStyle(uint32 nStyle);
bool IsWindowEnabled() const {
return (_itemState & ODS_DISABLED) == 0;
}
@@ -1440,7 +1440,7 @@ public:
WPARAM wParam = 0, LPARAM lParam = 0) const;
UINT_PTR SetTimer(UINT_PTR nIDEvent, UINT nElapse,
- void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, DWORD) = nullptr);
+ void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32) = nullptr);
BOOL KillTimer(UINT_PTR nIDEvent);
virtual BOOL PreTranslateMessage(MSG *pMsg) {
@@ -1521,14 +1521,14 @@ public:
BOOL Create(LPCSTR lpszClassName,
LPCSTR lpszWindowName,
- DWORD dwStyle,
+ uint32 dwStyle,
const RECT &rect,
CWnd *pParentWnd = nullptr,
LPCSTR lpszMenuName = nullptr,
- DWORD dwExStyle = 0,
+ uint32 dwExStyle = 0,
CCreateContext *pContext = nullptr);
BOOL Create(LPCSTR lpszClassName, LPCSTR lpszWindowName,
- DWORD dwStyle = WS_OVERLAPPEDWINDOW) {
+ uint32 dwStyle = WS_OVERLAPPEDWINDOW) {
CRect rectDefault;
return Create(lpszClassName, lpszWindowName, dwStyle, rectDefault);
}
@@ -1537,7 +1537,7 @@ public:
void RecalcLayout(BOOL bNotify = TRUE);
void InitialUpdateFrame(CDocument *pDoc, BOOL bMakeVisible);
- BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle,
+ BOOL LoadFrame(UINT nIDResource, uint32 dwDefaultStyle,
CWnd *pParentWnd, CCreateContext *pContext);
CView *GetActiveView() const;
@@ -1597,7 +1597,7 @@ public:
}
BOOL PreTranslateMessage(MSG *pMsg) override;
- DWORD GetDefID() const;
+ uint32 GetDefID() const;
void SetDefID(UINT nID);
LRESULT HandleInitDialog(WPARAM, LPARAM);
LRESULT HandleSetFont(WPARAM, LPARAM);
@@ -1655,7 +1655,7 @@ protected:
public:
~CButton() override {
}
- CVIRTUAL BOOL Create(LPCTSTR lpszCaption, DWORD dwStyle,
+ CVIRTUAL BOOL Create(LPCTSTR lpszCaption, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd, UINT nID);
int GetCheck() const;
@@ -1695,7 +1695,7 @@ protected:
public:
~CEdit() override {
}
- CVIRTUAL BOOL Create(DWORD dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID);
+ CVIRTUAL BOOL Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID);
void LimitText(int nChars);
void SetSel(int nStartChar, int nEndChar, BOOL bNoScroll = FALSE);
@@ -1731,7 +1731,7 @@ protected:
public:
~CScrollBar() override { }
- CVIRTUAL BOOL Create(DWORD dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID);
+ CVIRTUAL BOOL Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID);
int GetScrollPos() const override;
int SetScrollPos(int nPos, BOOL bRedraw = true) override;
diff --git a/engines/bagel/mfc/atltypes.h b/engines/bagel/mfc/atltypes.h
index 4b3381c25b1..3d5b6303bee 100644
--- a/engines/bagel/mfc/atltypes.h
+++ b/engines/bagel/mfc/atltypes.h
@@ -49,8 +49,8 @@ public:
CSize(SIZE initSize);
// create from a point
CSize(POINT initPt);
- // create from a DWORD: cx = LOWORD(dw) cy = HIWORD(dw)
- CSize(DWORD dwSize);
+ // create from a uint32: cx = LOWORD(dw) cy = HIWORD(dw)
+ CSize(uint32 dwSize);
// Operations
BOOL operator==(SIZE size) const;
@@ -310,7 +310,7 @@ inline CSize::CSize(POINT initPt) {
*(POINT *)this = initPt;
}
-inline CSize::CSize(DWORD dwSize) {
+inline CSize::CSize(uint32 dwSize) {
cx = (short)LOWORD(dwSize);
cy = (short)HIWORD(dwSize);
}
diff --git a/engines/bagel/mfc/button.cpp b/engines/bagel/mfc/button.cpp
index d26aa67c794..582c63b0476 100644
--- a/engines/bagel/mfc/button.cpp
+++ b/engines/bagel/mfc/button.cpp
@@ -35,7 +35,7 @@ ON_MESSAGE(BM_CLICK, CButton::OnBnClicked)
ON_MESSAGE(BM_SETCHECK, CButton::OnBnSetCheck)
END_MESSAGE_MAP()
-BOOL CButton::Create(LPCTSTR lpszCaption, DWORD dwStyle,
+BOOL CButton::Create(LPCTSTR lpszCaption, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd, UINT nID) {
return CWnd::Create("BUTTON", lpszCaption, dwStyle, rect,
pParentWnd, nID);
diff --git a/engines/bagel/mfc/dc.cpp b/engines/bagel/mfc/dc.cpp
index 48daeab0f6e..1e5e3f1969f 100644
--- a/engines/bagel/mfc/dc.cpp
+++ b/engines/bagel/mfc/dc.cpp
@@ -322,13 +322,13 @@ BOOL CDC::LPtoDP(RECT *lpRect) {
}
BOOL CDC::BitBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, DWORD dwRop) {
+ int xSrc, int ySrc, uint32 dwRop) {
impl()->bitBlt(x, y, nWidth, nHeight, pSrcDC, xSrc, ySrc, dwRop);
return true;
}
BOOL CDC::StretchBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, DWORD dwRop) {
+ int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, uint32 dwRop) {
impl()->stretchBlt(x, y, nWidth, nHeight, pSrcDC,
xSrc, ySrc, nSrcWidth, nSrcHeight, dwRop);
return true;
@@ -972,7 +972,7 @@ void CDC::Impl::ellipse(int x1, int y1, int x2, int y2) {
}
void CDC::Impl::bitBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, DWORD dwRop) {
+ int xSrc, int ySrc, uint32 dwRop) {
const Common::Rect srcRect(xSrc, ySrc, xSrc + nWidth, ySrc + nHeight);
Gfx::Surface dummySrc;
@@ -991,7 +991,7 @@ void CDC::Impl::bitBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
}
void CDC::Impl::stretchBlt(int x, int y, int nWidth, int nHeight, CDC *pSrcDC,
- int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, DWORD dwRop) {
+ int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, uint32 dwRop) {
Gfx::Surface *src = pSrcDC->impl()->getSurface();
Gfx::Surface *dest = getSurface();
const Common::Rect srcRect(xSrc, ySrc, xSrc + nSrcWidth, ySrc + nSrcHeight);
diff --git a/engines/bagel/mfc/dialog.cpp b/engines/bagel/mfc/dialog.cpp
index b300b6a82db..4e48bc4da58 100644
--- a/engines/bagel/mfc/dialog.cpp
+++ b/engines/bagel/mfc/dialog.cpp
@@ -172,7 +172,7 @@ void CDialog::SetParent(CWnd *wnd) {
m_pParentWnd = wnd;
}
-DWORD CDialog::GetDefID() const {
+uint32 CDialog::GetDefID() const {
return _defaultId;
}
@@ -180,7 +180,7 @@ void CDialog::SetDefID(UINT nID) {
CWnd *oldBtn;
if (_defaultId && (oldBtn = GetDlgItem(_defaultId)) != nullptr) {
- DWORD style = oldBtn->GetStyle();
+ uint32 style = oldBtn->GetStyle();
if ((style & 0xf) != BS_OWNERDRAW) {
style &= ~BS_DEFPUSHBUTTON;
@@ -193,7 +193,7 @@ void CDialog::SetDefID(UINT nID) {
// Set new default
CWnd *newBtn = GetDlgItem(nID);
if (newBtn) {
- DWORD style = newBtn->GetStyle();
+ uint32 style = newBtn->GetStyle();
if ((style & 0xf) != BS_OWNERDRAW) {
style = (style & ~0xF) | BS_DEFPUSHBUTTON;
@@ -224,7 +224,7 @@ BOOL CDialog::PreTranslateMessage(MSG *pMsg) {
// Special case: prevent multi-line edit controls from handling Enter
if (pFocus && pFocus->IsKindOf(RUNTIME_CLASS(CEdit))) {
- DWORD style = pFocus->GetStyle();
+ uint32 style = pFocus->GetStyle();
if ((style & ES_MULTILINE) == 0) {
// Not a multi-line edit box - simulate default pushbutton
CWnd *pDefault = GetDefaultPushButton();
@@ -250,7 +250,7 @@ BOOL CDialog::PreTranslateMessage(MSG *pMsg) {
CWnd *CDialog::GetDefaultPushButton() const {
for (auto &child : _children) {
CWnd *pChild = child._value;
- DWORD style = pChild->GetStyle();
+ uint32 style = pChild->GetStyle();
if ((style & BS_DEFPUSHBUTTON) && pChild->GetDlgCtrlID() == IDOK) {
return pChild;
}
diff --git a/engines/bagel/mfc/edit.cpp b/engines/bagel/mfc/edit.cpp
index c3d50ef9889..a05c644b7f8 100644
--- a/engines/bagel/mfc/edit.cpp
+++ b/engines/bagel/mfc/edit.cpp
@@ -37,7 +37,7 @@ ON_WM_KILLFOCUS()
ON_WM_TIMER()
END_MESSAGE_MAP()
-BOOL CEdit::Create(DWORD dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID) {
+BOOL CEdit::Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID) {
return CWnd::Create("EDIT", nullptr, dwStyle,
rect, pParentWnd, nID);
}
diff --git a/engines/bagel/mfc/frame_wnd.cpp b/engines/bagel/mfc/frame_wnd.cpp
index 9ecaf86e45e..d98b650fcf7 100644
--- a/engines/bagel/mfc/frame_wnd.cpp
+++ b/engines/bagel/mfc/frame_wnd.cpp
@@ -88,7 +88,7 @@ void CFrameWnd::InitialUpdateFrame(CDocument *pDoc, BOOL bMakeVisible) {
OnUpdateFrameTitle(TRUE);
}
-BOOL CFrameWnd::LoadFrame(UINT nIDResource, DWORD dwDefaultStyle,
+BOOL CFrameWnd::LoadFrame(UINT nIDResource, uint32 dwDefaultStyle,
CWnd *pParentWnd, CCreateContext *pContext) {
assert(m_nIDHelp == 0 || m_nIDHelp == nIDResource);
m_nIDHelp = nIDResource; // ID for help context (+HID_BASE_RESOURCE)
@@ -120,9 +120,9 @@ BOOL CFrameWnd::LoadFrame(UINT nIDResource, DWORD dwDefaultStyle,
BOOL CFrameWnd::Create(LPCSTR lpszClassName,
- LPCSTR lpszWindowName, DWORD dwStyle,
+ LPCSTR lpszWindowName, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd,
- LPCSTR lpszMenuName, DWORD dwExStyle,
+ LPCSTR lpszMenuName, uint32 dwExStyle,
CCreateContext *pContext) {
HMENU hMenu = nullptr;
if (lpszMenuName != nullptr) {
diff --git a/engines/bagel/mfc/gfx/dialog_template.h b/engines/bagel/mfc/gfx/dialog_template.h
index f138c690a99..6c4910e8cb4 100644
--- a/engines/bagel/mfc/gfx/dialog_template.h
+++ b/engines/bagel/mfc/gfx/dialog_template.h
@@ -103,7 +103,7 @@ private:
public:
HGLOBAL m_hTemplate;
- DWORD m_dwTemplateSize;
+ uint32 m_dwTemplateSize;
BOOL m_bSystemFont;
public:
diff --git a/engines/bagel/mfc/global_functions.cpp b/engines/bagel/mfc/global_functions.cpp
index 98c86389acd..1113471e924 100644
--- a/engines/bagel/mfc/global_functions.cpp
+++ b/engines/bagel/mfc/global_functions.cpp
@@ -63,7 +63,7 @@ SIZE_T GlobalSize(HGLOBAL hMem) {
return ((MemBlock *)hMem)->_size;
}
-SIZE_T GlobalCompact(DWORD dwMinFree) {
+SIZE_T GlobalCompact(uint32 dwMinFree) {
// No implementation
return 999999;
}
@@ -89,9 +89,9 @@ UINT GetPrivateProfileInt(LPCSTR lpAppName,
return AfxGetApp()->GetProfileInt(lpAppName, lpKeyName, nDefault);
}
-extern DWORD GetPrivateProfileString(LPCSTR lpAppName,
+extern uint32 GetPrivateProfileString(LPCSTR lpAppName,
LPCSTR lpKeyName, LPCSTR lpDefault, LPSTR lpReturnedString,
- DWORD nSize, LPCSTR lpFileName) {
+ uint32 nSize, LPCSTR lpFileName) {
CString str = AfxGetApp()->GetProfileString(lpAppName,
lpKeyName, lpDefault);
Common::strcpy_s(lpReturnedString, nSize, str.c_str());
@@ -139,7 +139,7 @@ LRESULT CallNextHookEx(HHOOK hhk, int nCode,
}
UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
- void (CALLBACK * lpfnTimer)(HWND, UINT, UINT_PTR, DWORD)) {
+ void (CALLBACK * lpfnTimer)(HWND, UINT, UINT_PTR, uint32)) {
return AfxGetApp()->SetTimer(hWnd, nIDEvent, nElapse, lpfnTimer);
}
@@ -151,7 +151,7 @@ void Sleep(UINT milli) {
g_system->delayMillis(milli);
}
-DWORD GetTickCount() {
+uint32 GetTickCount() {
return g_system->getMillis();
}
diff --git a/engines/bagel/mfc/global_functions.h b/engines/bagel/mfc/global_functions.h
index dde8783a576..678d01dea30 100644
--- a/engines/bagel/mfc/global_functions.h
+++ b/engines/bagel/mfc/global_functions.h
@@ -81,7 +81,7 @@ extern LPVOID GlobalLock(HGLOBAL hMem);
extern BOOL GlobalUnlock(HGLOBAL hMem);
extern HGLOBAL GlobalFree(HGLOBAL hMem);
extern SIZE_T GlobalSize(HGLOBAL hMem);
-extern SIZE_T GlobalCompact(DWORD dwMinFree);
+extern SIZE_T GlobalCompact(uint32 dwMinFree);
#define LocalAlloc GlobalAlloc
#define LocalLock GlobalLock
#define LocalUnlock GlobalUnlock
@@ -95,9 +95,9 @@ extern int MessageBox(LPCSTR lpText, LPCSTR lpCaption, UINT uType = 0);
extern int MessageBox(LPCSTR lpText);
extern UINT GetPrivateProfileInt(LPCSTR lpAppName,
LPCSTR lpKeyName, INT nDefault, LPCSTR lpFileName);
-extern DWORD GetPrivateProfileString(LPCSTR lpAppName,
+extern uint32 GetPrivateProfileString(LPCSTR lpAppName,
LPCSTR lpKeyName, LPCSTR lpDefault, LPSTR lpReturnedString,
- DWORD nSize, LPCSTR lpFileName);
+ uint32 nSize, LPCSTR lpFileName);
extern BOOL WritePrivateProfileString(
LPCSTR lpAppName, LPCSTR lpKeyName,
@@ -112,10 +112,10 @@ extern BOOL UnhookWindowsHookEx(HHOOK hhk);
extern LRESULT CallNextHookEx(HHOOK hhk, int nCode,
WPARAM wParam, LPARAM lParam);
extern UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
- void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, DWORD) = nullptr);
+ void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32) = nullptr);
extern BOOL KillTimer(HWND hWnd, UINT_PTR nIDEvent);
extern void Sleep(UINT milli);
-extern DWORD GetTickCount();
+extern uint32 GetTickCount();
extern Common::SeekableReadStream *OpenFile(const char *filename);
extern bool FileExists(const char *filename);
diff --git a/engines/bagel/mfc/libs/event_loop.cpp b/engines/bagel/mfc/libs/event_loop.cpp
index f21a4badada..22103865c5c 100644
--- a/engines/bagel/mfc/libs/event_loop.cpp
+++ b/engines/bagel/mfc/libs/event_loop.cpp
@@ -490,7 +490,7 @@ MMRESULT EventLoop::joyReleaseCapture(UINT uJoyID) {
}
UINT_PTR EventLoop::SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
- void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, DWORD)) {
+ void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32)) {
if (!nIDEvent)
nIDEvent = ++_timerIdCtr;
@@ -538,7 +538,7 @@ void EventLoop::triggerTimers() {
}
EventLoop::TimerEntry::TimerEntry(HWND hWnd, UINT_PTR idEvent,
- DWORD interval, TimerProc callback) :
+ uint32 interval, TimerProc callback) :
_hWnd(hWnd), _idEvent(idEvent),
_interval(interval), _callback(callback) {
_nextTriggerTime = g_system->getMillis() + interval;
diff --git a/engines/bagel/mfc/libs/event_loop.h b/engines/bagel/mfc/libs/event_loop.h
index 8c31a0d86e0..1849428a986 100644
--- a/engines/bagel/mfc/libs/event_loop.h
+++ b/engines/bagel/mfc/libs/event_loop.h
@@ -37,7 +37,7 @@ typedef void(*TimerProc)(
HWND hwnd, // handle of window associated with the timer (can be NULL)
UINT uMsg, // WM_TIMER message (always WM_TIMER)
UINT_PTR idEvent,// timer identifier (from SetTimer or returned value)
- DWORD dwTime // system time when the callback was called (in milliseconds)
+ uint32 dwTime // system time when the callback was called (in milliseconds)
);
typedef Common::KeyCode(*KeybindProc)(int key);
@@ -71,13 +71,13 @@ class EventLoop {
struct TimerEntry {
HWND _hWnd = nullptr;
UINT_PTR _idEvent = 0;
- DWORD _interval = 0;
- DWORD _nextTriggerTime = 0;
+ uint32 _interval = 0;
+ uint32 _nextTriggerTime = 0;
TimerProc _callback = nullptr;
TimerEntry() {}
TimerEntry(HWND hWnd, UINT_PTR idEvent,
- DWORD interval, TimerProc callback);
+ uint32 interval, TimerProc callback);
};
typedef Common::List<TimerEntry> TimerList;
@@ -253,7 +253,7 @@ public:
}
UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
- void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, DWORD));
+ void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32));
BOOL KillTimer(HWND hWnd, UINT_PTR nIDEvent);
void pause();
diff --git a/engines/bagel/mfc/minwindef.h b/engines/bagel/mfc/minwindef.h
index c79105dab37..47ea041eafe 100644
--- a/engines/bagel/mfc/minwindef.h
+++ b/engines/bagel/mfc/minwindef.h
@@ -121,16 +121,16 @@ typedef INT_PTR(CALLBACK *DLGPROC)(HWND, UINT, WPARAM, LPARAM);
#endif
#define MAKEWORD(a, b) ((WORD)(((BYTE)(((DWORD_PTR)(a)) & 0xff)) | ((WORD)((BYTE)(((DWORD_PTR)(b)) & 0xff))) << 8))
-#define MAKELONG(a, b) ((LONG)(((WORD)(((DWORD_PTR)(a)) & 0xffff)) | ((DWORD)((WORD)(((DWORD_PTR)(b)) & 0xffff))) << 16))
+#define MAKELONG(a, b) ((LONG)(((WORD)(((DWORD_PTR)(a)) & 0xffff)) | ((uint32)((WORD)(((DWORD_PTR)(b)) & 0xffff))) << 16))
#define LOWORD(l) ((WORD)(((DWORD_PTR)(l)) & 0xffff))
#define HIWORD(l) ((((DWORD_PTR)(l)) >> 16))
#define LOBYTE(w) ((BYTE)(((DWORD_PTR)(w)) & 0xff))
#define HIBYTE(w) ((BYTE)((((DWORD_PTR)(w)) >> 8) & 0xff))
#define POINTTOPOINTS(pt) (MAKELONG((short)((pt).x), (short)((pt).y)))
-#define MAKEWPARAM(l, h) ((WPARAM)(DWORD)MAKELONG(l, h))
-#define MAKELPARAM(l, h) ((LPARAM)(DWORD)MAKELONG(l, h))
-#define MAKELRESULT(l, h) ((LRESULT)(DWORD)MAKELONG(l, h))
+#define MAKEWPARAM(l, h) ((WPARAM)(uint32)MAKELONG(l, h))
+#define MAKELPARAM(l, h) ((LPARAM)(uint32)MAKELONG(l, h))
+#define MAKELRESULT(l, h) ((LRESULT)(uint32)MAKELONG(l, h))
typedef void *HANDLE;
typedef HANDLE NEAR *SPHANDLE;
@@ -230,8 +230,8 @@ inline bool RectsIntersect(const RECT &r1, const RECT &r2) {
}
typedef struct _FILETIME {
- DWORD dwLowDateTime;
- DWORD dwHighDateTime;
+ uint32 dwLowDateTime;
+ uint32 dwHighDateTime;
} FILETIME, *PFILETIME, *LPFILETIME;
typedef struct _SYSTEMTIME {
@@ -262,7 +262,7 @@ typedef struct tagMSG {
UINT message = 0;
WPARAM wParam = 0;
LPARAM lParam = 0;
- DWORD time = 0;
+ uint32 time = 0;
POINT pt;
// Extra fields for TranslateMessage convenience
diff --git a/engines/bagel/mfc/scrollbar.cpp b/engines/bagel/mfc/scrollbar.cpp
index 8dfb79632b7..eee4c027333 100644
--- a/engines/bagel/mfc/scrollbar.cpp
+++ b/engines/bagel/mfc/scrollbar.cpp
@@ -34,7 +34,7 @@ ON_WM_MOUSEMOVE()
ON_WM_MOUSELEAVE()
END_MESSAGE_MAP()
-BOOL CScrollBar::Create(DWORD dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID) {
+BOOL CScrollBar::Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID) {
return CWnd::Create("SCROLLBAR", nullptr, dwStyle,
rect, pParentWnd, nID);
}
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index 4107dd80870..e8168dfbb4b 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -166,7 +166,7 @@ UINT RealizePalette(HDC hdc) {
return 256;
}
-HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih, DWORD flInit,
+HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih, uint32 flInit,
CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage) {
CBitmap::Impl *bitmap = new CBitmap::Impl();
@@ -241,7 +241,7 @@ int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
}
BOOL BitBlt(HDC hdc, int xDest, int yDest, int width, int height,
- HDC hdcSrc, int xSrc, int ySrc, DWORD rop) {
+ HDC hdcSrc, int xSrc, int ySrc, uint32 rop) {
CDC::Impl *srcDc = (CDC::Impl *)hdcSrc;
CDC::Impl *destDc = (CDC::Impl *)hdc;
CBitmap::Impl *src = (CBitmap::Impl *)srcDc->_bitmap;
@@ -256,7 +256,7 @@ BOOL BitBlt(HDC hdc, int xDest, int yDest, int width, int height,
}
BOOL StretchBlt(HDC hdcDest, int xDest, int yDest, int wDest, int hDest,
- HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, DWORD rop) {
+ HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, uint32 rop) {
CDC *srcDC = CDC::FromHandle(hdcSrc);
CDC *destDC = CDC::FromHandle(hdcDest);
return destDC->StretchBlt(xDest, yDest, wDest, hDest,
@@ -270,7 +270,7 @@ int SetStretchBltMode(HDC hdc, int mode) {
int StretchDIBits(HDC hdc, int xDest, int yDest, int DestWidth, int DestHeight,
int xSrc, int ySrc, int SrcWidth, int SrcHeight,
- CONST void *lpBits, CONST BITMAPINFO *lpbmi, UINT iUsage, DWORD rop) {
+ CONST void *lpBits, CONST BITMAPINFO *lpbmi, UINT iUsage, uint32 rop) {
error("TODO: StretchDIBits");
}
@@ -419,7 +419,7 @@ BOOL CheckRadioButton(HWND hDlg, int nIDFirstButton,
error("TODO: CheckRadioButton");
}
-DWORD GetSysColor(int nIndex) {
+uint32 GetSysColor(int nIndex) {
switch (nIndex) {
case COLOR_3DHIGHLIGHT:
return RGB(255, 255, 255);
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index 9932c90f73d..23b05641bf1 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -27,7 +27,7 @@
namespace Bagel {
namespace MFC {
-#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (DWORD)(WORD)(i)))
+#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (uint32)(WORD)(i)))
/*
* Class styles
@@ -118,23 +118,23 @@ namespace MFC {
#define RC_DEVBITS 0x8000
/* Ternary raster operations */
-#define SRCCOPY (DWORD)0x00CC0020 /* dest = source */
-#define SRCPAINT (DWORD)0x00EE0086 /* dest = source OR dest */
-#define SRCAND (DWORD)0x008800C6 /* dest = source AND dest */
-#define SRCINVERT (DWORD)0x00660046 /* dest = source XOR dest */
-#define SRCERASE (DWORD)0x00440328 /* dest = source AND (NOT dest ) */
-#define NOTSRCCOPY (DWORD)0x00330008 /* dest = (NOT source) */
-#define NOTSRCERASE (DWORD)0x001100A6 /* dest = (NOT src) AND (NOT dest) */
-#define MERGECOPY (DWORD)0x00C000CA /* dest = (source AND pattern) */
-#define MERGEPAINT (DWORD)0x00BB0226 /* dest = (NOT source) OR dest */
-#define PATCOPY (DWORD)0x00F00021 /* dest = pattern */
-#define PATPAINT (DWORD)0x00FB0A09 /* dest = DPSnoo */
-#define PATINVERT (DWORD)0x005A0049 /* dest = pattern XOR dest */
-#define DSTINVERT (DWORD)0x00550009 /* dest = (NOT dest) */
-#define BLACKNESS (DWORD)0x00000042 /* dest = BLACK */
-#define WHITENESS (DWORD)0x00FF0062 /* dest = WHITE */
-#define NOMIRRORBITMAP (DWORD)0x80000000 /* Do not Mirror the bitmap in this call */
-#define CAPTUREBLT (DWORD)0x40000000 /* Include layered windows */
+#define SRCCOPY (uint32)0x00CC0020 /* dest = source */
+#define SRCPAINT (uint32)0x00EE0086 /* dest = source OR dest */
+#define SRCAND (uint32)0x008800C6 /* dest = source AND dest */
+#define SRCINVERT (uint32)0x00660046 /* dest = source XOR dest */
+#define SRCERASE (uint32)0x00440328 /* dest = source AND (NOT dest ) */
+#define NOTSRCCOPY (uint32)0x00330008 /* dest = (NOT source) */
+#define NOTSRCERASE (uint32)0x001100A6 /* dest = (NOT src) AND (NOT dest) */
+#define MERGECOPY (uint32)0x00C000CA /* dest = (source AND pattern) */
+#define MERGEPAINT (uint32)0x00BB0226 /* dest = (NOT source) OR dest */
+#define PATCOPY (uint32)0x00F00021 /* dest = pattern */
+#define PATPAINT (uint32)0x00FB0A09 /* dest = DPSnoo */
+#define PATINVERT (uint32)0x005A0049 /* dest = pattern XOR dest */
+#define DSTINVERT (uint32)0x00550009 /* dest = (NOT dest) */
+#define BLACKNESS (uint32)0x00000042 /* dest = BLACK */
+#define WHITENESS (uint32)0x00FF0062 /* dest = WHITE */
+#define NOMIRRORBITMAP (uint32)0x80000000 /* Do not Mirror the bitmap in this call */
+#define CAPTUREBLT (uint32)0x40000000 /* Include layered windows */
/* StretchBlt() Modes */
#define BLACKONWHITE 1
@@ -624,17 +624,17 @@ enum {
typedef struct tagBITMAPINFOHEADER {
- DWORD biSize;
+ uint32 biSize;
LONG biWidth;
LONG biHeight;
WORD biPlanes;
WORD biBitCount;
- DWORD biCompression;
- DWORD biSizeImage;
+ uint32 biCompression;
+ uint32 biSizeImage;
LONG biXPelsPerMeter;
LONG biYPelsPerMeter;
- DWORD biClrUsed;
- DWORD biClrImportant;
+ uint32 biClrUsed;
+ uint32 biClrImportant;
} BITMAPINFOHEADER, FAR *LPBITMAPINFOHEADER,
*PBITMAPINFOHEADER;
@@ -662,7 +662,7 @@ typedef struct tagBITMAP {
} BITMAP, *PBITMAP, NEAR *NPBITMAP, FAR *LPBITMAP;
typedef struct tagBITMAPCOREHEADER {
- DWORD bcSize; /* used to get to color table */
+ uint32 bcSize; /* used to get to color table */
WORD bcWidth;
WORD bcHeight;
WORD bcPlanes;
@@ -747,7 +747,7 @@ extern int GetWindowText(HWND hWnd, LPSTR lpszStringBuf, int nMaxCount);
extern BOOL ScreenToClient(HWND hWnd, LPPOINT lpPoint);
HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih,
- DWORD flInit, CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage);
+ uint32 flInit, CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage);
extern int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
LPVOID lpvBits, LPBITMAPINFO lpbmi, UINT usage);
@@ -756,13 +756,13 @@ extern HGDIOBJ GetStockObject(int i);
extern HPALETTE SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd);
extern UINT RealizePalette(HDC hdc);
extern BOOL BitBlt(HDC hdc, int xDest, int yDest, int width, int height,
- HDC hdcSrc, int xSrc, int ySrc, DWORD rop);
+ HDC hdcSrc, int xSrc, int ySrc, uint32 rop);
extern BOOL StretchBlt(HDC hdcDest, int xDest, int yDest,
- int wDest, int hDest, HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, DWORD rop);
+ int wDest, int hDest, HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, uint32 rop);
extern int SetStretchBltMode(HDC hdc, int mode);
extern int StretchDIBits(HDC hdc, int xDest, int yDest, int DestWidth, int DestHeight,
int xSrc, int ySrc, int SrcWidth, int SrcHeight,
- CONST void *lpBits, CONST BITMAPINFO *lpbmi, UINT iUsage, DWORD rop);
+ CONST void *lpBits, CONST BITMAPINFO *lpbmi, UINT iUsage, uint32 rop);
extern int GetTextExtent(HDC hdc, LPCSTR text, size_t len);
extern BOOL GetTextMetrics(HDC hdc, LPTEXTMETRIC lptm);
extern intptr GetWindowWord(HWND hWnd, int nIndex);
@@ -799,7 +799,7 @@ extern BOOL SetDlgItemInt(HWND hDlg, int nIDDlgItem,
extern BOOL CheckRadioButton(HWND hDlg, int nIDFirstButton,
int nIDLastButton, int nIDCheckButton);
-extern DWORD GetSysColor(int nIndex);
+extern uint32 GetSysColor(int nIndex);
extern HBRUSH GetSysColorBrush(int nIndex);
extern BOOL DestroyMenu(HMENU hMenu);
extern void SetActiveWindow(HWND hWnd);
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index cd9532b98af..d999c45b7db 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -35,7 +35,6 @@ typedef uint16 WORD;
typedef uint16 USHORT;
typedef long LONG;
typedef unsigned long ULONG;
-typedef uint32 DWORD;
typedef int64 LONGLONG;
typedef uint64 ULONGLONG;
typedef size_t SIZE_T;
@@ -50,8 +49,8 @@ typedef int *LPINT;
typedef WORD *PWORD;
typedef WORD *LPWORD;
typedef long *LPLONG;
-typedef DWORD *PDWORD;
-typedef DWORD *LPDWORD;
+typedef uint32 *PDWORD;
+typedef uint32 *LPDWORD;
typedef void *LPVOID;
typedef const void *LPCVOID;
@@ -77,7 +76,7 @@ typedef uintptr DWORD_PTR;
typedef uint32 COLORREF;
typedef void *POSITION;
-#define RGB_COL(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
+#define RGB_COL(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((uint32)(BYTE)(b))<<16)))
#define PALETTERGB(r,g,b) (0x02000000 | RGB_COL(r,g,b))
#define RGB(r,g,b) PALETTERGB(r,g,b)
#define IS_RGB(VAL) ((VAL & 0x02000000) != 0)
@@ -107,11 +106,11 @@ typedef HANDLE *PHANDLE;
typedef long HRESULT;
typedef char CCHAR;
-typedef DWORD LCID;
+typedef uint32 LCID;
typedef PDWORD PLCID;
typedef WORD LANGID;
-typedef DWORD (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
+typedef uint32 (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
#define DECLARE_HANDLE(name) struct name##__{int unused;}; typedef struct name##__ *name
@@ -231,8 +230,8 @@ typedef DWORD (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
#define FILE_ACTION_MODIFIED 0x00000003
#define FILE_ACTION_RENAMED_OLD_NAME 0x00000004
#define FILE_ACTION_RENAMED_NEW_NAME 0x00000005
-#define MAILSLOT_NO_MESSAGE ((DWORD)-1)
-#define MAILSLOT_WAIT_FOREVER ((DWORD)-1)
+#define MAILSLOT_NO_MESSAGE ((uint32)-1)
+#define MAILSLOT_WAIT_FOREVER ((uint32)-1)
#define FILE_CASE_SENSITIVE_SEARCH 0x00000001
#define FILE_CASE_PRESERVED_NAMES 0x00000002
#define FILE_UNICODE_ON_DISK 0x00000004
diff --git a/engines/bagel/mfc/wnd.cpp b/engines/bagel/mfc/wnd.cpp
index 350fdd8fcf7..eb6882508e6 100644
--- a/engines/bagel/mfc/wnd.cpp
+++ b/engines/bagel/mfc/wnd.cpp
@@ -86,7 +86,7 @@ CWnd::~CWnd() {
}
BOOL CWnd::Create(LPCSTR lpszClassName, LPCSTR lpszWindowName,
- DWORD dwStyle, const RECT &rect, CWnd *pParentWnd,
+ uint32 dwStyle, const RECT &rect, CWnd *pParentWnd,
UINT nID, CCreateContext *pContext) {
m_pParentWnd = pParentWnd;
m_nStyle = dwStyle;
@@ -133,8 +133,8 @@ BOOL CWnd::Create(LPCSTR lpszClassName, LPCSTR lpszWindowName,
return true;
}
-BOOL CWnd::CreateEx(DWORD dwExStyle, LPCSTR lpszClassName,
- LPCSTR lpszWindowName, DWORD dwStyle,
+BOOL CWnd::CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
+ LPCSTR lpszWindowName, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd, UINT nID,
LPVOID lpParam /* = nullptr */) {
return CreateEx(dwExStyle, lpszClassName, lpszWindowName, dwStyle,
@@ -142,8 +142,8 @@ BOOL CWnd::CreateEx(DWORD dwExStyle, LPCSTR lpszClassName,
pParentWnd->GetSafeHwnd(), nID, lpParam);
}
-BOOL CWnd::CreateEx(DWORD dwExStyle, LPCSTR lpszClassName,
- LPCSTR lpszWindowName, DWORD dwStyle,
+BOOL CWnd::CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
+ LPCSTR lpszWindowName, uint32 dwStyle,
int x, int y, int nWidth, int nHeight,
HWND hWndParent, LPARAM nIDorHMenu, LPVOID lpParam) {
// Set up create structure
@@ -407,7 +407,7 @@ UINT CWnd::GetState() const {
return _itemState;
}
-void CWnd::SetStyle(DWORD nStyle) {
+void CWnd::SetStyle(uint32 nStyle) {
m_nStyle = nStyle;
Invalidate();
}
@@ -670,7 +670,7 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
case AfxSig_vWp:
{
- CPoint point((DWORD)lParam);
+ CPoint point((uint32)lParam);
(this->*mmf.pfn_vWp)(CWnd::FromHandle((HWND)wParam), point);
}
break;
@@ -724,7 +724,7 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
case AfxSig_wp:
{
- CPoint point((DWORD)lParam);
+ CPoint point((uint32)lParam);
lResult = (this->*mmf.pfn_wp)(point);
}
break;
@@ -747,7 +747,7 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
case AfxSig_vwp:
{
- CPoint point((DWORD)lParam);
+ CPoint point((uint32)lParam);
(this->*mmf.pfn_vwp)(wParam, point);
break;
}
@@ -1102,7 +1102,7 @@ LRESULT CWnd::SendDlgItemMessage(int nID, UINT message,
}
UINT_PTR CWnd::SetTimer(UINT_PTR nIDEvent, UINT nElapse,
- void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, DWORD)) {
+ void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32)) {
return MFC::SetTimer(m_hWnd, nIDEvent, nElapse, lpfnTimer);
}
Commit: f03c0fb7c5385be52e151da64ba221fc2d704934
https://github.com/scummvm/scummvm/commit/f03c0fb7c5385be52e151da64ba221fc2d704934
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:25+03:00
Commit Message:
BAGEL: CHAR -> char and FLOAT -> float
Changed paths:
engines/bagel/boflib/misc.cpp
engines/bagel/boflib/misc.h
engines/bagel/hodjnpodj/archeroids/main.cpp
engines/bagel/hodjnpodj/archeroids/usercfg.cpp
engines/bagel/hodjnpodj/battlefish/bfish.cpp
engines/bagel/hodjnpodj/battlefish/usercfg.cpp
engines/bagel/hodjnpodj/fuge/fuge.cpp
engines/bagel/hodjnpodj/fuge/usercfg.cpp
engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
engines/bagel/hodjnpodj/hnplibs/bitmaps.h
engines/bagel/hodjnpodj/hnplibs/stdinc.h
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
engines/bagel/hodjnpodj/metagame/saves/restdlg.h
engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
engines/bagel/hodjnpodj/metagame/saves/savedlg.h
engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
engines/bagel/hodjnpodj/metagame/saves/savegame.h
engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
engines/bagel/hodjnpodj/pdq/game.cpp
engines/bagel/hodjnpodj/pdq/game.h
engines/bagel/hodjnpodj/pdq/main.cpp
engines/bagel/hodjnpodj/pdq/usercfg.cpp
engines/bagel/hodjnpodj/riddles/riddles.cpp
engines/bagel/hodjnpodj/riddles/riddles.h
engines/bagel/mfc/global_functions.cpp
engines/bagel/mfc/global_functions.h
engines/bagel/mfc/winnt.h
engines/bagel/spacebar/baglib/character_object.cpp
engines/bagel/spacebar/sraf_computer.cpp
diff --git a/engines/bagel/boflib/misc.cpp b/engines/bagel/boflib/misc.cpp
index bf07df3d077..161f97e665d 100644
--- a/engines/bagel/boflib/misc.cpp
+++ b/engines/bagel/boflib/misc.cpp
@@ -181,7 +181,7 @@ void ErrorLog(const char *logFile, const char *format, ...) {
// No implementation
}
-INT StrFreqMatch(const CHAR *mask, const CHAR *test) {
+INT StrFreqMatch(const char *mask, const char *test) {
static INT nCount[256];
INT i, divergence;
@@ -221,9 +221,9 @@ INT StrFreqMatch(const CHAR *mask, const CHAR *test) {
}
-BOOL StrCompare(const CHAR *pszStr1, const CHAR *pszStr2, UINT nSize) {
- CHAR *s1, *p, string1[256]; /* replace this stack hog with malloc */
- CHAR *s2, *sp, string2[256]; /* replace this stack hog with malloc */
+BOOL StrCompare(const char *pszStr1, const char *pszStr2, UINT nSize) {
+ char *s1, *p, string1[256]; /* replace this stack hog with malloc */
+ char *s2, *sp, string2[256]; /* replace this stack hog with malloc */
INT i, n, inc;
BOOL bMatch;
@@ -354,7 +354,7 @@ BOOL StrCompare(const CHAR *pszStr1, const CHAR *pszStr2, UINT nSize) {
* RETURNS: INT = number of times character c occurs in string str
*
*****************************************************************************/
-INT StrCharCount(const CHAR *str, CHAR c) {
+INT StrCharCount(const char *str, char c) {
INT n;
assert(str != nullptr);
@@ -384,9 +384,9 @@ INT StrCharCount(const CHAR *str, CHAR c) {
*
**/
-CHAR *StriStr(CHAR *s1, const CHAR *s2) {
- CHAR *p, str1[80];
- CHAR str2[80];
+char *StriStr(char *s1, const char *s2) {
+ char *p, str1[80];
+ char str2[80];
/* can't access null pointers */
assert(s1 != nullptr);
@@ -415,8 +415,8 @@ CHAR *StriStr(CHAR *s1, const CHAR *s2) {
return (p);
}
-void StrUprStr(CHAR *s1, const CHAR *s2) {
- CHAR *p;
+void StrUprStr(char *s1, const char *s2) {
+ char *p;
INT i, n;
/* can't access null pointers */
@@ -427,7 +427,7 @@ void StrUprStr(CHAR *s1, const CHAR *s2) {
while ((p = StriStr(p, s2)) != nullptr) {
n = strlen(s2);
for (i = 0; i < n; i++) {
- *p = (CHAR)toupper(*p);
+ *p = (char)toupper(*p);
p++;
}
}
@@ -439,9 +439,9 @@ void StrUprStr(CHAR *s1, const CHAR *s2) {
* will be stripped from the destination string.
*
* synopsis StrCpyStripChar(dest, source, c)
-* CHAR *dest destinaton string
-* const CHAR *source source string
-* CHAR c character to strip from dest
+* char *dest destinaton string
+* const char *source source string
+* char c character to strip from dest
*
* purpose To strip out a specified character while copying 1 string to another
*
@@ -449,7 +449,7 @@ void StrUprStr(CHAR *s1, const CHAR *s2) {
* returns Nothing
*
**/
-void StrCpyStripChar(CHAR *dest, const CHAR *source, CHAR c) {
+void StrCpyStripChar(char *dest, const char *source, char c) {
/* can't access null pointers */
assert(dest != nullptr);
assert(source != nullptr);
@@ -464,8 +464,8 @@ void StrCpyStripChar(CHAR *dest, const CHAR *source, CHAR c) {
}
-CHAR *StrStripChar(CHAR *str, CHAR c) {
- CHAR *p = str;
+char *StrStripChar(char *str, char c) {
+ char *p = str;
/* can't acces a null pointer */
assert(str != nullptr);
@@ -485,8 +485,8 @@ CHAR *StrStripChar(CHAR *str, CHAR c) {
}
-CHAR *StrReplaceChar(CHAR *str, CHAR cOld, CHAR cNew) {
- CHAR *p = str;
+char *StrReplaceChar(char *str, char cOld, char cNew) {
+ char *p = str;
/* can't acces a null pointer */
assert(str != nullptr);
diff --git a/engines/bagel/boflib/misc.h b/engines/bagel/boflib/misc.h
index d7720661912..096b01fbe1e 100644
--- a/engines/bagel/boflib/misc.h
+++ b/engines/bagel/boflib/misc.h
@@ -110,14 +110,14 @@ extern bool ProbableTrue(int nProbability);
extern void ErrorLog(const char *logFile, const char *format, ...);
-extern INT StrFreqMatch(const CHAR *, const CHAR *);
-extern BOOL StrCompare(const CHAR *, const CHAR *, UINT);
-extern INT StrCharCount(const CHAR *, CHAR);
-extern CHAR *StriStr(CHAR *, const CHAR *);
-extern void StrUprStr(CHAR *, const CHAR *);
-extern void StrCpyStripChar(CHAR *, const CHAR *, CHAR);
-extern CHAR *StrStripChar(CHAR *, CHAR);
-extern CHAR *StrReplaceChar(CHAR *, CHAR, CHAR);
+extern INT StrFreqMatch(const char *, const char *);
+extern BOOL StrCompare(const char *, const char *, UINT);
+extern INT StrCharCount(const char *, char);
+extern char *StriStr(char *, const char *);
+extern void StrUprStr(char *, const char *);
+extern void StrCpyStripChar(char *, const char *, char);
+extern char *StrStripChar(char *, char);
+extern char *StrReplaceChar(char *, char, char);
} // namespace Bagel
diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index 842cd636c23..833e04f97c0 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -46,7 +46,7 @@ namespace Archeroids {
// This mini-game's main screen bitmap
//
#define MINI_GAME_MAP ".\\ART\\FIELD.BMP"
-const CHAR *INI_SECTION = "Archeroids";
+const char *INI_SECTION = "Archeroids";
//
// Button ID constants
@@ -2058,7 +2058,7 @@ BOOL CMainWindow::MainLoop() {
BOOL CMainWindow::MoveArrows(CDC *pDC) {
- CHAR buf1[40], buf2[40];
+ char buf1[40], buf2[40];
CLList *pList, *pNext, *pSearchList;
CSprite *pSprite, *pTmpSprite;
POINT point;
@@ -2566,7 +2566,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
void CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
- CHAR szTmpBuf[40];
+ char szTmpBuf[40];
CSprite *pSprite;
//CSound *pSound;
CLList *pList, *pNext;
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
index 8caf9308b0e..b5890e8416d 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
@@ -43,7 +43,7 @@ namespace Archeroids {
extern const char *INI_SECTION;
-static const CHAR *apszSpeeds[10] = {
+static const char *apszSpeeds[10] = {
"Injured Snail",
"Snail",
"Turtle",
@@ -135,7 +135,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
- CHAR szBuf[40];
+ char szBuf[40];
CDC *pDC;
// can't access a null pointer
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index 3ad9768268e..07d4eb19cd2 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -219,7 +219,7 @@ STATIC POINT ptFishHooks[MAX_FISH] = {
{550, GAME_TOP_BORDER_WIDTH},
};
-STATIC const CHAR *pszFishSound[MAX_FISH] = {
+STATIC const char *pszFishSound[MAX_FISH] = {
WAV_BADSINK8,
WAV_BADSINK4,
WAV_BADSINK7,
@@ -235,7 +235,7 @@ void CALLBACK GetGameParams(CWnd *);
// Globals
//
CPalette *pGamePalette;
-const CHAR *INI_SECTION = "BattleFish";
+const char *INI_SECTION = "BattleFish";
LPGAMESTRUCT pGameParams;
extern HWND ghParentWnd;
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
index 872aca4fad8..12619b90be7 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
@@ -38,7 +38,7 @@ namespace Battlefish {
#define PAGE_SIZE 1
-static const CHAR *pszDiffLevel[DIFF_MAX + 1] = {
+static const char *pszDiffLevel[DIFF_MAX + 1] = {
"Wimpy",
"Average",
"Hefty"
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index 51c3b27e2a8..b5b468213de 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -142,7 +142,7 @@ extern CWnd *ghParentWnd;
#define N_PADDLE_SIZES (PSIZE_MAX+1)
-STATIC const CHAR *pszPaddles[N_PADDLE_SIZES] = {
+STATIC const char *pszPaddles[N_PADDLE_SIZES] = {
".\\ART\\PADCEL45.BMP",
".\\ART\\PADCEL60.BMP",
".\\ART\\PADCEL90.BMP"
@@ -213,7 +213,7 @@ STATIC const DOUBLE fPaddleAngles[N_PADDLE_SIZES] = {
//
// Globals
//
-STATIC const CHAR *pszFugeArt[N_ROWS + 1] = {
+STATIC const char *pszFugeArt[N_ROWS + 1] = {
".\\ART\\FUGE6.BMP",
".\\ART\\FUGE1.BMP",
".\\ART\\FUGE2.BMP",
@@ -224,7 +224,7 @@ STATIC const CHAR *pszFugeArt[N_ROWS + 1] = {
};
STATIC CPalette *pGamePalette;
-const CHAR *INI_SECTION = "Fuge";
+const char *INI_SECTION = "Fuge";
LPGAMESTRUCT pGameParams;
extern HWND ghParentWnd;
@@ -1519,7 +1519,7 @@ void CFugeWindow::BallvsPaddle(void) {
void CFugeWindow::BallvsBrick(DOUBLE length) {
- CHAR buf1[32], buf2[32];
+ char buf1[32], buf2[32];
CVector vPoints[N_BRICK_POINTS];
CVector vBrick, vBallCenter, vOrigin, vTmp;
CDC *pDC;
@@ -1910,7 +1910,7 @@ void CFugeWindow::EraseBrick(CDC *pDC, INT nBrickIndex) {
void CFugeWindow::LoseBall(void) {
- CHAR buf1[32], buf2[32];
+ char buf1[32], buf2[32];
CDC *pDC;
ERROR_CODE errCode;
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index 8cb71d69337..5020040bd6d 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -140,7 +140,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
}
void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
- CHAR buf[40];
+ char buf[40];
INT nMin, nMax, nVal;
CDC *pDC;
@@ -350,7 +350,7 @@ void CUserCfgDlg::OnPaint(void) {
}
void CUserCfgDlg::UpdateOptions(void) {
- CHAR buf[40];
+ char buf[40];
CDC *pDC;
if ((pDC = GetDC()) != nullptr) {
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
index 43620e50f62..11f5b3abed8 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
@@ -237,7 +237,7 @@ void CAudioCfgDlg::OnPaint(void) {
void CAudioCfgDlg::UpdateOptions(void) {
- CHAR buf[40];
+ char buf[40];
CDC *pDC;
if ((pDC = GetDC()) != nullptr) {
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.h b/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
index 7965194d72c..f80679cff2f 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
@@ -95,7 +95,7 @@ BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, const int x, const int y);
CSize GetBitmapSize(CBitmap *pBitmap);
-CPalette *GetPalette(CDC *pDC, const CHAR *pszBmpName);
+CPalette *GetPalette(CDC *pDC, const char *pszBmpName);
} // namespace HodjNPodj
} // namespace Bagel
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdinc.h b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
index 6efff8a4e3f..fb4198a88d5 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdinc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
@@ -56,7 +56,7 @@ namespace HodjNPodj {
#ifndef FAR
#define FAR
#endif
-#define CHAR char
+#define char char
typedef unsigned char UCHAR;
typedef byte UBYTE;
#define INT int
@@ -65,7 +65,7 @@ typedef uint16 USHORT;
#define WORD USHORT
#define LONG long
typedef unsigned long ULONG;
-#define FLOAT float
+#define float float
#define DOUBLE double
#define void void
#define CONST const
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index 82571e9a584..a60adab161f 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -100,8 +100,8 @@ uint32 dwFreePhysicalMargin;
int nMidiVolume;
int nWaveVolume;
-const CHAR *gpszSaveDLL = "HNPSAVE.DLL";
-const CHAR *gpszSaveGameFile = "HODJPODJ.SAV";
+const char *gpszSaveDLL = "HNPSAVE.DLL";
+const char *gpszSaveGameFile = "HODJPODJ.SAV";
//static BOOL bScreenSaver;
diff --git a/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp b/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
index 1a6981ab4cf..7ab9c7016f4 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
@@ -33,7 +33,7 @@ namespace Frame {
extern BOOL bMetaLoaded;
-extern const CHAR *gpszSaveGameFile;
+extern const char *gpszSaveGameFile;
/*****************************************************************
*
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
index c7fed6c47db..6567cfcd022 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
@@ -632,7 +632,7 @@ int CGtlData::FindNodeId(const char *pszLabel) {
void CGtlData::LoadCharDirection(CBgbObject *pBgbSprite, CPoint ptOld, CPoint ptNew) {
#if 1
- CHAR chOldChar, chNewChar = '1';
+ char chOldChar, chNewChar = '1';
INT x, y;
// can't access null pointers
@@ -723,7 +723,7 @@ void CGtlData::LoadCharDirection(CBgbObject *pBgbSprite, CPoint ptOld, CPoint pt
#else
CVector vector, vOrigin(0, -1);
DOUBLE angle;
- CHAR chOldChar, chNewChar;
+ char chOldChar, chNewChar;
// can't access null pointers
assert(pBgbSprite != nullptr);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
index 79f5e10f635..7967bdd0289 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
@@ -686,7 +686,7 @@ void CGtlData::CheckForTransport(CXodj *pXodj, int nNewSector)
void CGtlData::DoTransport(CXodj *pXodj, INT iNode) {
- CHAR szOldFileName[128];
+ char szOldFileName[128];
CBgbObject *pCurPlayer;
CPoint point;
INT i;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
index d6482f3afd4..f0e1865d44f 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
@@ -30,7 +30,7 @@ namespace Saves {
static const char *gpszTitle = "Restore Game";
-CRestoreDlg::CRestoreDlg(CHAR *pszDescriptions[], CWnd *pWnd, CPalette *pPalette)
+CRestoreDlg::CRestoreDlg(char *pszDescriptions[], CWnd *pWnd, CPalette *pPalette)
: CBmpDialog(pWnd, pPalette, IDD_RESTORE, ".\\ART\\MLSCROLL.BMP", -1, -1, TRUE) {
INT i;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/restdlg.h b/engines/bagel/hodjnpodj/metagame/saves/restdlg.h
index 8495906f432..40d1b983c08 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/restdlg.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/restdlg.h
@@ -35,7 +35,7 @@ namespace Saves {
class CRestoreDlg: public CBmpDialog {
public:
- CRestoreDlg(CHAR *[], CWnd *, CPalette *);
+ CRestoreDlg(char *[], CWnd *, CPalette *);
protected:
void ClearDialogImage(void);
@@ -54,7 +54,7 @@ private:
CColorButton *m_pSlotButtons[MAX_SAVEGAMES];
CColorButton *m_pQuitButton;
CText *m_pTxtRestore;
- CHAR *m_pszDescriptions[MAX_SAVEGAMES];
+ char *m_pszDescriptions[MAX_SAVEGAMES];
};
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
index 3cfddb52407..9939a0a2e06 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
@@ -44,10 +44,10 @@ namespace Saves {
#define MAX_BUTTON_TEXT 25
-STATIC const CHAR *gpszTitle = "Save Game";
-extern CHAR szDescBuf[40];
+STATIC const char *gpszTitle = "Save Game";
+extern char szDescBuf[40];
-CSaveDlg::CSaveDlg(CHAR *pszDescriptions[], CWnd *pWnd, CPalette *pPalette)
+CSaveDlg::CSaveDlg(char *pszDescriptions[], CWnd *pWnd, CPalette *pPalette)
: CBmpDialog(pWnd, pPalette, 2000, ".\\ART\\MLSCROLL.BMP") {
INT i;
@@ -113,7 +113,7 @@ void CSaveDlg::OnCancel(void) {
}
void CSaveDlg::EditDescription(INT nNewSlot) {
- CHAR szBuf[40];
+ char szBuf[40];
// abort any other edits the user was making
//
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
index f27b9fc666b..b8cb523a31d 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
@@ -35,7 +35,7 @@ namespace Saves {
class CSaveDlg: public CBmpDialog {
public:
- CSaveDlg(CHAR *[], CWnd *, CPalette *);
+ CSaveDlg(char *[], CWnd *, CPalette *);
protected:
void ClearDialogImage(void);
@@ -57,7 +57,7 @@ private:
CColorButton *m_pQuitButton;
CColorButton *m_pOkButton;
CText *m_pTxtSave;
- CHAR *m_pszDescriptions[MAX_SAVEGAMES];
+ char *m_pszDescriptions[MAX_SAVEGAMES];
INT m_nCurSlot;
};
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
index 1933459bd61..8e87a398012 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
@@ -39,10 +39,10 @@ namespace Saves {
#define IDC_SAVE_BUSY 2030
-STATIC CHAR szDescriptions[MAX_SAVEGAMES][40];
-STATIC CHAR *pszDesc[MAX_SAVEGAMES];
+STATIC char szDescriptions[MAX_SAVEGAMES][40];
+STATIC char *pszDesc[MAX_SAVEGAMES];
-CHAR szDescBuf[40];
+char szDescBuf[40];
struct stInventoryInfo {
char m_szInventory[40];
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.h b/engines/bagel/hodjnpodj/metagame/saves/savegame.h
index 825e1c7afc3..ef17ee095a3 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.h
@@ -31,7 +31,7 @@ namespace HodjNPodj {
namespace Metagame {
namespace Saves {
-typedef BOOL (CALLBACK *LPSAVEFUNC)(const CHAR *, CBfcMgr *, CWnd *, CPalette *, ERROR_CODE *);
+typedef BOOL (CALLBACK *LPSAVEFUNC)(const char *, CBfcMgr *, CWnd *, CPalette *, ERROR_CODE *);
/**
* Converts a CBfcMgr to a SAVEGAME_INFO
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
index 1eeb7512c3c..12b1ed3ddb7 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
@@ -49,7 +49,7 @@ struct CLUE_ARRAY {
};
struct INVENTORY {
- CHAR m_szTitle[40] = { '\0' };
+ char m_szTitle[40] = { '\0' };
INT m_aItemList[MG_OBJ_COUNT] = { 0 };
INT m_nItems = 0;
@@ -109,7 +109,7 @@ struct SAVEGAME_INFO {
ULONG m_lBoffoGameID = 0;
USHORT m_nFixedRecordSize = 0;
BOOL m_bUsed = false;
- // CHAR m_szSaveGameDescription[40]; // description of this saved game
+ // char m_szSaveGameDescription[40]; // description of this saved game
PLAYER_INFO m_stPlayerInfo[MAX_PLAYERS];
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index 281656cc62d..8a17403137f 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -42,7 +42,7 @@ namespace PDQ {
*
*/
typedef struct {
- CHAR text[MAX_PLENGTH_S + 1];
+ char text[MAX_PLENGTH_S + 1];
UBYTE order[MAX_PLENGTH];
} PHRASES;
@@ -59,7 +59,7 @@ typedef struct {
} SPRITE_LIST;
-STATIC const CHAR *pszCategorySounds[N_CATEGORIES] = {
+STATIC const char *pszCategorySounds[N_CATEGORIES] = {
".\\SOUND\\TGG5.WAV",
".\\SOUND\\TGG6.WAV",
".\\SOUND\\TGG7.WAV",
@@ -79,7 +79,7 @@ void KillCurPhrase(void);
void BuildRandomPhraseOrder();
bool RevealNextLetter(void);
void CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, uint32);
-INT StrLenNoSpaces(const CHAR *);
+INT StrLenNoSpaces(const char *);
INT GetIndex(CSprite *);
void LoadGameCfg(void);
void SaveGameCfg(void);
@@ -122,7 +122,7 @@ INT timerInterval;
HWND gGameWnd;
bool bPause;
UINT gLeftAvg, gTotalAvg;
-const CHAR *INI_SECTION = "ThGesngGme";
+const char *INI_SECTION = "ThGesngGme";
INT nPhrasePixelLength;
@@ -140,7 +140,7 @@ INT nPhrasePixelLength;
**/
ERROR_CODE LoadNewPhrase(void) {
STATIC int nLast;
- CHAR *p, buf[MAX_PLENGTH_S + 2];
+ char *p, buf[MAX_PLENGTH_S + 2];
INT i, n, nType;
ERROR_CODE errCode;
@@ -199,7 +199,7 @@ ERROR_CODE LoadNewPhrase(void) {
inFile.seekg(i * sizeof(PHRASES)); // seek to the phrase we want
- inFile.read((CHAR *)curPhrase, sizeof(PHRASES)); // load that phrase
+ inFile.read((char *)curPhrase, sizeof(PHRASES)); // load that phrase
if (inFile.gcount() != sizeof(PHRASES))
errCode = ERR_FREAD;
inFile.close(); // close the data store
@@ -300,7 +300,7 @@ void BuildRandomPhraseOrder() {
**/
ERROR_CODE BuildSpriteList(CDC *pDC) {
CSprite *pNewSprite;
- CHAR *pText;
+ char *pText;
INT i;
ERROR_CODE errCode;
@@ -886,7 +886,7 @@ void CALLBACK GetGameParams(CWnd *pParentWnd) {
*
**/
void LoadGameCfg() {
- CHAR buf[10];
+ char buf[10];
INT n;
if (pGameParams->bPlayingMetagame) {
@@ -988,7 +988,7 @@ void SaveGameCfg() {
* name CheckUserGuess - compares user's guess with current phrase
*
* synopsis winStatus = CheckUserGuess(guess)
-* const CHAR *guess users guess to check vs phrase
+* const char *guess users guess to check vs phrase
*
* purpose
*
@@ -996,7 +996,7 @@ void SaveGameCfg() {
* returns match/unmatch condition (True if users guess matches the phrase)
*
**/
-bool CheckUserGuess(const CHAR *guess) {
+bool CheckUserGuess(const char *guess) {
return (StrCompare(curPhrase->text, guess, MAX_PLENGTH_S + 1));
}
@@ -1005,7 +1005,7 @@ bool CheckUserGuess(const CHAR *guess) {
* out any spaces.
*
* synopsis StrLenNoSpaces(string)
-* const CHAR *string string to get length of
+* const char *string string to get length of
*
* purpose To determine the length of a string while not counting spaces
*
@@ -1013,7 +1013,7 @@ bool CheckUserGuess(const CHAR *guess) {
* returns len = length of string without spaces
*
**/
-INT StrLenNoSpaces(const CHAR *str) {
+INT StrLenNoSpaces(const char *str) {
INT len;
/* can't access a null pointer */
@@ -1032,7 +1032,7 @@ INT StrLenNoSpaces(const CHAR *str) {
ERROR_CODE ValidatePhrase(PHRASES *phrase) {
bool bList[MAX_PLENGTH];
INT i, n, order;
- CHAR c;
+ char c;
ERROR_CODE errCode;
assert(phrase != nullptr);
diff --git a/engines/bagel/hodjnpodj/pdq/game.h b/engines/bagel/hodjnpodj/pdq/game.h
index dc3d30ee5d5..69847399835 100644
--- a/engines/bagel/hodjnpodj/pdq/game.h
+++ b/engines/bagel/hodjnpodj/pdq/game.h
@@ -92,7 +92,7 @@ extern void GameResumeTimer(void);
extern ERROR_CODE EndGame(CDC *);
extern void WinGame(void);
extern ERROR_CODE RepaintSpriteList(CDC *);
-extern bool CheckUserGuess(const CHAR *);
+extern bool CheckUserGuess(const char *);
extern void CALLBACK GetGameParams(CWnd *);
extern void GameGetScore(UINT *, UINT *, UINT *, UINT *);
diff --git a/engines/bagel/hodjnpodj/pdq/main.cpp b/engines/bagel/hodjnpodj/pdq/main.cpp
index 1cb7ab5d368..499f6903eab 100644
--- a/engines/bagel/hodjnpodj/pdq/main.cpp
+++ b/engines/bagel/hodjnpodj/pdq/main.cpp
@@ -51,7 +51,7 @@ namespace PDQ {
#define WAV_NARRATION ".\\SOUND\\TGG.WAV"
-STATIC const CHAR *pszCategoryBitmaps[N_CATEGORIES] = {
+STATIC const char *pszCategoryBitmaps[N_CATEGORIES] = {
".\\ART\\PERSON.BMP",
".\\ART\\PLACE.BMP",
".\\ART\\PHRASE.BMP",
diff --git a/engines/bagel/hodjnpodj/pdq/usercfg.cpp b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
index 41e8c2e2f80..26a60d08a9d 100644
--- a/engines/bagel/hodjnpodj/pdq/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
@@ -40,7 +40,7 @@ namespace PDQ {
extern const char *INI_SECTION;
-static const CHAR *apszSpeeds[10] = {
+static const char *apszSpeeds[10] = {
"Molasses in Stasis",
"Frozen Molasses",
"Molasses",
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.cpp b/engines/bagel/hodjnpodj/riddles/riddles.cpp
index c695c52f4f8..969ffb5417d 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.cpp
+++ b/engines/bagel/hodjnpodj/riddles/riddles.cpp
@@ -137,7 +137,7 @@ void CALLBACK GetGameParams(CWnd *);
//
CRiddlesWindow *gMainWindow;
CPalette *pGamePalette;
-const CHAR *INI_SECTION = "Riddles";
+const char *INI_SECTION = "Riddles";
LPGAMESTRUCT pGameParams;
@@ -544,7 +544,7 @@ void CRiddlesWindow::GameResume(void) {
};
void CRiddlesWindow::PlayGame() {
- CHAR szBuf[40];
+ char szBuf[40];
ERROR_CODE errCode;
CSound *pRiddleReading = nullptr;
@@ -737,7 +737,7 @@ ERROR_CODE CRiddlesWindow::LoadRiddle() {
inFile.seekg((long)m_nRiddleNumber * sizeof(RIDDLE)); // seek to the riddle we want
- inFile.read((CHAR *)m_pRiddle, sizeof(RIDDLE)); // load that riddle
+ inFile.read((char *)m_pRiddle, sizeof(RIDDLE)); // load that riddle
if (inFile.gcount() != sizeof(RIDDLE))
errCode = ERR_FREAD;
@@ -765,7 +765,7 @@ ERROR_CODE CRiddlesWindow::LoadRiddle() {
ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
ERROR_CODE errCode;
INT i, n;
- CHAR c;
+ char c;
// assume no error
errCode = ERR_NONE;
@@ -821,7 +821,7 @@ ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
- CHAR *pRiddle, *p;
+ char *pRiddle, *p;
INT x, y;
UINT nCharsPerLine;
ERROR_CODE errCode;
@@ -868,7 +868,7 @@ ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
}
-ERROR_CODE CRiddlesWindow::DisplayLine(const CHAR *pszText, INT nChars, INT x, INT y) {
+ERROR_CODE CRiddlesWindow::DisplayLine(const char *pszText, INT nChars, INT x, INT y) {
CSprite *pSprite;
CDC *pDC;
INT nID, i;
@@ -926,7 +926,7 @@ ERROR_CODE CRiddlesWindow::DisplayLine(const CHAR *pszText, INT nChars, INT x, I
return errCode;
}
-INT CRiddlesWindow::CharToIndex(CHAR c) {
+INT CRiddlesWindow::CharToIndex(char c) {
INT nIndex = -1;
switch (c) {
@@ -1233,7 +1233,7 @@ void CMyEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
void CMyEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
- CHAR szBuf[MAX_ANSWER_LENGTH + 1];
+ char szBuf[MAX_ANSWER_LENGTH + 1];
//
// User is typing in his/her guess to the riddle
@@ -1278,7 +1278,7 @@ BEGIN_MESSAGE_MAP(CMyEdit, CEdit)
ON_WM_SYSKEYDOWN()
END_MESSAGE_MAP()
-void CRiddlesWindow::ParseAnswer(const CHAR *pszAnswer) {
+void CRiddlesWindow::ParseAnswer(const char *pszAnswer) {
if (m_bGameActive && !m_bPause) {
GamePause();
@@ -1313,7 +1313,7 @@ void CRiddlesWindow::ParseAnswer(const CHAR *pszAnswer) {
}
}
-BOOL CRiddlesWindow::CheckUserGuess(const CHAR *pszGuess) {
+BOOL CRiddlesWindow::CheckUserGuess(const char *pszGuess) {
INT i;
assert(pszGuess != nullptr);
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index fc6ef5a7c5f..ffc8567efd3 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -129,7 +129,7 @@ public:
void PlayGame(void);
void PaintScreen(void);
void LoadIniSettings(void);
- void ParseAnswer(const CHAR *);
+ void ParseAnswer(const char *);
void GamePause(void);
void GameResume(void);
@@ -138,12 +138,12 @@ private:
protected:
void FlushInputEvents(void);
- BOOL CheckUserGuess(const CHAR *);
+ BOOL CheckUserGuess(const char *);
ERROR_CODE RepaintSpriteList(void);
ERROR_CODE LoadRiddle(void);
ERROR_CODE BuildSpriteList(void);
- ERROR_CODE DisplayLine(const CHAR *, INT, INT, INT);
- INT CharToIndex(CHAR);
+ ERROR_CODE DisplayLine(const char *, INT, INT, INT);
+ INT CharToIndex(char);
ERROR_CODE ValidateRiddle(RIDDLE *);
ERROR_CODE LoadMasterSprites(void);
void GameReset(void);
diff --git a/engines/bagel/mfc/global_functions.cpp b/engines/bagel/mfc/global_functions.cpp
index 1113471e924..694ad4d9964 100644
--- a/engines/bagel/mfc/global_functions.cpp
+++ b/engines/bagel/mfc/global_functions.cpp
@@ -257,7 +257,7 @@ HFONT CreateFontIndirect(const LOGFONT *lf) {
}
BOOL AfxExtractSubString(CString &rString, LPCSTR lpszFullString,
- int iSubString, CHAR chSep) {
+ int iSubString, char chSep) {
if (lpszFullString == nullptr)
return FALSE;
diff --git a/engines/bagel/mfc/global_functions.h b/engines/bagel/mfc/global_functions.h
index 678d01dea30..c6dfb5376a4 100644
--- a/engines/bagel/mfc/global_functions.h
+++ b/engines/bagel/mfc/global_functions.h
@@ -143,7 +143,7 @@ extern BOOL FreeResource(HGLOBAL hResData);
extern HFONT CreateFontIndirect(const LOGFONT *lf);
extern BOOL AfxExtractSubString(CString &rString, LPCSTR lpszFullString,
- int iSubString, CHAR chSep = '\n');
+ int iSubString, char chSep = '\n');
inline char *strUpper(char *s) {
for (char *curr = s; *curr; ++curr)
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index d999c45b7db..3aaa9a75ebe 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -28,7 +28,6 @@ namespace MFC {
typedef int BOOL;
typedef byte BYTE;
typedef byte UBYTE;
-typedef char CHAR;
typedef uint16 TCHAR;
typedef uint16 SHORT;
typedef uint16 WORD;
@@ -38,8 +37,7 @@ typedef unsigned long ULONG;
typedef int64 LONGLONG;
typedef uint64 ULONGLONG;
typedef size_t SIZE_T;
-typedef float FLOAT;
-typedef FLOAT *PFLOAT;
+typedef float *PFLOAT;
typedef BOOL *PBOOL;
typedef BOOL *LPBOOL;
typedef BYTE *PBYTE;
diff --git a/engines/bagel/spacebar/baglib/character_object.cpp b/engines/bagel/spacebar/baglib/character_object.cpp
index e586c72d9b5..516d43edee9 100644
--- a/engines/bagel/spacebar/baglib/character_object.cpp
+++ b/engines/bagel/spacebar/baglib/character_object.cpp
@@ -74,7 +74,7 @@ ErrorCode CBagCharacterObject::attach() {
Video::SmackerDecoder *decoder = new Video::SmackerDecoder();
decoder->setSoundType(Audio::Mixer::kSFXSoundType);
if (!decoder->loadFile(filename.getBuffer())) {
- logError(buildString("CHAR SmackOpen failed: %s ", filename.getBuffer()));
+ logError(buildString("char SmackOpen failed: %s ", filename.getBuffer()));
delete decoder;
return ERR_FOPEN;
}
diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 0165b950f55..09a6e3a9099 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -34,8 +34,8 @@ namespace Bagel {
namespace SpaceBar {
#define SRAF_DIR "$SBARDIR\\SRAFFA\\CLOSEUP\\COMPUTER\\"
-#define SRAF_MALE_DIR "$SBARDIR\\SRAFFA\\CHAR\\GMALE\\"
-#define SRAF_FEMALE_DIR "$SBARDIR\\SRAFFA\\CHAR\\GFEMALE\\"
+#define SRAF_MALE_DIR "$SBARDIR\\SRAFFA\\char\\GMALE\\"
+#define SRAF_FEMALE_DIR "$SBARDIR\\SRAFFA\\char\\GFEMALE\\"
#define SRAF_AUDIO_DIR "$SBARDIR\\SRAFFA\\AUDIO\\EVENTS\\"
#define SRAF_TIMEOUT "SFTIMOUT.WAV"
Commit: 6e1be64fad39e6f859ca86621d166ed7ec84f8b0
https://github.com/scummvm/scummvm/commit/6e1be64fad39e6f859ca86621d166ed7ec84f8b0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:26+03:00
Commit Message:
BAGEL: INT -> int, SIZE_T -> size_t, LONG -> long
Changed paths:
engines/bagel/boflib/misc.cpp
engines/bagel/boflib/misc.h
engines/bagel/boflib/sound.cpp
engines/bagel/boflib/sound.h
engines/bagel/hodjnpodj/archeroids/main.cpp
engines/bagel/hodjnpodj/archeroids/main.h
engines/bagel/hodjnpodj/archeroids/usercfg.cpp
engines/bagel/hodjnpodj/archeroids/usercfg.h
engines/bagel/hodjnpodj/barbershop/main.cpp
engines/bagel/hodjnpodj/battlefish/bfish.cpp
engines/bagel/hodjnpodj/battlefish/bfish.h
engines/bagel/hodjnpodj/battlefish/usercfg.cpp
engines/bagel/hodjnpodj/fuge/fuge.cpp
engines/bagel/hodjnpodj/fuge/fuge.h
engines/bagel/hodjnpodj/fuge/usercfg.cpp
engines/bagel/hodjnpodj/fuge/usercfg.h
engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
engines/bagel/hodjnpodj/hnplibs/audiocfg.h
engines/bagel/hodjnpodj/hnplibs/stdinc.h
engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
engines/bagel/hodjnpodj/metagame/frame/app.cpp
engines/bagel/hodjnpodj/metagame/frame/app.h
engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtl.h
engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
engines/bagel/hodjnpodj/metagame/saves/savedlg.h
engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
engines/bagel/hodjnpodj/novacancy/main.cpp
engines/bagel/hodjnpodj/pdq/game.cpp
engines/bagel/hodjnpodj/pdq/main.cpp
engines/bagel/hodjnpodj/pdq/main.h
engines/bagel/hodjnpodj/riddles/riddles.cpp
engines/bagel/hodjnpodj/riddles/riddles.h
engines/bagel/hodjnpodj/riddles/usercfg.cpp
engines/bagel/hodjnpodj/riddles/usercfg.h
engines/bagel/mfc/afxwin.h
engines/bagel/mfc/atltime.h
engines/bagel/mfc/atltypes.h
engines/bagel/mfc/bitmap.cpp
engines/bagel/mfc/gfx/dialog_template.cpp
engines/bagel/mfc/global_functions.cpp
engines/bagel/mfc/global_functions.h
engines/bagel/mfc/libs/event_loop.h
engines/bagel/mfc/minwindef.h
engines/bagel/mfc/wingdi.h
engines/bagel/mfc/winnt.h
diff --git a/engines/bagel/boflib/misc.cpp b/engines/bagel/boflib/misc.cpp
index 161f97e665d..839e95439c7 100644
--- a/engines/bagel/boflib/misc.cpp
+++ b/engines/bagel/boflib/misc.cpp
@@ -181,9 +181,9 @@ void ErrorLog(const char *logFile, const char *format, ...) {
// No implementation
}
-INT StrFreqMatch(const char *mask, const char *test) {
- static INT nCount[256];
- INT i, divergence;
+int StrFreqMatch(const char *mask, const char *test) {
+ static int nCount[256];
+ int i, divergence;
/* can't access null pointers */
assert(mask != nullptr);
@@ -198,7 +198,7 @@ INT StrFreqMatch(const char *mask, const char *test) {
if (*mask == *test) {
/* reset the frequency count */
- memset(nCount, 0, sizeof(INT) * 256);
+ memset(nCount, 0, sizeof(int) * 256);
/* count the frequency of the chars in 'mask' */
while (*mask != '\0')
@@ -224,7 +224,7 @@ INT StrFreqMatch(const char *mask, const char *test) {
BOOL StrCompare(const char *pszStr1, const char *pszStr2, UINT nSize) {
char *s1, *p, string1[256]; /* replace this stack hog with malloc */
char *s2, *sp, string2[256]; /* replace this stack hog with malloc */
- INT i, n, inc;
+ int i, n, inc;
BOOL bMatch;
/* can't access null pointers */
@@ -351,11 +351,11 @@ BOOL StrCompare(const char *pszStr1, const char *pszStr2, UINT nSize) {
* const char *str; pointer to string to parse
* char c; character to count in str
*
-* RETURNS: INT = number of times character c occurs in string str
+* RETURNS: int = number of times character c occurs in string str
*
*****************************************************************************/
-INT StrCharCount(const char *str, char c) {
- INT n;
+int StrCharCount(const char *str, char c) {
+ int n;
assert(str != nullptr);
assert(strlen(str) <= 255);
@@ -417,7 +417,7 @@ char *StriStr(char *s1, const char *s2) {
void StrUprStr(char *s1, const char *s2) {
char *p;
- INT i, n;
+ int i, n;
/* can't access null pointers */
assert(s1 != nullptr);
diff --git a/engines/bagel/boflib/misc.h b/engines/bagel/boflib/misc.h
index 096b01fbe1e..cc1aa5b38d6 100644
--- a/engines/bagel/boflib/misc.h
+++ b/engines/bagel/boflib/misc.h
@@ -110,9 +110,9 @@ extern bool ProbableTrue(int nProbability);
extern void ErrorLog(const char *logFile, const char *format, ...);
-extern INT StrFreqMatch(const char *, const char *);
+extern int StrFreqMatch(const char *, const char *);
extern BOOL StrCompare(const char *, const char *, UINT);
-extern INT StrCharCount(const char *, char);
+extern int StrCharCount(const char *, char);
extern char *StriStr(char *, const char *);
extern void StrUprStr(char *, const char *);
extern void StrCpyStripChar(char *, const char *, char);
diff --git a/engines/bagel/boflib/sound.cpp b/engines/bagel/boflib/sound.cpp
index 0385e524d99..772d9dd5999 100644
--- a/engines/bagel/boflib/sound.cpp
+++ b/engines/bagel/boflib/sound.cpp
@@ -948,7 +948,7 @@ void CBofSound::setQVol(int nSlot, int nVol) {
}
}
-BOOL MessageBeep(INT uType) {
+BOOL MessageBeep(int uType) {
warning("TODO: beep");
return true;
}
diff --git a/engines/bagel/boflib/sound.h b/engines/bagel/boflib/sound.h
index 01364cb994d..b0021cb2ff3 100644
--- a/engines/bagel/boflib/sound.h
+++ b/engines/bagel/boflib/sound.h
@@ -238,7 +238,7 @@ private:
extern bool BofPlaySound(const char *pszSoundFile, uint32 nFlags, int iQSlot = 0);
extern bool BofPlaySoundEx(const char *pszSoundFile, uint32 nFlags, int iQSlot = 0, bool bWait = false);
-extern BOOL MessageBeep(INT uType);
+extern BOOL MessageBeep(int uType);
#define sndPlaySound BofPlaySound
diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index 833e04f97c0..a4c608a5577 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -148,7 +148,7 @@ LPGAMESTRUCT pGameParams;
extern HWND ghParentWnd;
-STATIC INT aBales[N_HAY];
+STATIC int aBales[N_HAY];
STATIC const POINT aHayPosition[N_HAY][N_SECTIONS_PER_HAY] = {
{ {100, 60}, {108, 60}, {116, 60}, {124, 60}, {132, 60},
@@ -1082,7 +1082,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
return FALSE;
}
-CSprite *CMainWindow::NewLife(INT iLifeIndex) {
+CSprite *CMainWindow::NewLife(int iLifeIndex) {
CSize size;
CDC *pDC;
CSprite *pSprite;
@@ -1111,7 +1111,7 @@ CSprite *CMainWindow::NewLife(INT iLifeIndex) {
ERROR_CODE CMainWindow::CreateLives() {
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -1199,7 +1199,7 @@ ERROR_CODE CMainWindow::CreateHay() {
CLList *pList;
CSprite *pSprite;
CDC *pDC;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -1378,7 +1378,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
//
#if 0
if ((pSprite = m_pMasterBadShoot->DuplicateSprite(pDC)) != nullptr) {
- INT i;
+ int i;
pSprite->LinkSprite();
pSprite->PaintSprite(pDC, pBadGuy->GetPosition());
@@ -1536,7 +1536,7 @@ ERROR_CODE CMainWindow::CreateGoodArrow() {
#if 0
if ((pSprite = m_pMasterGoodShoot->DuplicateSprite(pDC)) != nullptr) {
- INT i;
+ int i;
pSprite->LinkSprite();
pSprite->PaintSprite(pDC, m_pHodj->GetPosition());
m_pHodj->EraseSprite(pDC);
@@ -1612,7 +1612,7 @@ ERROR_CODE CMainWindow::CreateBadGuys() {
CSprite *pSprite;
CDC *pDC;
POINT point;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -1747,7 +1747,7 @@ void CMainWindow::PlayNextWave(void) {
void CMainWindow::WaveReset(void) {
CDC *pDC;
- INT i;
+ int i;
m_nBadGuys = m_nInitNumBadGuys; // reset # badguys
@@ -1893,7 +1893,7 @@ void CMainWindow::KillAnimation(void) {
void CMainWindow::LoadIniSettings() {
- INT nVal;
+ int nVal;
if (pGameParams->bPlayingMetagame) {
@@ -2259,7 +2259,7 @@ BOOL CMainWindow::CheckMessages(void) {
//
if (m_bJoyActive) {
joyGetPos(JOYSTICKID1, &joyInfo);
- OnJoyStick(joyInfo.wButtons, (LONG)joyInfo.wYpos << 16);
+ OnJoyStick(joyInfo.wButtons, (long)joyInfo.wYpos << 16);
}
if (PeekMessage(&msg, nullptr, MM_MCINOTIFY, MM_MCINOTIFY, PM_REMOVE)) {
@@ -2287,7 +2287,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
POINT point;
CLList *pList, *pSearchList, *pSearchNext;
CSprite *pSprite;
- INT i, n;
+ int i, n;
// can't access a null pointer
assert(pDC != nullptr);
@@ -2571,7 +2571,7 @@ void CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
//CSound *pSound;
CLList *pList, *pNext;
POINT point;
- INT i;
+ int i;
// validate the device context
assert(pDC != nullptr);
@@ -2711,7 +2711,7 @@ void CMainWindow::DestroyBadGuy(CLList *pList, CDC *pDC) {
CSprite *pSprite, *pNewSprite;
CLList *pNewList;
POINT point;
- INT i;
+ int i;
// can't access null pointers
assert(pList != nullptr);
@@ -2807,7 +2807,7 @@ void CMainWindow::DestroyHay(CLList *pList, CRect rect, CDC *pDC, BOOL bAnimate)
CSprite *pSprite;
CRect tmpRect, overlappedRect;
POINT ptTmp, point;
- INT i, nID;
+ int i, nID;
// can't access null pointers
assert(pList != nullptr);
@@ -3048,7 +3048,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
}
}
-void CMainWindow::MoveHodj(INT y) {
+void CMainWindow::MoveHodj(int y) {
POINT point;
CDC *pDC;
@@ -3165,8 +3165,8 @@ void CMainWindow::OnClose() {
}
-LONG CMainWindow::OnJoyStick(UINT wParam, LONG lParam) {
- LONG nThreshold;
+long CMainWindow::OnJoyStick(UINT wParam, long lParam) {
+ long nThreshold;
if (m_bGameActive) {
diff --git a/engines/bagel/hodjnpodj/archeroids/main.h b/engines/bagel/hodjnpodj/archeroids/main.h
index a4d99d51039..b1088cb87f1 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.h
+++ b/engines/bagel/hodjnpodj/archeroids/main.h
@@ -55,7 +55,7 @@ protected:
void InitializeJoystick(void);
void GameReset(void);
void WaveReset(void);
- CSprite *NewLife(INT);
+ CSprite *NewLife(int);
ERROR_CODE CreateLives(void);
ERROR_CODE CreateGoodGuy(void);
ERROR_CODE CreateBadGuys(void);
@@ -74,7 +74,7 @@ protected:
void DeleteSprite(CSprite *);
BOOL MoveArrows(CDC *);
BOOL MoveBadGuys(CDC *);
- void MoveHodj(INT);
+ void MoveHodj(int);
void LoseLife(CDC *, BOOL);
void HandleError(ERROR_CODE);
void KillAnimation(void);
@@ -88,7 +88,7 @@ protected:
void OnSysChar(UINT, UINT, UINT);
void OnTimer(UINT_PTR);
void OnClose(void);
- LONG OnJoyStick(UINT, LONG);
+ long OnJoyStick(UINT, long);
void OnActivate(UINT, CWnd *, BOOL) override;
void OnLButtonDown(UINT, CPoint);
void OnRButtonUp(UINT, CPoint);
@@ -137,16 +137,16 @@ protected:
POINT m_ptAnchor;
ULONG m_lScore;
ULONG m_lNewLifeScore;
- INT m_nGoodArrows, m_nBadArrows;
- INT m_nGameSpeed;
+ int m_nGoodArrows, m_nBadArrows;
+ int m_nGameSpeed;
UINT m_nBadGuySpeed;
UINT m_nArrowSpeed;
UINT m_nState;
- INT m_nMoveArrows;
- INT m_nBadGuys;
- INT m_nLives;
- INT m_nLevel;
- INT m_nWave;
+ int m_nMoveArrows;
+ int m_nBadGuys;
+ int m_nLives;
+ int m_nLevel;
+ int m_nWave;
UINT m_nJoyLast;
BOOL m_bPause;
BOOL m_bGameActive;
@@ -160,10 +160,10 @@ protected:
// User Setup variables
//
- INT m_nInitGameSpeed;
- INT m_nInitArcherLevel;
- INT m_nInitNumLives;
- INT m_nInitNumBadGuys;
+ int m_nInitGameSpeed;
+ int m_nInitArcherLevel;
+ int m_nInitNumLives;
+ int m_nInitNumBadGuys;
};
////
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
index b5890e8416d..f151a1e8764 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
@@ -283,7 +283,7 @@ void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
BOOL CUserCfgDlg::OnInitDialog(void) {
CRect tmpRect;
CDC *pDC;
- INT nVal;
+ int nVal;
CBmpDialog::OnInitDialog();
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.h b/engines/bagel/hodjnpodj/archeroids/usercfg.h
index e5d3152c7ef..22f711db557 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.h
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.h
@@ -72,10 +72,10 @@ protected:
CText *m_pTxtSpeedSetting;
CText *m_pTxtLevel;
CText *m_pTxtLives;
- INT m_nInitGameSpeed;
- INT m_nInitArcherLevel;
- INT m_nInitNumLives;
- INT m_nInitNumBadGuys;
+ int m_nInitGameSpeed;
+ int m_nInitArcherLevel;
+ int m_nInitNumLives;
+ int m_nInitNumBadGuys;
BOOL m_bShouldSave; // True if we should save theses settings
};
diff --git a/engines/bagel/hodjnpodj/barbershop/main.cpp b/engines/bagel/hodjnpodj/barbershop/main.cpp
index 7e383202a46..e570d2bcf71 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/main.cpp
@@ -308,8 +308,8 @@ void CMainWindow::PaintScreen() {
GetClientRect(rcDest);
rcDIB.top = rcDIB.left = 0;
- rcDIB.right = (INT) DIBWidth(hDIB);
- rcDIB.bottom = (INT) DIBHeight(hDIB);
+ rcDIB.right = (int) DIBWidth(hDIB);
+ rcDIB.bottom = (int) DIBHeight(hDIB);
PaintDIB(pDC->m_hDC, &rcDest, hDIB, &rcDIB, m_pGamePalette);
}
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index 07d4eb19cd2..58a26b34d77 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -43,8 +43,8 @@ namespace Battlefish {
#define CSOUND 0
-//INT bob[5] = { 27, 56, 7, 63, 31 };
-//INT fred;
+//int bob[5] = { 27, 56, 7, 63, 31 };
+//int fred;
//
// This mini-game's main screen bitmap
@@ -473,7 +473,7 @@ void CBFishWindow::HandleError(ERROR_CODE errCode) {
ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
CDC *pDC;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -650,7 +650,7 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
void CBFishWindow::ReleaseMasterSprites(void) {
- INT i;
+ int i;
// free the hooked fish, and the users fish
//
@@ -774,8 +774,8 @@ void CBFishWindow::PaintScreen() {
GetClientRect(rcDest);
rcDIB.top = rcDIB.left = 0;
- rcDIB.right = (INT) DIBWidth(hDIB);
- rcDIB.bottom = (INT) DIBHeight(hDIB);
+ rcDIB.right = (int) DIBWidth(hDIB);
+ rcDIB.bottom = (int) DIBHeight(hDIB);
PaintDIB(pDC->m_hDC, &rcDest, hDIB, &rcDIB, m_pGamePalette);
}
@@ -864,7 +864,7 @@ ERROR_CODE CBFishWindow::RepaintSpriteList(CDC *pDC) {
* FORMAL PARAMETERS:
*
* WPARAM = WORD parameter for this message
-* LPARAM = LONG parameter for this message
+* LPARAM = long parameter for this message
*
* RETURN VALUE:
*
@@ -878,7 +878,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
GetGameParams, "bfish.txt", (pGameParams->bSoundEffectsEnabled ? WAV_NARRATION : nullptr), pGameParams);
CDC *pDC;
//CSound *pSound;
- INT nPick = 0;
+ int nPick = 0;
if (HIWORD(lParam) == BN_CLICKED) {
switch (wParam) {
@@ -1031,7 +1031,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
void CBFishWindow::PlaceTurnHarpoons(void) {
CSprite *pSprite;
CDC *pDC;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -1135,7 +1135,7 @@ void CBFishWindow::GameResume(void) {
void CBFishWindow::PlayGame(void) {
CRect rTmpRect;
CDC *pDC;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -1202,8 +1202,8 @@ void CBFishWindow::PlaceUserFish(void) {
void CBFishWindow::PlaceEnemyFish(void) {
- INT i, j, k;
- INT row, col, rowTmp, colTmp;
+ int i, j, k;
+ int row, col, rowTmp, colTmp;
BOOL bFound;
// For each fish, randomly select a location in the grid (rotate if neccessary)
@@ -1309,7 +1309,7 @@ void CBFishWindow::PlaceEnemyFish(void) {
*
****************************************************************/
void CBFishWindow::LoadIniSettings(void) {
- INT nVal;
+ int nVal;
if (pGameParams->bPlayingMetagame) {
@@ -1392,7 +1392,7 @@ void CBFishWindow::SaveIniSettings(void) {
****************************************************************/
void CBFishWindow::GameReset(void) {
CDC *pDC;
- INT i;
+ int i;
//fred = 0;
@@ -1464,13 +1464,13 @@ void CBFishWindow::GameReset(void) {
}
-void CBFishWindow::RotateFish(INT nFishIndex) {
+void CBFishWindow::RotateFish(int nFishIndex) {
CSize size;
CRect rect, tmpRect;
POINT point;
CSprite *pSprite;
CDC *pDC;
- INT nIDB;
+ int nIDB;
BOOL bRotated, bPaintFish;
// validate the index
@@ -1577,9 +1577,9 @@ void CBFishWindow::RotateFish(INT nFishIndex) {
}
}
-void CBFishWindow::AssignFishToGrid(INT nFishIndex) {
+void CBFishWindow::AssignFishToGrid(int nFishIndex) {
CPoint point;
- INT i, nRow, nCol, nRowTmp, nColTmp;
+ int i, nRow, nCol, nRowTmp, nColTmp;
assert(nFishIndex >= 0 && nFishIndex < MAX_FISH);
@@ -1633,8 +1633,8 @@ void CBFishWindow::AssignFishToGrid(INT nFishIndex) {
}
-INT CBFishWindow::GetUserGridIndex(CPoint point) {
- INT i, j, iVal, jVal, nGridIndex;
+int CBFishWindow::GetUserGridIndex(CPoint point) {
+ int i, j, iVal, jVal, nGridIndex;
BOOL bEndLoop;
iVal = -1;
@@ -1666,8 +1666,8 @@ INT CBFishWindow::GetUserGridIndex(CPoint point) {
}
-INT CBFishWindow::GetFishIndex(CSprite *pSprite) {
- INT i, nIndex;
+int CBFishWindow::GetFishIndex(CSprite *pSprite) {
+ int i, nIndex;
assert(pSprite != nullptr);
@@ -1705,7 +1705,7 @@ INT CBFishWindow::GetFishIndex(CSprite *pSprite) {
****************************************************************/
void CBFishWindow::OnRButtonDown(UINT, CPoint point) {
CRect tmpRect;
- INT i;
+ int i;
if (m_bUserEditMode) {
@@ -1757,7 +1757,7 @@ void CBFishWindow::OnLButtonDown(UINT, CPoint point) {
CPoint ptTmp;
//CSound *pSound;
CDC *pDC;
- INT i,
+ int i,
nPick;
BOOL bOkToPlay;
@@ -1982,7 +1982,7 @@ void CBFishWindow::OnLButtonUp(UINT, CPoint point) {
CSize size;
CRect rect, tmpRect;
CDC *pDC;
- INT i;
+ int i;
BOOL bRevert;
if (m_bUserEditMode && m_bMovingFish) {
@@ -2039,8 +2039,8 @@ void CBFishWindow::OnLButtonUp(UINT, CPoint point) {
}
}
-BOOL CBFishWindow::OkToPlaceFish(INT nFishIndex, CPoint point, BOOL bRotated) {
- INT i, nRow, nCol, nGridIndex, nID;
+BOOL CBFishWindow::OkToPlaceFish(int nFishIndex, CPoint point, BOOL bRotated) {
+ int i, nRow, nCol, nGridIndex, nID;
BOOL bOk;
nID = IndexToId(nFishIndex);
@@ -2089,8 +2089,8 @@ BOOL CBFishWindow::OkToPlaceFish(INT nFishIndex, CPoint point, BOOL bRotated) {
return bOk;
}
-void CBFishWindow::PlaceFish(INT nFishIndex, CPoint point) {
- INT i, nRow, nCol, nGridIndex, nID;
+void CBFishWindow::PlaceFish(int nFishIndex, CPoint point) {
+ int i, nRow, nCol, nGridIndex, nID;
nID = IndexToId(nFishIndex);
nGridIndex = GetUserGridIndex(point);
@@ -2126,9 +2126,9 @@ void CBFishWindow::PlaceFish(INT nFishIndex, CPoint point) {
}
CPoint CBFishWindow::SnapToGrid(CPoint point) {
- INT i, j;
- INT iMin, jMin;
- INT nVal, nMin;
+ int i, j;
+ int iMin, jMin;
+ int nVal, nMin;
// Inits
nMin = INT_MAX;
@@ -2216,11 +2216,11 @@ void CBFishWindow::OnMouseMove(UINT, CPoint point) {
}
-void CBFishWindow::UsersTurn(INT nGridIndex) {
+void CBFishWindow::UsersTurn(int nGridIndex) {
//CSound *pSound;
- INT nRow, nCol, nSquare;
- INT nFishIndex;
- //INT nPick = 0;
+ int nRow, nCol, nSquare;
+ int nFishIndex;
+ //int nPick = 0;
// validate the grid index
@@ -2347,7 +2347,7 @@ void CBFishWindow::UsersTurn(INT nGridIndex) {
}
}
-void CBFishWindow::SinkEnemyFish(INT nFishIndex) {
+void CBFishWindow::SinkEnemyFish(int nFishIndex) {
CSprite *pSprite;
CDC *pDC;
@@ -2371,10 +2371,10 @@ void CBFishWindow::SinkEnemyFish(INT nFishIndex) {
void CBFishWindow::ComputersTurn(void) {
- STATIC INT nLastRow, nLastCol;
+ STATIC int nLastRow, nLastCol;
//CSound *pSound;
- INT nRow, nCol, nFishIndex, nGridIndex;
- INT nSquare;
+ int nRow, nCol, nFishIndex, nGridIndex;
+ int nSquare;
if (m_bGameActive && !m_bPause) {
@@ -2494,8 +2494,8 @@ void CBFishWindow::ComputersTurn(void) {
}
-void CBFishWindow::SinkUserFish(INT nFishIndex) {
- INT i, nRow, nCol;
+void CBFishWindow::SinkUserFish(int nFishIndex) {
+ int i, nRow, nCol;
for (i = 0; i < GRID_ROWS * GRID_COLS; i++) {
@@ -2509,9 +2509,9 @@ void CBFishWindow::SinkUserFish(INT nFishIndex) {
}
-INT CBFishWindow::SelectRandomTarget(void) {
- INT n;
- INT nRow, nCol;
+int CBFishWindow::SelectRandomTarget(void) {
+ int n;
+ int nRow, nCol;
//
// choose a random target, but favor targets
@@ -2536,8 +2536,8 @@ INT CBFishWindow::SelectRandomTarget(void) {
}
-INT CBFishWindow::SelectBurningTarget(void) {
- INT i, nGridIndex, nRow, nCol;
+int CBFishWindow::SelectBurningTarget(void) {
+ int i, nGridIndex, nRow, nCol;
BOOL bFound;
nRow = nCol = 0;
@@ -2565,9 +2565,9 @@ INT CBFishWindow::SelectBurningTarget(void) {
return nGridIndex;
}
-INT CBFishWindow::SelectBestFitTarget(void) {
- INT nRow, nCol, nFishIndex, nGridIndex;
- INT counter, i;
+int CBFishWindow::SelectBestFitTarget(void) {
+ int nRow, nCol, nFishIndex, nGridIndex;
+ int counter, i;
nFishIndex = MAX_FISH;
while (m_aUserFishInfo[--nFishIndex].life == 0) {
@@ -2605,10 +2605,10 @@ INT CBFishWindow::SelectBestFitTarget(void) {
return nGridIndex;
}
-BOOL CBFishWindow::FishFits(INT nFishIndex, INT row, INT col) {
+BOOL CBFishWindow::FishFits(int nFishIndex, int row, int col) {
FISH cFishInfo;
- INT nRow, nCol, colTmp, rowTmp;
- INT i, j, k, rotate;
+ int nRow, nCol, colTmp, rowTmp;
+ int i, j, k, rotate;
BOOL bFound;
// Try fish at both 0 and 90 degrees
@@ -2669,8 +2669,8 @@ BOOL CBFishWindow::FishFits(INT nFishIndex, INT row, INT col) {
}
-INT CBFishWindow::GetNeighbors(INT nRow, INT nCol) {
- INT n;
+int CBFishWindow::GetNeighbors(int nRow, int nCol) {
+ int n;
// validate the input
//
@@ -2724,8 +2724,8 @@ INT CBFishWindow::GetNeighbors(INT nRow, INT nCol) {
}
-INT CBFishWindow::FindTarget(INT nLastHitRow, INT nLastHitCol) {
- INT nGridIndex;
+int CBFishWindow::FindTarget(int nLastHitRow, int nLastHitCol) {
+ int nGridIndex;
assert(nLastHitRow >= 0 && nLastHitRow < GRID_ROWS);
assert(nLastHitCol >= 0 && nLastHitCol < GRID_COLS);
@@ -2769,9 +2769,9 @@ INT CBFishWindow::FindTarget(INT nLastHitRow, INT nLastHitCol) {
}
-INT CBFishWindow::FindNeighborTarget(INT nLastHitRow, INT nLastHitCol) {
- INT nRow, nCol, nGridIndex;
- INT nState, nDisplacement;
+int CBFishWindow::FindNeighborTarget(int nLastHitRow, int nLastHitCol) {
+ int nRow, nCol, nGridIndex;
+ int nState, nDisplacement;
nState = 0;
nRow = nCol = 0;
@@ -2854,14 +2854,14 @@ INT CBFishWindow::FindNeighborTarget(INT nLastHitRow, INT nLastHitCol) {
#if 1
-INT CBFishWindow::FindMatch(INT nLastHitRow, INT nLastHitCol) {
+int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
FISH cFishInfo;
- INT i, j, k, l, rotate;
- INT nRow, nCol, nBestRow, nBestCol;
- INT n, nLast;
- INT row, col, rowTmp, colTmp, nGridIndex;
- INT nUseRow, nUseCol;
- INT nHits, nBestHits;
+ int i, j, k, l, rotate;
+ int nRow, nCol, nBestRow, nBestCol;
+ int n, nLast;
+ int row, col, rowTmp, colTmp, nGridIndex;
+ int nUseRow, nUseCol;
+ int nHits, nBestHits;
BOOL bFound, bUse;
rowTmp = colTmp = 0;
@@ -3020,12 +3020,12 @@ INT CBFishWindow::FindMatch(INT nLastHitRow, INT nLastHitCol) {
}
#else
-INT CBFishWindow::FindMatch(INT nLastHitRow, INT nLastHitCol) {
+int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
FISH cFishInfo;
- INT i, j, k, l, rotate;
- INT nRow, nCol, nBestRow, nBestCol;
- INT n, nLast;
- INT row, col, rowTmp, colTmp, nGridIndex;
+ int i, j, k, l, rotate;
+ int nRow, nCol, nBestRow, nBestCol;
+ int n, nLast;
+ int row, col, rowTmp, colTmp, nGridIndex;
BOOL bFound;
rowTmp = colTmp = 0;
@@ -3186,7 +3186,7 @@ INT CBFishWindow::FindMatch(INT nLastHitRow, INT nLastHitCol) {
void CBFishWindow::CreatePlume(CPoint point) {
CDC *pDC;
CSprite *pSprite;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -3252,7 +3252,7 @@ void CBFishWindow::CreatePlume(CPoint point) {
void CBFishWindow::CreateHarpoon(CPoint point) {
CDC *pDC;
CSprite *pSprite;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -3316,13 +3316,13 @@ void CBFishWindow::CreateHarpoon(CPoint point) {
}
-INT CBFishWindow::IndexToId(INT nFishIndex) {
+int CBFishWindow::IndexToId(int nFishIndex) {
return 2 << nFishIndex;
}
-INT CBFishWindow::IdToIndex(INT nId) {
- INT i;
+int CBFishWindow::IdToIndex(int nId) {
+ int i;
assert(iseven(nId));
@@ -3336,11 +3336,11 @@ INT CBFishWindow::IdToIndex(INT nId) {
}
-INT CBFishWindow::GetEnemyGridIndex(CPoint point) {
+int CBFishWindow::GetEnemyGridIndex(CPoint point) {
CRect rect;
- INT nIndex;
- INT i, j;
- INT iVal, jVal;
+ int nIndex;
+ int i, j;
+ int iVal, jVal;
nIndex = -1;
rect.SetRect(RGRID_MIN_X, RGRID_MIN_Y, RGRID_MAX_X, RGRID_MAX_Y);
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index b8e4caece79..9038e23487b 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -65,30 +65,30 @@ protected:
void ReleaseMasterSprites(void);
void PlaceUserFish(void);
void PlaceEnemyFish(void);
- void RotateFish(INT);
- void AssignFishToGrid(INT);
- INT GetEnemyGridIndex(CPoint);
- INT GetUserGridIndex(CPoint);
- INT GetFishIndex(CSprite *);
- BOOL OkToPlaceFish(INT, CPoint, BOOL);
- void PlaceFish(INT, CPoint);
- INT IndexToId(INT);
- INT IdToIndex(INT);
+ void RotateFish(int);
+ void AssignFishToGrid(int);
+ int GetEnemyGridIndex(CPoint);
+ int GetUserGridIndex(CPoint);
+ int GetFishIndex(CSprite *);
+ BOOL OkToPlaceFish(int, CPoint, BOOL);
+ void PlaceFish(int, CPoint);
+ int IndexToId(int);
+ int IdToIndex(int);
CPoint SnapToGrid(CPoint);
- void UsersTurn(INT);
+ void UsersTurn(int);
void ComputersTurn(void);
- INT SelectRandomTarget(void);
- INT SelectBurningTarget(void);
- INT SelectBestFitTarget(void);
- INT FindNeighborTarget(INT, INT);
- INT FindTarget(INT, INT);
- INT FindMatch(INT, INT);
- BOOL FishFits(INT, INT, INT);
- INT GetNeighbors(INT, INT);
+ int SelectRandomTarget(void);
+ int SelectBurningTarget(void);
+ int SelectBestFitTarget(void);
+ int FindNeighborTarget(int, int);
+ int FindTarget(int, int);
+ int FindMatch(int, int);
+ BOOL FishFits(int, int, int);
+ int GetNeighbors(int, int);
void CreatePlume(CPoint);
void CreateHarpoon(CPoint);
- void SinkUserFish(INT);
- void SinkEnemyFish(INT);
+ void SinkUserFish(int);
+ void SinkEnemyFish(int);
void PlaceTurnHarpoons(void);
void RemoveTurnHarpoon(void);
@@ -130,10 +130,10 @@ protected:
CPalette *m_pGamePalette;
CSound *m_pSoundTrack;
CText *m_pTxtClickHere;
- INT m_nEnemyFish;
- INT m_nUserFish;
- INT m_nTurns;
- INT m_nDifficultyLevel;
+ int m_nEnemyFish;
+ int m_nUserFish;
+ int m_nTurns;
+ int m_nDifficultyLevel;
BOOL m_bGameActive;
BOOL m_bPause;
BOOL m_bUserEditMode;
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
index 12619b90be7..307f9c26b41 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
@@ -265,7 +265,7 @@ void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
*
****************************************************************/
void CUserCfgDlg::LoadIniSettings(void) {
- INT nVal;
+ int nVal;
// Get the Difficulty level (0..2)
//
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index b5b468213de..3732f028180 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -566,7 +566,7 @@ void CFugeWindow::InitializeJoystick(void) {
void CFugeWindow::RealignVectors(void) {
CVector vTmp;
- INT i, j;
+ int i, j;
for (i = 0; i < N_ROWS; i++) {
@@ -856,7 +856,7 @@ void CFugeWindow::PlayGame(void) {
HandleError(errCode);
}
-ERROR_CODE CFugeWindow::LoadNewPaddle(INT nNewSize) {
+ERROR_CODE CFugeWindow::LoadNewPaddle(int nNewSize) {
CDC *pDC;
ERROR_CODE errCode;
@@ -1045,7 +1045,7 @@ void CFugeWindow::StartBall(void) {
m_pBall->LinkSprite();
if ((pDC = GetDC()) != nullptr) {
- m_pBall->PaintSprite(pDC, (INT)m_ptBallLocation.x, (INT)m_ptBallLocation.y);
+ m_pBall->PaintSprite(pDC, (int)m_ptBallLocation.x, (int)m_ptBallLocation.y);
ReleaseDC(pDC);
}
}
@@ -1076,8 +1076,8 @@ void CFugeWindow::PaintBall(void) {
assert(m_pBall != nullptr);
- ptLast.x = (INT)m_ptBallLocation.x;
- ptLast.y = (INT)m_ptBallLocation.y;
+ ptLast.x = (int)m_ptBallLocation.x;
+ ptLast.y = (int)m_ptBallLocation.y;
vGravity = gvCenter - (m_ptBallLocation + BALL_RADIUS);
vGravity.Unitize();
@@ -1236,14 +1236,14 @@ void CFugeWindow::PaintBall(void) {
// only paint the ball if it actually moved
//
- if ((ptLast.x != (INT)m_ptBallLocation.x) || (ptLast.y != (INT)m_ptBallLocation.y)) {
+ if ((ptLast.x != (int)m_ptBallLocation.x) || (ptLast.y != (int)m_ptBallLocation.y)) {
if (m_pBall->IsLinked()) {
// paint the ball to it's new location
//
if ((pDC = GetDC()) != nullptr) {
- m_pBall->PaintSprite(pDC, (INT)m_ptBallLocation.x, (INT)m_ptBallLocation.y);
+ m_pBall->PaintSprite(pDC, (int)m_ptBallLocation.x, (int)m_ptBallLocation.y);
ReleaseDC(pDC);
}
}
@@ -1259,8 +1259,8 @@ void CFugeWindow::BallvsPaddle(void) {
CVector vTmp, vPaddle, vFace, vBallCenter, vBallEdge;
DOUBLE a1, a2;
DOUBLE fLen1, fLen2, fLen3, fLen4, fLen5, fLen6, fMin, length;
- INT i, j, k;
- INT nRollBack = 0;
+ int i, j, k;
+ int nRollBack = 0;
BOOL bHit;
// calculate the 7 critical points for the paddle
@@ -1357,15 +1357,15 @@ void CFugeWindow::BallvsPaddle(void) {
nRollBack = 0;
if (fLen1 <= BALL_RADIUS) {
- nRollBack = BALL_RADIUS - (INT)fLen1;
+ nRollBack = BALL_RADIUS - (int)fLen1;
bHit = TRUE;
break;
} else if (fLen2 <= BALL_RADIUS) {
- nRollBack = (BALL_RADIUS - (INT)fLen2);
+ nRollBack = (BALL_RADIUS - (int)fLen2);
bHit = TRUE;
break;
} else if (fLen1 + fLen2 <= length) {
- nRollBack = (INT)(length - (fLen1 + fLen2)) + 2;
+ nRollBack = (int)(length - (fLen1 + fLen2)) + 2;
bHit = TRUE;
break;
}
@@ -1527,13 +1527,13 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
CPoint ptTmp;
DOUBLE fMin, fLast, fLen[N_BRICK_POINTS];
DOUBLE angle;
- INT i, j, nIndex, nLastIndex, nBrickIndex, nMaxHits;
- INT nBrick0, nBrick1, nRow0, nRow1, nRow2, nUse[MAX_BRICK_HITS];
+ int i, j, nIndex, nLastIndex, nBrickIndex, nMaxHits;
+ int nBrick0, nBrick1, nRow0, nRow1, nRow2, nUse[MAX_BRICK_HITS];
BOOL bHit, bStillHit;
// get bounding rectangle of the ball
//
- rBall.SetRect((INT)m_ptBallLocation.x, (INT)m_ptBallLocation.y, (INT)m_ptBallLocation.x + BALL_SIZE_X, (INT)m_ptBallLocation.y + BALL_SIZE_Y);
+ rBall.SetRect((int)m_ptBallLocation.x, (int)m_ptBallLocation.y, (int)m_ptBallLocation.x + BALL_SIZE_X, (int)m_ptBallLocation.y + BALL_SIZE_Y);
// get center of the ball
vBallCenter.SetVector(m_ptBallLocation.x + BALL_RADIUS, m_ptBallLocation.y + BALL_RADIUS);
@@ -1896,7 +1896,7 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
}
-void CFugeWindow::EraseBrick(CDC *pDC, INT nBrickIndex) {
+void CFugeWindow::EraseBrick(CDC *pDC, int nBrickIndex) {
assert(pDC != nullptr);
assert((nBrickIndex >= 0) && (nBrickIndex < N_BRICKS));
@@ -1944,7 +1944,7 @@ void CFugeWindow::LoseBall(void) {
}
/* BLACK HOLE ANIMATION REMOVED DUE TO LACK OF ARTWORK
CSprite *pSprite;
- INT i;
+ int i;
// start the black hole animation
//
@@ -2080,7 +2080,7 @@ void CFugeWindow::LaunchBall(void) {
void CFugeWindow::PaintPaddle(BOOL bPaint) {
CVector vPaddle;
CDC *pDC;
- INT nOldIndex;
+ int nOldIndex;
BOOL bSuccess;
// verify that the input was not tainted
@@ -2127,7 +2127,7 @@ void CFugeWindow::PaintPaddle(BOOL bPaint) {
// paint the ball to it's new location
//
- m_pBall->PaintSprite(pDC, (INT)m_ptBallLocation.x, (INT)m_ptBallLocation.y);
+ m_pBall->PaintSprite(pDC, (int)m_ptBallLocation.x, (int)m_ptBallLocation.y);
} else {
@@ -2177,7 +2177,7 @@ void CFugeWindow::PaintPaddle(BOOL bPaint) {
void CFugeWindow::StartBricks(void) {
CDC *pDC;
- INT i, nBricks;
+ int i, nBricks;
nBricks = m_nNumRows * BRICKS_PER_ROW;
@@ -2201,7 +2201,7 @@ void CFugeWindow::PaintBricks(CDC *pDC) {
CBitmap *pBmp, *pMemBmp;
CPalette *pPalOld, *pScreenPalOld;
HBITMAP hOldBitmap;
- INT i;
+ int i;
assert(pDC != nullptr);
assert((m_nNumRows >= 0) && (m_nNumRows <= N_ROWS));
@@ -2397,7 +2397,7 @@ void CFugeWindow::OnTimer(UINT_PTR nEvent) {
if (m_bJoyActive) {
JOYINFO joyInfo;
joyGetPos(JOYSTICKID1, &joyInfo);
- OnJoyStick(joyInfo.wButtons, ((LONG)joyInfo.wYpos << 16) | joyInfo.wXpos);
+ OnJoyStick(joyInfo.wButtons, ((long)joyInfo.wYpos << 16) | joyInfo.wXpos);
}
if (!m_bPause) {
@@ -2407,8 +2407,8 @@ void CFugeWindow::OnTimer(UINT_PTR nEvent) {
}
}
-LONG CFugeWindow::OnJoyStick(UINT wParam, LONG lParam) {
- LONG nThresholdX, nThresholdY;
+long CFugeWindow::OnJoyStick(UINT wParam, long lParam) {
+ long nThresholdX, nThresholdY;
if (m_bGameActive) {
@@ -2473,7 +2473,7 @@ LONG CFugeWindow::OnJoyStick(UINT wParam, LONG lParam) {
void CFugeWindow::OnMouseMove(UINT, CPoint point) {
- INT nMove;
+ int nMove;
if (m_bGameActive && m_bMovingPaddle) {
@@ -2546,7 +2546,7 @@ void CFugeWindow::OnLButtonDown(UINT nFlags, CPoint point) {
car8Rect,
car9Rect,
car10Rect;
- INT nPick = 0;
+ int nPick = 0;
boothRect.SetRect(BOOTH_X, BOOTH_Y, BOOTH_X + BOOTH_DX, BOOTH_Y + BOOTH_DY);
tentRect.SetRect(TENT_X, TENT_Y, TENT_X + TENT_DX, TENT_Y + TENT_DY);
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index dce53816b44..74d62055e52 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -58,7 +58,7 @@ protected:
void ReleaseMasterSprites(void);
ERROR_CODE LoadMasterSounds(void);
void ReleaseMasterSounds(void);
- ERROR_CODE LoadNewPaddle(INT);
+ ERROR_CODE LoadNewPaddle(int);
void InitializeJoystick(void);
void RepaintSpriteList(CDC *);
void PaintBricks(CDC *);
@@ -72,13 +72,13 @@ protected:
CVector BallOnPaddle(void);
void StartBricks(void);
void EndBricks(void);
- void EraseBrick(CDC *, INT);
+ void EraseBrick(CDC *, int);
void LoseBall(void);
void BallvsPaddle(void);
void BallvsBrick(DOUBLE);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
- LONG OnJoyStick(UINT, LONG);
+ long OnJoyStick(UINT, long);
void OnPaint(void);
void OnTimer(UINT_PTR);
void OnMouseMove(UINT, CPoint);
@@ -116,23 +116,23 @@ protected:
HANDLE m_hPaddleRes;
HANDLE m_hExtraLifeRes;
- INT m_nInitNumBalls;
- INT m_nInitStartLevel;
- INT m_nInitBallSpeed;
- INT m_nInitPaddleSize;
- INT m_nGForceFactor;
+ 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;
- INT m_nOldSize = -1;
+ 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;
+ int m_nOldSize = -1;
BOOL m_bMovingPaddle;
BOOL m_bGameActive;
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index 5020040bd6d..0b242b5d2d3 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -141,7 +141,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
char buf[40];
- INT nMin, nMax, nVal;
+ int nMin, nMax, nVal;
CDC *pDC;
// can't access a null pointer
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.h b/engines/bagel/hodjnpodj/fuge/usercfg.h
index 1d9f29fcf9b..49f8c89b3fb 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.h
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.h
@@ -85,10 +85,10 @@ protected:
CScrollBar *m_pScrollBar4;
CCheckButton *m_pWallButton;
- INT m_nNumBalls;
- INT m_nStartLevel;
- INT m_nBallSpeed;
- INT m_nPaddleSize;
+ int m_nNumBalls;
+ int m_nStartLevel;
+ int m_nBallSpeed;
+ int m_nPaddleSize;
BOOL m_bOutterWall;
BOOL m_bSave; // True if should save theses values
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
index 11f5b3abed8..adcdb7ca097 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
@@ -111,7 +111,7 @@ BOOL CAudioCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
}
void CAudioCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
- INT nMin = 0, nMax = 0, nVal = 0;
+ int nMin = 0, nMax = 0, nVal = 0;
if (pScroll == m_pScrollBar1) {
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
index c3c1e6da2ab..b3042483ce5 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
@@ -65,7 +65,7 @@ protected:
CText *m_pTxtVolume;
- INT m_nVolume;
+ int m_nVolume;
BOOL m_bMusic;
BOOL m_bSound;
};
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdinc.h b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
index fb4198a88d5..ae401ab6ff9 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdinc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
@@ -59,11 +59,11 @@ namespace HodjNPodj {
#define char char
typedef unsigned char UCHAR;
typedef byte UBYTE;
-#define INT int
+#define int int
typedef short SHORT;
typedef uint16 USHORT;
#define WORD USHORT
-#define LONG long
+#define long long
typedef unsigned long ULONG;
#define float float
#define DOUBLE double
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
index 3e3101b55fa..ff8588466a6 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
@@ -447,7 +447,7 @@ void CBgbMgr::CacheReleaseObject(CBgbObject *pBgbObject) {
void CBgbMgr::CacheOptimize(ULONG lReqSpace) {
CBgbObject *pBgbObject;
ULONG lAvgAge;
- INT nObjects;
+ int nObjects;
ULONG lSpace;
// There are no objects to flush
@@ -714,7 +714,7 @@ ULONG Sqrt(ULONG x) {
} else {
break;
}
- if (abs((LONG)(lHigh - lLow)) <= 2)
+ if (abs((long)(lHigh - lLow)) <= 2)
break;
}
diff --git a/engines/bagel/hodjnpodj/metagame/frame/app.cpp b/engines/bagel/hodjnpodj/metagame/frame/app.cpp
index 3c8dcafacc3..64f4472501e 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/app.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/app.cpp
@@ -131,7 +131,7 @@ void CTheApp::selectMinigame() {
game->_initFn(nullptr, lpGameStruct);
}
-BOOL CTheApp::OnIdle(LONG lCount) {
+BOOL CTheApp::OnIdle(long lCount) {
CBofSound::audioTask();
return true;
}
diff --git a/engines/bagel/hodjnpodj/metagame/frame/app.h b/engines/bagel/hodjnpodj/metagame/frame/app.h
index 1c12597cb38..78cf3a58f4a 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/app.h
+++ b/engines/bagel/hodjnpodj/metagame/frame/app.h
@@ -62,7 +62,7 @@ public:
*/
int ExitInstance() override;
- BOOL OnIdle(LONG lCount) override;
+ BOOL OnIdle(long lCount) override;
};
extern bool dllLoaded;
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index a60adab161f..b0e941f517b 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -2100,10 +2100,10 @@ BOOL CHodjPodjWindow::Restore() {
void CHodjPodjWindow::ShowCredits(void) {
MSG msg;
- LONG lTimeElapsed, lStart;
+ long lTimeElapsed, lStart;
ULONG lGoal, lWait;
CDC *pDC;
- INT i;
+ int i;
m_bInCredits = TRUE;
@@ -2156,7 +2156,7 @@ void CHodjPodjWindow::ShowCredits(void) {
// pause for specified ammount of time less ammount used to pre-load
// next bitmap
//
- lWait = (ULONG)max((LONG)stCredits[i].m_nDuration - lTimeElapsed, 0L);
+ lWait = (ULONG)max((long)stCredits[i].m_nDuration - lTimeElapsed, 0L);
lGoal = lWait + GetTickCount();
while (lGoal > GetTickCount()) {
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
index da29ad83782..6d3b0839187 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
@@ -188,7 +188,7 @@ int CGtlApp::DoMessageBox(LPCSTR lpszPrompt, UINT nType, UINT nIDPrompt)
RETURN(iRetval) ;
}
-BOOL CGtlApp::OnIdle(LONG lCount) {
+BOOL CGtlApp::OnIdle(long lCount) {
if (bExitMetaDLL) {
PostMessage(nullptr, WM_QUIT, 0, 0);
return false;
@@ -270,7 +270,7 @@ BOOL CGtlMDIChildWnd::PreCreateWindow(CREATESTRUCT& cs) {
// the framework will use first string in the document template
// STRINGTABLE resource instead of the document name.
-// cs.style &= ~(LONG)FWS_ADDTOTITLE;
+// cs.style &= ~(long)FWS_ADDTOTITLE;
// cs.style = WS_POPUP ;
return CMDIChildWnd::PreCreateWindow(cs);
}
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.h b/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
index 966747ee259..b759e0c4a95 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
@@ -85,7 +85,7 @@ public:
// display message box messages
virtual int DoMessageBox(LPCSTR lpszPrompt,
UINT nType, UINT nIDPrompt) ;
- BOOL OnIdle(LONG lCount) override;
+ BOOL OnIdle(long lCount) override;
private:
static void focusChange(CWnd *oldFocus, CWnd *newFocus);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
index 6ba122eebac..58eced68f45 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
@@ -702,7 +702,7 @@ private:
// grab Mish and Mosh from current location
BOOL DetermineMishMoshEligibility(CXodj *, int);
- void DoTransport(CXodj *, INT);
+ void DoTransport(CXodj *, int);
// gtlcmp.cpp -- meta game computer play
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
index 6567cfcd022..068b853e5ef 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
@@ -633,7 +633,7 @@ int CGtlData::FindNodeId(const char *pszLabel) {
void CGtlData::LoadCharDirection(CBgbObject *pBgbSprite, CPoint ptOld, CPoint ptNew) {
#if 1
char chOldChar, chNewChar = '1';
- INT x, y;
+ int x, y;
// can't access null pointers
assert(pBgbSprite != nullptr);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
index 7967bdd0289..099c2f381af 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
@@ -685,11 +685,11 @@ void CGtlData::CheckForTransport(CXodj *pXodj, int nNewSector)
}
-void CGtlData::DoTransport(CXodj *pXodj, INT iNode) {
+void CGtlData::DoTransport(CXodj *pXodj, int iNode) {
char szOldFileName[128];
CBgbObject *pCurPlayer;
CPoint point;
- INT i;
+ int i;
point = NodeToPoint(m_lpNodes + iNode, &pXodj->m_lpcCharSprite->m_cSize);
diff --git a/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
index f0e1865d44f..d46e8ca08a7 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
@@ -32,7 +32,7 @@ static const char *gpszTitle = "Restore Game";
CRestoreDlg::CRestoreDlg(char *pszDescriptions[], CWnd *pWnd, CPalette *pPalette)
: CBmpDialog(pWnd, pPalette, IDD_RESTORE, ".\\ART\\MLSCROLL.BMP", -1, -1, TRUE) {
- INT i;
+ int i;
// Inits
m_pTxtRestore = nullptr;
@@ -87,7 +87,7 @@ void CRestoreDlg::OnCancel(void) {
BOOL CRestoreDlg::OnInitDialog(void) {
CRect rect;
CDC *pDC;
- INT i;
+ int i;
BOOL bSuccess;
CBmpDialog::OnInitDialog(); // do basic dialog initialization
@@ -149,7 +149,7 @@ void CRestoreDlg::OnPaint(void) {
void CRestoreDlg::ClearDialogImage(void) {
- INT i;
+ int i;
if (m_pTxtRestore != nullptr) {
delete m_pTxtRestore;
m_pTxtRestore = nullptr;
@@ -170,7 +170,7 @@ void CRestoreDlg::ClearDialogImage(void) {
void CRestoreDlg::OnDestroy(void) {
- INT i;
+ int i;
if (m_pTxtRestore != nullptr) {
delete m_pTxtRestore;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
index 9939a0a2e06..e52d5d292a4 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
@@ -49,7 +49,7 @@ extern char szDescBuf[40];
CSaveDlg::CSaveDlg(char *pszDescriptions[], CWnd *pWnd, CPalette *pPalette)
: CBmpDialog(pWnd, pPalette, 2000, ".\\ART\\MLSCROLL.BMP") {
- INT i;
+ int i;
// Inits
m_pTxtSave = nullptr;
@@ -112,7 +112,7 @@ void CSaveDlg::OnCancel(void) {
EndDialog(-1);
}
-void CSaveDlg::EditDescription(INT nNewSlot) {
+void CSaveDlg::EditDescription(int nNewSlot) {
char szBuf[40];
// abort any other edits the user was making
@@ -156,7 +156,7 @@ void CSaveDlg::EditDescription(INT nNewSlot) {
BOOL CSaveDlg::OnInitDialog(void) {
CRect rect;
CDC *pDC;
- INT i;
+ int i;
BOOL bSuccess;
CBmpDialog::OnInitDialog(); // do basic dialog initialization
@@ -228,7 +228,7 @@ void CSaveDlg::OnPaint(void) {
void CSaveDlg::ClearDialogImage(void) {
- INT i;
+ int i;
if (m_pTxtSave != nullptr) {
delete m_pTxtSave;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
index b8cb523a31d..ed7e8771d9a 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
@@ -39,7 +39,7 @@ public:
protected:
void ClearDialogImage(void);
- void EditDescription(INT);
+ void EditDescription(int);
//{{AFX_MSG(COptions)
virtual BOOL OnCommand(WPARAM, LPARAM) override;
@@ -58,7 +58,7 @@ private:
CColorButton *m_pOkButton;
CText *m_pTxtSave;
char *m_pszDescriptions[MAX_SAVEGAMES];
- INT m_nCurSlot;
+ int m_nCurSlot;
};
} // namespace Saves
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
index 8e87a398012..0fb0df2cf28 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
@@ -58,7 +58,7 @@ static void WipeBFC(CBfcMgr *pBfcMgr);
BOOL SaveGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
CWinApp *pMyApp;
HCURSOR hCursor;
- INT iGameNum;
+ int iGameNum;
BOOL bSaved;
ERROR_CODE errCode;
@@ -129,7 +129,7 @@ BOOL SaveGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
}
BOOL RestoreGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
- INT iGameNum;
+ int iGameNum;
BOOL bRestored;
// Validate input
@@ -170,7 +170,7 @@ void ConvertToSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
CItem *pItem;
PLAYER_INFO *pSavePlayer;
INVENTORY *pSaveInv;
- INT i, j, k;
+ int i, j, k;
assert(pBfcMgr != nullptr);
assert(pSaveGameInfo != nullptr);
@@ -212,22 +212,22 @@ void ConvertToSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
pSavePlayer->m_iWinInfoWon = pPlayer->m_iWinInfoWon;
pSavePlayer->m_iWinInfoNeed = pPlayer->m_iWinInfoNeed;
- memcpy(&pSavePlayer->m_iWinInfoTable, &pPlayer->m_iWinInfoTable, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pSavePlayer->m_iWinInfoTable, &pPlayer->m_iWinInfoTable, sizeof(int) * MAX_GAME_TABLE);
pSavePlayer->m_iSecondaryInfoWon = pPlayer->m_iSecondaryInfoWon;
pSavePlayer->m_iSecondaryInfoNeed = pPlayer->m_iSecondaryInfoNeed;
- memcpy(&pSavePlayer->m_iSecondaryInfoTable, &pPlayer->m_iSecondaryInfoTable, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pSavePlayer->m_iSecondaryInfoTable, &pPlayer->m_iSecondaryInfoTable, sizeof(int) * MAX_GAME_TABLE);
pSavePlayer->m_iRequiredObjectsCount = pPlayer->m_iRequiredObjectsCount;
- memcpy(&pSavePlayer->m_iRequiredObjectsTable, &pPlayer->m_iRequiredObjectsTable, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pSavePlayer->m_iRequiredObjectsTable, &pPlayer->m_iRequiredObjectsTable, sizeof(int) * MAX_GAME_TABLE);
pSavePlayer->m_iRequiredMoney = pPlayer->m_iRequiredMoney;
- memcpy(&pSavePlayer->m_iSecondaryLoc, &pPlayer->m_iSecondaryLoc, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pSavePlayer->m_iSecondaryLoc, &pPlayer->m_iSecondaryLoc, sizeof(int) * MAX_GAME_TABLE);
- memcpy(&pSavePlayer->m_iGameHistory, &pPlayer->m_iGameHistory, sizeof(INT) * 20);
+ memcpy(&pSavePlayer->m_iGameHistory, &pPlayer->m_iGameHistory, sizeof(int) * 20);
pSavePlayer->m_iTargetLocation = pPlayer->m_iTargetLocation;
pSavePlayer->m_iSpecialTravelCode = pPlayer->m_iSpecialTravelCode;
@@ -343,7 +343,7 @@ ERROR_CODE ConvertFromSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
CItem *pItem;
PLAYER_INFO *pSavePlayer;
INVENTORY *pSaveInv;
- INT i, j, k;
+ int i, j, k;
ERROR_CODE errCode;
// assume no error
@@ -403,22 +403,22 @@ ERROR_CODE ConvertFromSGI(CBfcMgr *pBfcMgr, SAVEGAME_INFO *pSaveGameInfo) {
pPlayer->m_iWinInfoWon = pSavePlayer->m_iWinInfoWon;
pPlayer->m_iWinInfoNeed = pSavePlayer->m_iWinInfoNeed;
- memcpy(&pPlayer->m_iWinInfoTable, &pSavePlayer->m_iWinInfoTable, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pPlayer->m_iWinInfoTable, &pSavePlayer->m_iWinInfoTable, sizeof(int) * MAX_GAME_TABLE);
pPlayer->m_iSecondaryInfoWon = pSavePlayer->m_iSecondaryInfoWon;
pPlayer->m_iSecondaryInfoNeed = pSavePlayer->m_iSecondaryInfoNeed;
- memcpy(&pPlayer->m_iSecondaryInfoTable, &pSavePlayer->m_iSecondaryInfoTable, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pPlayer->m_iSecondaryInfoTable, &pSavePlayer->m_iSecondaryInfoTable, sizeof(int) * MAX_GAME_TABLE);
pPlayer->m_iRequiredObjectsCount = pSavePlayer->m_iRequiredObjectsCount;
- memcpy(&pPlayer->m_iRequiredObjectsTable, &pSavePlayer->m_iRequiredObjectsTable, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pPlayer->m_iRequiredObjectsTable, &pSavePlayer->m_iRequiredObjectsTable, sizeof(int) * MAX_GAME_TABLE);
pPlayer->m_iRequiredMoney = pSavePlayer->m_iRequiredMoney;
- memcpy(&pPlayer->m_iSecondaryLoc, &pSavePlayer->m_iSecondaryLoc, sizeof(INT) * MAX_GAME_TABLE);
+ memcpy(&pPlayer->m_iSecondaryLoc, &pSavePlayer->m_iSecondaryLoc, sizeof(int) * MAX_GAME_TABLE);
- memcpy(&pPlayer->m_iGameHistory, &pSavePlayer->m_iGameHistory, sizeof(INT) * 20);
+ memcpy(&pPlayer->m_iGameHistory, &pSavePlayer->m_iGameHistory, sizeof(int) * 20);
pPlayer->m_iTargetLocation = pSavePlayer->m_iTargetLocation;
pPlayer->m_iSpecialTravelCode = pSavePlayer->m_iSpecialTravelCode;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
index 12b1ed3ddb7..10f257f01a7 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
@@ -41,17 +41,17 @@ namespace Saves {
struct CLUE_ARRAY {
BOOL bUsed = false;
- INT iNoteID = 0;
- INT iPlaceID = 0;
- INT iPersonID = 0;
+ int iNoteID = 0;
+ int iPlaceID = 0;
+ int iPersonID = 0;
void sync(Common::Serializer &s);
};
struct INVENTORY {
char m_szTitle[40] = { '\0' };
- INT m_aItemList[MG_OBJ_COUNT] = { 0 };
- INT m_nItems = 0;
+ int m_aItemList[MG_OBJ_COUNT] = { 0 };
+ int m_nItems = 0;
void sync(Common::Serializer &s);
};
@@ -61,37 +61,37 @@ struct PLAYER_INFO {
BOOL m_bMoving = false; // flag: this player moving
BOOL m_bComputer = false; // flag: played by computer
BOOL m_bHaveMishMosh = false;
- INT m_iSectorCode = 0; // MG_SECTOR_xxxx
- INT m_iNode = 0; // node # location
- INT m_iSkillLevel = 0;
+ int m_iSectorCode = 0; // MG_SECTOR_xxxx
+ int m_iNode = 0; // node # location
+ int m_iSkillLevel = 0;
// list of clue numbers for clues given by winning mini-game
- INT m_iWinInfoWon = 0;
- INT m_iWinInfoNeed = 0;
- INT m_iWinInfoTable[MAX_GAME_TABLE] = { 0 };
+ int m_iWinInfoWon = 0;
+ int m_iWinInfoNeed = 0;
+ int m_iWinInfoTable[MAX_GAME_TABLE] = { 0 };
// list of clue numbers for clues given by farmer, etc.
- INT m_iSecondaryInfoWon = 0;
- INT m_iSecondaryInfoNeed = 0;
- INT m_iSecondaryInfoTable[MAX_GAME_TABLE] = { 0 };
+ int m_iSecondaryInfoWon = 0;
+ int m_iSecondaryInfoNeed = 0;
+ int m_iSecondaryInfoTable[MAX_GAME_TABLE] = { 0 };
// list of objects required to get Mish/Mosh
- INT m_iRequiredObjectsCount = 0;
- INT m_iRequiredObjectsTable[MAX_GAME_TABLE] = { 0 };
- INT m_iRequiredMoney = 0; // money needed for Mish/Mosh
+ int m_iRequiredObjectsCount = 0;
+ int m_iRequiredObjectsTable[MAX_GAME_TABLE] = { 0 };
+ int m_iRequiredMoney = 0; // money needed for Mish/Mosh
// list of secondary information location we still have to visit
- INT m_iSecondaryLoc[MAX_GAME_TABLE] = { 0 };
+ int m_iSecondaryLoc[MAX_GAME_TABLE] = { 0 };
- INT m_iGameHistory[20] = { 0 }; // last 20 mini-games played
- INT m_iTargetLocation = 0; // target location for computer play
- INT m_iSpecialTravelCode = 0;
- INT m_iNumberBoatTries = 0;
- INT m_iFurlongs = 0; // players remaining furlongs
- INT m_nTurns = 0; // players remaining turns
+ int m_iGameHistory[20] = { 0 }; // last 20 mini-games played
+ int m_iTargetLocation = 0; // target location for computer play
+ int m_iSpecialTravelCode = 0;
+ int m_iNumberBoatTries = 0;
+ int m_iFurlongs = 0; // players remaining furlongs
+ int m_nTurns = 0; // players remaining turns
// these items require special attention when saving or restoring a game
- LONG m_lCrowns = 0; // from inventory
+ long m_lCrowns = 0; // from inventory
CLUE_ARRAY m_bClueArray[NUMBER_OF_CLUES]; // array of clues for the notebook
INVENTORY m_stInventory;
@@ -115,9 +115,9 @@ struct SAVEGAME_INFO {
BOOL m_bTraps[240] = { false }; // table of used booby traps and narrations
- INT m_iGameTime = 0; // SHORT_GAME, MEDIUM_GAME or LONG_GAME
+ int m_iGameTime = 0; // SHORT_GAME, MEDIUM_GAME or LONG_GAME
- INT m_iMishMoshLoc = 0; // MG_LOC_xxxx -- Mish/Mosh location
+ int m_iMishMoshLoc = 0; // MG_LOC_xxxx -- Mish/Mosh location
UBYTE m_chJunk[80] = { 0 }; // for future use so the .SAV file size
// does not have to change
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index 03f7a5f2817..882574ce2ae 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -305,8 +305,8 @@ void CMainWindow::PaintScreen() {
GetClientRect(rcDest);
rcDIB.top = rcDIB.left = 0;
- rcDIB.right = (INT) DIBWidth(hDIB);
- rcDIB.bottom = (INT) DIBHeight(hDIB);
+ rcDIB.right = (int) DIBWidth(hDIB);
+ rcDIB.bottom = (int) DIBHeight(hDIB);
PaintDIB(pDC->m_hDC, &rcDest, hDIB, &rcDIB, m_pGamePalette);
} //end-if (hDIB)
@@ -544,8 +544,8 @@ void CMainWindow::PlayGame() {
GetClientRect(rcDest);
rcDIB.top = rcDIB.left = 0;
- rcDIB.right = (INT) DIBWidth(hDIB);
- rcDIB.bottom = (INT) DIBHeight(hDIB);
+ rcDIB.right = (int) DIBWidth(hDIB);
+ rcDIB.bottom = (int) DIBHeight(hDIB);
PaintDIB(pDC->m_hDC, &rcDest, hDIB, &rcDIB, m_pGamePalette);
}//end if (hDIB)
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index 8a17403137f..36dc3d0efba 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -79,13 +79,13 @@ void KillCurPhrase(void);
void BuildRandomPhraseOrder();
bool RevealNextLetter(void);
void CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, uint32);
-INT StrLenNoSpaces(const char *);
-INT GetIndex(CSprite *);
+int StrLenNoSpaces(const char *);
+int GetIndex(CSprite *);
void LoadGameCfg(void);
void SaveGameCfg(void);
ERROR_CODE ValidatePhrase(PHRASES *);
void UpdateScore(UINT, UINT, UINT, UINT);
-INT NumLinkedSprites(void);
+int NumLinkedSprites(void);
#define TIMER_ID 50
#define START_X_ODD 318
@@ -117,13 +117,13 @@ extern LPGAMESTRUCT pGameParams;
USERCFG gGameCfg;
PHRASES *curPhrase, gPhrase;
SPRITE_LIST spriteList[MAX_PLENGTH];
-INT iNextLetter;
-INT timerInterval;
+int iNextLetter;
+int timerInterval;
HWND gGameWnd;
bool bPause;
UINT gLeftAvg, gTotalAvg;
const char *INI_SECTION = "ThGesngGme";
-INT nPhrasePixelLength;
+int nPhrasePixelLength;
/**
@@ -141,7 +141,7 @@ INT nPhrasePixelLength;
ERROR_CODE LoadNewPhrase(void) {
STATIC int nLast;
char *p, buf[MAX_PLENGTH_S + 2];
- INT i, n, nType;
+ int i, n, nType;
ERROR_CODE errCode;
/* assume no error */
@@ -157,7 +157,7 @@ ERROR_CODE LoadNewPhrase(void) {
*/
/* determine the number of phrases in the data store */
- n = (INT)(FileLength(DATA_FILE) / sizeof(PHRASES));
+ n = (int)(FileLength(DATA_FILE) / sizeof(PHRASES));
if (n > 0) {
@@ -251,7 +251,7 @@ ERROR_CODE LoadNewPhrase(void) {
**/
void BuildRandomPhraseOrder() {
UBYTE *curPhraseOrder;
- INT i, j, n, newIndex;
+ int i, j, n, newIndex;
bool use;
/*
@@ -301,7 +301,7 @@ void BuildRandomPhraseOrder() {
ERROR_CODE BuildSpriteList(CDC *pDC) {
CSprite *pNewSprite;
char *pText;
- INT i;
+ int i;
ERROR_CODE errCode;
/* can't access null pointers */
@@ -392,7 +392,7 @@ ERROR_CODE BuildSpriteList(CDC *pDC) {
*
**/
void KillCurPhrase() {
- INT i, n;
+ int i, n;
if (curPhrase != nullptr) {
@@ -425,7 +425,7 @@ void KillCurPhrase() {
**/
bool RevealNextLetter() {
CSize size;
- INT index;
+ int index;
bool lastLetter;
lastLetter = FALSE;
@@ -471,7 +471,7 @@ bool RevealNextLetter() {
**/
ERROR_CODE RecalcDisplay(CDC *pDC) {
CSize size;
- INT i, gap, last, n;
+ int i, gap, last, n;
ERROR_CODE errCode;
/* can't use a null pointer */
@@ -546,8 +546,8 @@ ERROR_CODE RepaintSpriteList(CDC *pDC) {
return errCode;
}
-INT GetIndex(CSprite *pSprite) {
- INT i;
+int GetIndex(CSprite *pSprite) {
+ int i;
assert(pSprite != nullptr);
@@ -580,7 +580,7 @@ INT GetIndex(CSprite *pSprite) {
*
**/
ERROR_CODE InitGame(HWND hWnd, CDC *pDC) {
- INT i;
+ int i;
ERROR_CODE errCode;
assert(pDC != nullptr);
@@ -613,7 +613,7 @@ ERROR_CODE InitGame(HWND hWnd, CDC *pDC) {
gMain->EraseCategory();
/* reveal 1st 3 letters */
- for (i = 0; i < (INT)gGameCfg.nShown; i++) {
+ for (i = 0; i < (int)gGameCfg.nShown; i++) {
RevealNextLetter();
}
}
@@ -887,7 +887,7 @@ void CALLBACK GetGameParams(CWnd *pParentWnd) {
**/
void LoadGameCfg() {
char buf[10];
- INT n;
+ int n;
if (pGameParams->bPlayingMetagame) {
@@ -1013,8 +1013,8 @@ bool CheckUserGuess(const char *guess) {
* returns len = length of string without spaces
*
**/
-INT StrLenNoSpaces(const char *str) {
- INT len;
+int StrLenNoSpaces(const char *str) {
+ int len;
/* can't access a null pointer */
assert(str != nullptr);
@@ -1031,7 +1031,7 @@ INT StrLenNoSpaces(const char *str) {
ERROR_CODE ValidatePhrase(PHRASES *phrase) {
bool bList[MAX_PLENGTH];
- INT i, n, order;
+ int i, n, order;
char c;
ERROR_CODE errCode;
@@ -1074,7 +1074,7 @@ ERROR_CODE ValidatePhrase(PHRASES *phrase) {
* check to make sure that the indexing order values are valid
*/
for (i = 0; i < n; i++) {
- order = (INT)phrase->order[i] - 1;
+ order = (int)phrase->order[i] - 1;
if ((order >= n) || (order < 0) || bList[order]) {
@@ -1121,9 +1121,9 @@ void GameGetScore(UINT *nLeft, UINT *nTotal, UINT *nLeftAvg, UINT *nTotalAvg) {
* returns nSprites = number of sprites in linked list
*
**/
-INT NumLinkedSprites(void) {
+int NumLinkedSprites(void) {
CSprite *pSprite;
- INT i = 0;
+ int i = 0;
pSprite = CSprite::GetSpriteChain();
while (pSprite) {
diff --git a/engines/bagel/hodjnpodj/pdq/main.cpp b/engines/bagel/hodjnpodj/pdq/main.cpp
index 499f6903eab..b7d4efe1f7a 100644
--- a/engines/bagel/hodjnpodj/pdq/main.cpp
+++ b/engines/bagel/hodjnpodj/pdq/main.cpp
@@ -217,7 +217,7 @@ CMainWindow::CMainWindow() {
ERROR_CODE CMainWindow::LoadCategoryNames(void) {
CDC *pDC;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no error
@@ -251,7 +251,7 @@ ERROR_CODE CMainWindow::LoadCategoryNames(void) {
}
void CMainWindow::ReleaseCategoryNames(void) {
- INT i;
+ int i;
for (i = N_CATEGORIES - 1; i >= 0; i--) {
if (m_pCategories[i] != nullptr) {
@@ -262,7 +262,7 @@ void CMainWindow::ReleaseCategoryNames(void) {
}
-void CMainWindow::PaintCategory(INT iType) {
+void CMainWindow::PaintCategory(int iType) {
CDC *pDC;
assert((iType >= 0) && (iType < N_CATEGORIES));
diff --git a/engines/bagel/hodjnpodj/pdq/main.h b/engines/bagel/hodjnpodj/pdq/main.h
index 6e233301d92..4bba3150571 100644
--- a/engines/bagel/hodjnpodj/pdq/main.h
+++ b/engines/bagel/hodjnpodj/pdq/main.h
@@ -43,7 +43,7 @@ public:
void PlayGame(void);
void PaintScreen(void);
- void PaintCategory(INT);
+ void PaintCategory(int);
void EraseCategory(void);
int m_nTurnCount = 0;
@@ -76,7 +76,7 @@ protected:
CSprite *m_pScrollSprite = nullptr;
CGuessDlg *m_pDlgGuess = nullptr;
CSound *m_pSoundTrack = nullptr;
- INT m_iLastType = 0;
+ int m_iLastType = 0;
BOOL m_bInMenu = FALSE;
BOOL m_bInGuess = FALSE;
};
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.cpp b/engines/bagel/hodjnpodj/riddles/riddles.cpp
index 969ffb5417d..888db9ef573 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.cpp
+++ b/engines/bagel/hodjnpodj/riddles/riddles.cpp
@@ -335,7 +335,7 @@ ERROR_CODE CRiddlesWindow::LoadMasterSprites(void) {
CBitmap *pBmp, *pFontBmp;
CSprite *pSprite;
CDC *pDC;
- INT i;
+ int i;
ERROR_CODE errCode;
// assume no erorr
@@ -433,8 +433,8 @@ void CRiddlesWindow::PaintScreen() {
GetClientRect(rcDest);
rcDIB.top = rcDIB.left = 0;
- rcDIB.right = (INT) DIBWidth(hDIB);
- rcDIB.bottom = (INT) DIBHeight(hDIB);
+ rcDIB.right = (int) DIBWidth(hDIB);
+ rcDIB.bottom = (int) DIBHeight(hDIB);
PaintDIB(pDC->m_hDC, &rcDest, hDIB, &rcDIB, m_pGamePalette);
}
@@ -591,7 +591,7 @@ void CRiddlesWindow::PlayGame() {
}
void CRiddlesWindow::LoadIniSettings() {
- INT nVal;
+ int nVal;
if (pGameParams->bPlayingMetagame) {
@@ -680,7 +680,7 @@ void CRiddlesWindow::GameReset(void) {
ERROR_CODE CRiddlesWindow::LoadRiddle() {
STATIC UINT nLast;
- INT n, nMin, nMax;
+ int n, nMin, nMax;
ERROR_CODE errCode;
errCode = ERR_NONE; // assume no error
@@ -689,7 +689,7 @@ ERROR_CODE CRiddlesWindow::LoadRiddle() {
m_pRiddle = &curRiddle; // get a suitable storage area for this riddle
- n = (INT)(FileLength(DATA_FILE) / sizeof(RIDDLE)); // determine number of riddles in the data store
+ n = (int)(FileLength(DATA_FILE) / sizeof(RIDDLE)); // determine number of riddles in the data store
assert(n > 0 && n <= MAX_RIDDLES); // verify # of riddles
@@ -764,7 +764,7 @@ ERROR_CODE CRiddlesWindow::LoadRiddle() {
ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
ERROR_CODE errCode;
- INT i, n;
+ int i, n;
char c;
// assume no error
@@ -822,7 +822,7 @@ ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
char *pRiddle, *p;
- INT x, y;
+ int x, y;
UINT nCharsPerLine;
ERROR_CODE errCode;
@@ -868,10 +868,10 @@ ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
}
-ERROR_CODE CRiddlesWindow::DisplayLine(const char *pszText, INT nChars, INT x, INT y) {
+ERROR_CODE CRiddlesWindow::DisplayLine(const char *pszText, int nChars, int x, int y) {
CSprite *pSprite;
CDC *pDC;
- INT nID, i;
+ int nID, i;
ERROR_CODE errCode;
// assume no error
@@ -926,8 +926,8 @@ ERROR_CODE CRiddlesWindow::DisplayLine(const char *pszText, INT nChars, INT x, I
return errCode;
}
-INT CRiddlesWindow::CharToIndex(char c) {
- INT nIndex = -1;
+int CRiddlesWindow::CharToIndex(char c) {
+ int nIndex = -1;
switch (c) {
@@ -1314,7 +1314,7 @@ void CRiddlesWindow::ParseAnswer(const char *pszAnswer) {
}
BOOL CRiddlesWindow::CheckUserGuess(const char *pszGuess) {
- INT i;
+ int i;
assert(pszGuess != nullptr);
assert(strlen(pszGuess) <= MAX_ANSWER_LENGTH);
@@ -1484,7 +1484,7 @@ void CRiddlesWindow::OnClose() {
CBrush myBrush;
CRect myRect;
CDC *pDC;
- INT i;
+ int i;
// perform cleanup
//
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index ffc8567efd3..a90ecaa8d9a 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -142,8 +142,8 @@ protected:
ERROR_CODE RepaintSpriteList(void);
ERROR_CODE LoadRiddle(void);
ERROR_CODE BuildSpriteList(void);
- ERROR_CODE DisplayLine(const char *, INT, INT, INT);
- INT CharToIndex(char);
+ ERROR_CODE DisplayLine(const char *, int, int, int);
+ int CharToIndex(char);
ERROR_CODE ValidateRiddle(RIDDLE *);
ERROR_CODE LoadMasterSprites(void);
void GameReset(void);
@@ -170,10 +170,10 @@ protected:
RIDDLE *m_pRiddle;
CSprite *m_pSunDial;
CSound *m_pSoundTrack;
- INT m_nTimeLimit;
- INT m_nInitTimeLimit;
- INT m_nTimer;
- INT m_nDifficultyLevel;
+ int m_nTimeLimit;
+ int m_nInitTimeLimit;
+ int m_nTimer;
+ int m_nDifficultyLevel;
UINT m_nRiddleNumber;
BOOL m_bGameActive;
BOOL m_bPause;
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.cpp b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
index 89b9e018ac0..98464b876f2 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
@@ -73,7 +73,7 @@ static const char *pTimeLimit[MAX_TIME_LIMITS] = {
"None"
};
-static const INT nTimeLimit[MAX_TIME_LIMITS] = {
+static const int nTimeLimit[MAX_TIME_LIMITS] = {
10, 15, 20, 25, 30, 40, 50, 60, 75, 90, 120, 180, 240, 300, 301
};
@@ -96,8 +96,8 @@ void CUserCfgDlg::PutDlgData() {
m_pLevelScroll->SetScrollPos(m_nDifficultyLevel);
}
-INT CUserCfgDlg::GetIndex(INT nVal) {
- INT i, nIndex;
+int CUserCfgDlg::GetIndex(int nVal) {
+ int i, nIndex;
nIndex = SCROLL_DEF;
for (i = 0; i < MAX_TIME_LIMITS; i++) {
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.h b/engines/bagel/hodjnpodj/riddles/usercfg.h
index d2d80b668ba..9f228299c97 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.h
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.h
@@ -54,7 +54,7 @@ protected:
void GetDlgData(void);
void DispLimit(void);
void DispLevel(void);
- INT GetIndex(INT);
+ int GetIndex(int);
void OnHScroll(UINT, UINT, CScrollBar *);
void OnClose();
@@ -68,7 +68,7 @@ protected:
CScrollBar *m_pScrollBar;
CScrollBar *m_pLevelScroll;
UINT m_nTimeLimit;
- INT m_nDifficultyLevel;
+ int m_nDifficultyLevel;
BOOL m_bSave; // True if should save theses values
};
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index fcb66f19eae..e5768e86531 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -616,7 +616,7 @@ public:
BOOL CreateBitmap(int nWidth, int nHeight, UINT nPlanes,
UINT nBitcount, const void *lpBits);
int GetObject(int nCount, LPVOID lpObject) const;
- LONG GetBitmapBits(LONG dwCount, LPVOID lpBits) const;
+ long GetBitmapBits(long dwCount, LPVOID lpBits) const;
BOOL GetBitmap(BITMAP *pBitMap) const {
return GetObject(sizeof(BITMAP), pBitMap);
}
@@ -1074,7 +1074,7 @@ typedef struct tagCREATESTRUCTA {
int cx = 0;
int y = 0;
int x = 0;
- LONG style = 0;
+ long style = 0;
LPCSTR lpszName = nullptr;
LPCSTR lpszClass = nullptr;
uint32 dwExStyle = 0;
diff --git a/engines/bagel/mfc/atltime.h b/engines/bagel/mfc/atltime.h
index 64a49372332..ac6fcde8419 100644
--- a/engines/bagel/mfc/atltime.h
+++ b/engines/bagel/mfc/atltime.h
@@ -35,18 +35,18 @@ public:
CTimeSpan();
CTimeSpan(int64 time);
CTimeSpan(
- LONG lDays,
+ long lDays,
int nHours,
int nMins,
int nSecs);
LONGLONG GetDays() const;
LONGLONG GetTotalHours() const;
- LONG GetHours() const;
+ long GetHours() const;
LONGLONG GetTotalMinutes() const;
- LONG GetMinutes() const;
+ long GetMinutes() const;
LONGLONG GetTotalSeconds() const;
- LONG GetSeconds() const;
+ long GetSeconds() const;
int64 GetTimeSpan() const;
diff --git a/engines/bagel/mfc/atltypes.h b/engines/bagel/mfc/atltypes.h
index 3d5b6303bee..69115764b7d 100644
--- a/engines/bagel/mfc/atltypes.h
+++ b/engines/bagel/mfc/atltypes.h
@@ -534,7 +534,7 @@ inline void CRect::SwapLeftRight() {
}
inline void WINAPI CRect::SwapLeftRight(LPRECT lpRect) {
- LONG temp = lpRect->left;
+ long temp = lpRect->left;
lpRect->left = lpRect->right;
lpRect->right = temp;
}
diff --git a/engines/bagel/mfc/bitmap.cpp b/engines/bagel/mfc/bitmap.cpp
index f52b6e68c3a..a250153b9ff 100644
--- a/engines/bagel/mfc/bitmap.cpp
+++ b/engines/bagel/mfc/bitmap.cpp
@@ -99,7 +99,7 @@ int CBitmap::GetObject(int nCount, LPVOID lpObject) const {
return sizeof(BITMAP);
}
-LONG CBitmap::GetBitmapBits(LONG dwCount, LPVOID lpBits) const {
+long CBitmap::GetBitmapBits(long dwCount, LPVOID lpBits) const {
const CBitmap::Impl *src = static_cast<CBitmap::Impl *>(m_hObject);
dwCount = MIN<int32>((int32)dwCount, src->pitch * src->h * src->format.bytesPerPixel);
diff --git a/engines/bagel/mfc/gfx/dialog_template.cpp b/engines/bagel/mfc/gfx/dialog_template.cpp
index 984e49c46e2..c6059e467bd 100644
--- a/engines/bagel/mfc/gfx/dialog_template.cpp
+++ b/engines/bagel/mfc/gfx/dialog_template.cpp
@@ -207,8 +207,8 @@ void CDialogTemplate::loadTemplate(CDialog *dialog) {
);
// WORKAROUND: For Hodj n Podj Boardgame dialog
- bounds.right = MIN<LONG>(bounds.right, 640);
- bounds.bottom = MIN<LONG>(bounds.bottom, 480);
+ bounds.right = MIN<long>(bounds.right, 640);
+ bounds.bottom = MIN<long>(bounds.bottom, 480);
CWnd *wndDialog = static_cast<CWnd *>(dialog);
wndDialog->Create(_header._className.c_str(),
diff --git a/engines/bagel/mfc/global_functions.cpp b/engines/bagel/mfc/global_functions.cpp
index 694ad4d9964..8f6390a5f5d 100644
--- a/engines/bagel/mfc/global_functions.cpp
+++ b/engines/bagel/mfc/global_functions.cpp
@@ -41,7 +41,7 @@ struct MemBlock {
}
};
-HGLOBAL GlobalAlloc(UINT uFlags, SIZE_T dwBytes) {
+HGLOBAL GlobalAlloc(UINT uFlags, size_t dwBytes) {
return new MemBlock(dwBytes,
uFlags == GMEM_ZEROINIT);
}
@@ -59,11 +59,11 @@ HGLOBAL GlobalFree(HGLOBAL hMem) {
return nullptr;
}
-SIZE_T GlobalSize(HGLOBAL hMem) {
+size_t GlobalSize(HGLOBAL hMem) {
return ((MemBlock *)hMem)->_size;
}
-SIZE_T GlobalCompact(uint32 dwMinFree) {
+size_t GlobalCompact(uint32 dwMinFree) {
// No implementation
return 999999;
}
@@ -85,7 +85,7 @@ int MessageBox(LPCSTR lpText) {
}
UINT GetPrivateProfileInt(LPCSTR lpAppName,
- LPCSTR lpKeyName, INT nDefault, LPCSTR lpFileName) {
+ LPCSTR lpKeyName, int nDefault, LPCSTR lpFileName) {
return AfxGetApp()->GetProfileInt(lpAppName, lpKeyName, nDefault);
}
diff --git a/engines/bagel/mfc/global_functions.h b/engines/bagel/mfc/global_functions.h
index c6dfb5376a4..026d37b6965 100644
--- a/engines/bagel/mfc/global_functions.h
+++ b/engines/bagel/mfc/global_functions.h
@@ -76,12 +76,12 @@ extern BOOL GetClassInfo(HINSTANCE hInstance,
LPCSTR lpClassName, LPWNDCLASS lpWndClass);
extern int GetSystemMetrics(int nIndex);
-extern HGLOBAL GlobalAlloc(UINT uFlags, SIZE_T dwBytes);
+extern HGLOBAL GlobalAlloc(UINT uFlags, size_t dwBytes);
extern LPVOID GlobalLock(HGLOBAL hMem);
extern BOOL GlobalUnlock(HGLOBAL hMem);
extern HGLOBAL GlobalFree(HGLOBAL hMem);
-extern SIZE_T GlobalSize(HGLOBAL hMem);
-extern SIZE_T GlobalCompact(uint32 dwMinFree);
+extern size_t GlobalSize(HGLOBAL hMem);
+extern size_t GlobalCompact(uint32 dwMinFree);
#define LocalAlloc GlobalAlloc
#define LocalLock GlobalLock
#define LocalUnlock GlobalUnlock
@@ -94,7 +94,7 @@ extern int MessageBox(HWND hWnd, LPCSTR lpText,
extern int MessageBox(LPCSTR lpText, LPCSTR lpCaption, UINT uType = 0);
extern int MessageBox(LPCSTR lpText);
extern UINT GetPrivateProfileInt(LPCSTR lpAppName,
- LPCSTR lpKeyName, INT nDefault, LPCSTR lpFileName);
+ LPCSTR lpKeyName, int nDefault, LPCSTR lpFileName);
extern uint32 GetPrivateProfileString(LPCSTR lpAppName,
LPCSTR lpKeyName, LPCSTR lpDefault, LPSTR lpReturnedString,
uint32 nSize, LPCSTR lpFileName);
diff --git a/engines/bagel/mfc/libs/event_loop.h b/engines/bagel/mfc/libs/event_loop.h
index 1849428a986..be85965bca4 100644
--- a/engines/bagel/mfc/libs/event_loop.h
+++ b/engines/bagel/mfc/libs/event_loop.h
@@ -262,7 +262,7 @@ public:
return _updateWnds;
}
- virtual BOOL OnIdle(LONG lCount) {
+ virtual BOOL OnIdle(long lCount) {
return false;
}
diff --git a/engines/bagel/mfc/minwindef.h b/engines/bagel/mfc/minwindef.h
index 47ea041eafe..e673c3b17f7 100644
--- a/engines/bagel/mfc/minwindef.h
+++ b/engines/bagel/mfc/minwindef.h
@@ -121,7 +121,7 @@ typedef INT_PTR(CALLBACK *DLGPROC)(HWND, UINT, WPARAM, LPARAM);
#endif
#define MAKEWORD(a, b) ((WORD)(((BYTE)(((DWORD_PTR)(a)) & 0xff)) | ((WORD)((BYTE)(((DWORD_PTR)(b)) & 0xff))) << 8))
-#define MAKELONG(a, b) ((LONG)(((WORD)(((DWORD_PTR)(a)) & 0xffff)) | ((uint32)((WORD)(((DWORD_PTR)(b)) & 0xffff))) << 16))
+#define MAKELONG(a, b) ((long)(((WORD)(((DWORD_PTR)(a)) & 0xffff)) | ((uint32)((WORD)(((DWORD_PTR)(b)) & 0xffff))) << 16))
#define LOWORD(l) ((WORD)(((DWORD_PTR)(l)) & 0xffff))
#define HIWORD(l) ((((DWORD_PTR)(l)) >> 16))
#define LOBYTE(w) ((BYTE)(((DWORD_PTR)(w)) & 0xff))
@@ -163,8 +163,8 @@ typedef struct tagPOINT {
} POINT, *PPOINT, NEAR *NPPOINT, FAR *LPPOINT;
typedef struct _POINTL { /* ptl */
- LONG x;
- LONG y;
+ long x;
+ long y;
} POINTL, *PPOINTL;
typedef struct tagSIZE {
@@ -186,10 +186,10 @@ typedef struct tagPOINTS {
} POINTS, *PPOINTS, *LPPOINTS;
typedef struct tagRECT {
- LONG left;
- LONG top;
- LONG right;
- LONG bottom;
+ long left;
+ long top;
+ long right;
+ long bottom;
operator Common::Rect() const {
return Common::Rect(left, top, right, bottom);
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index 23b05641bf1..a53a7ff1d5d 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -625,14 +625,14 @@ enum {
typedef struct tagBITMAPINFOHEADER {
uint32 biSize;
- LONG biWidth;
- LONG biHeight;
+ long biWidth;
+ long biHeight;
WORD biPlanes;
WORD biBitCount;
uint32 biCompression;
uint32 biSizeImage;
- LONG biXPelsPerMeter;
- LONG biYPelsPerMeter;
+ long biXPelsPerMeter;
+ long biYPelsPerMeter;
uint32 biClrUsed;
uint32 biClrImportant;
} BITMAPINFOHEADER, FAR *LPBITMAPINFOHEADER,
@@ -652,10 +652,10 @@ typedef struct tagBITMAPINFO {
/* Bitmap Header Definition */
typedef struct tagBITMAP {
- LONG bmType;
- LONG bmWidth;
- LONG bmHeight;
- LONG bmWidthBytes;
+ long bmType;
+ long bmWidth;
+ long bmHeight;
+ long bmWidthBytes;
WORD bmPlanes;
WORD bmBitsPixel;
LPVOID bmBits;
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index 3aaa9a75ebe..cc11236561c 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -32,11 +32,9 @@ typedef uint16 TCHAR;
typedef uint16 SHORT;
typedef uint16 WORD;
typedef uint16 USHORT;
-typedef long LONG;
typedef unsigned long ULONG;
typedef int64 LONGLONG;
typedef uint64 ULONGLONG;
-typedef size_t SIZE_T;
typedef float *PFLOAT;
typedef BOOL *PBOOL;
typedef BOOL *LPBOOL;
@@ -61,7 +59,6 @@ typedef char *LPSTR;
typedef char *NPSTR;
typedef LPWSTR BSTR;
-typedef int INT;
typedef unsigned int UINT;
typedef unsigned int *PUINT;
@@ -705,17 +702,17 @@ typedef struct _GUID {
#define AFX_WS_DEFAULT_VIEW (WS_CHILD | WS_VISIBLE)
typedef struct tagTEXTMETRICA {
- LONG tmHeight = 0;
- LONG tmAscent = 0;
- LONG tmDescent = 0;
- LONG tmInternalLeading = 0;
- LONG tmExternalLeading = 0;
- LONG tmAveCharWidth = 0;
- LONG tmMaxCharWidth = 0;
- LONG tmWeight = 0;
- LONG tmOverhang = 0;
- LONG tmDigitizedAspectX = 0;
- LONG tmDigitizedAspectY = 0;
+ long tmHeight = 0;
+ long tmAscent = 0;
+ long tmDescent = 0;
+ long tmInternalLeading = 0;
+ long tmExternalLeading = 0;
+ long tmAveCharWidth = 0;
+ long tmMaxCharWidth = 0;
+ long tmWeight = 0;
+ long tmOverhang = 0;
+ long tmDigitizedAspectX = 0;
+ long tmDigitizedAspectY = 0;
BYTE tmFirstChar = 0;
BYTE tmLastChar = 0;
BYTE tmDefaultChar = 0;
Commit: 517514c6aa12a17982d432e0bf4723337490a6dc
https://github.com/scummvm/scummvm/commit/517514c6aa12a17982d432e0bf4723337490a6dc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:28+03:00
Commit Message:
BAGEL: Fix the parameter types of LineDDA()
Changed paths:
engines/bagel/hodjnpodj/beacon/beacon.cpp
engines/bagel/mfc/wingdi.cpp
engines/bagel/mfc/wingdi.h
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index a401419f9b1..14c2e9778f9 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -38,7 +38,7 @@ namespace HodjNPodj {
namespace Beacon {
void CALLBACK GetSubOptions(CWnd *pParentWind);
-void CALLBACK StepAlongLine(int xpos, int ypos, LPARAM lphdc);
+void CALLBACK StepAlongLine(int xpos, int ypos, CDC *cdc);
BOOL InArtRegion(CPoint point);
void MyFocusRect(CDC *pDC, CRect rect, BOOL bPressed);
@@ -988,12 +988,10 @@ void CMainWindow::CheckUnderBeam() {
ReleaseDC(pDC);
} // end CheckUnderBeam
-void CALLBACK StepAlongLine(int xpos, int ypos, LPARAM lpData) {
- CDC *pDC;
+void CALLBACK StepAlongLine(int xpos, int ypos, CDC *cdc) {
+ CDC *pDC = cdc;
CPoint point;
- pDC = (CDC *)lpData;
-
if (bChanged) {
point.x = xpos;
point.y = ypos;
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index e8168dfbb4b..e6740a04cb5 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -353,7 +353,7 @@ int ShowCursor(BOOL bShow) {
return 0;
}
-BOOL LineDDA(int x0, int y0, int x1, int y1, LINEDDAPROC lpProc, LPARAM lpData) {
+BOOL LineDDA(int x0, int y0, int x1, int y1, LINEDDAPROC lpProc, CDC *cdc) {
if (!lpProc)
return FALSE;
@@ -366,7 +366,7 @@ BOOL LineDDA(int x0, int y0, int x1, int y1, LINEDDAPROC lpProc, LPARAM lpData)
int err = dx - dy;
for (;;) {
- lpProc(x0, y0, lpData); // Call the callback for this pixel
+ lpProc(x0, y0, cdc); // Call the callback for this pixel
if (x0 == x1 && y0 == y1)
break;
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index a53a7ff1d5d..37003d0ce5a 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -27,6 +27,8 @@
namespace Bagel {
namespace MFC {
+class CDC;
+
#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (uint32)(WORD)(i)))
/*
@@ -784,9 +786,9 @@ extern HCURSOR LoadCursor(HINSTANCE hInstance,
extern HCURSOR SetCursor(HCURSOR hCursor);
extern int ShowCursor(BOOL bShow);
-typedef void (CALLBACK *LINEDDAPROC)(int x, int y, LPARAM lpData);
+typedef void (CALLBACK *LINEDDAPROC)(int x, int y, CDC *cdc);
extern BOOL LineDDA(int x0, int y0, int x1, int y1,
- LINEDDAPROC lpProc, LPARAM lpData);
+ LINEDDAPROC lpProc, CDC *cdc);
extern BYTE GetRValue(COLORREF color);
extern BYTE GetGValue(COLORREF color);
Commit: 2254bfc0b76b7a34fb741587c619551c2aa34c6e
https://github.com/scummvm/scummvm/commit/2254bfc0b76b7a34fb741587c619551c2aa34c6e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:29+03:00
Commit Message:
BAGEL: LPINT -> int *, Fix spacing
Changed paths:
engines/bagel/hodjnpodj/hnplibs/sprite.cpp
engines/bagel/hodjnpodj/hnplibs/sprite.h
engines/bagel/hodjnpodj/mankala/bgenut.cpp
engines/bagel/hodjnpodj/mankala/bgenut.h
engines/bagel/hodjnpodj/mankala/mnkopt.cpp
engines/bagel/hodjnpodj/metagame/bgen/bgen.h
engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
engines/bagel/mfc/afxwin.h
engines/bagel/mfc/dc.cpp
engines/bagel/mfc/scrollbar.cpp
engines/bagel/mfc/winnt.h
engines/bagel/spacebar/baglib/dev_dlg.cpp
engines/bagel/spacebar/baglib/dossier_object.cpp
engines/bagel/spacebar/baglib/dossier_object.h
engines/bagel/spacebar/baglib/exam.cpp
engines/bagel/spacebar/baglib/exam.h
engines/bagel/spacebar/baglib/moo.h
engines/bagel/spacebar/baglib/object.cpp
engines/bagel/spacebar/baglib/object.h
engines/bagel/spacebar/baglib/rp_object.cpp
engines/bagel/spacebar/baglib/storage_dev_win.cpp
engines/bagel/spacebar/baglib/storage_dev_win.h
engines/bagel/spacebar/bibble_window.cpp
engines/bagel/spacebar/boflib/gui/movie.cpp
engines/bagel/spacebar/computer.h
engines/bagel/spacebar/dialogs/credits_dialog.cpp
engines/bagel/spacebar/slot_wnd.h
engines/bagel/spacebar/sraf_computer.cpp
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
index f4e7360fd84..69e6135e03f 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
@@ -2068,7 +2068,7 @@ BOOL CSprite::EraseSprite(CDC *pDC) {
* Parameters:
* CDC *pDC pointer to device context where the sprite gets painted
* CSprite * pTestSprite pointer to a lone test sprite for testing
- * CPoint * pPoint optional address of place to store estimated pixel overlap
+ * CPoint *pPoint optional address of place to store estimated pixel overlap
*
* Return Value:
* CSprite * pointer to sprite touched, or nullptr
@@ -2188,7 +2188,7 @@ CSprite *CSprite::Interception(CDC *pDC, CSprite * pTestSprite) {
* Parameters:
* CDC *pDC pointer to device context where the sprite gets painted
* CSprite * pSprite pointer to a lone test sprite
- * CPoint * pPoint optional address of place to store estimated pixel overlap
+ * CPoint *pPoint optional address of place to store estimated pixel overlap
*
* Return Value:
* BOOL success/failure condition
@@ -2198,7 +2198,7 @@ CSprite *CSprite::Interception(CDC *pDC, CSprite * pTestSprite) {
*
************************************************************************/
-BOOL CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint * pPoint) {
+BOOL CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
BOOL bSuccess = FALSE; // success/failure return status
CRect unionRect; // rectangle enclosing old and new sprite locations
CDC *cDC1 = nullptr, // device context for sprite 1
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.h b/engines/bagel/hodjnpodj/hnplibs/sprite.h
index c4d5a5c3a07..3b5b4eaf009 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.h
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.h
@@ -94,7 +94,7 @@ public:
return (Interception(newRect, m_pSpriteChain));
}
CSprite *Interception(CRect *newRect, CSprite * pSprite);
- BOOL TestInterception(CDC *pDC, CSprite * pSprite, CPoint * pPoint = nullptr);
+ BOOL TestInterception(CDC *pDC, CSprite * pSprite, CPoint *pPoint = nullptr);
BOOL GetVisible(void) {
return (m_bVisible);
@@ -276,7 +276,7 @@ private:
void ClearMask(void);
void ClearPalette(void);
- BOOL SpritesOverlap(CDC *pDC, CSprite *pSprite, CPoint * pPoint = nullptr);
+ BOOL SpritesOverlap(CDC *pDC, CSprite *pSprite, CPoint *pPoint = nullptr);
BOOL DoSpritePainting(CDC *pDC, CPoint cPoint);
BOOL DoOptimizedPainting(CDC *pDC, CRect *pDst);
diff --git a/engines/bagel/hodjnpodj/mankala/bgenut.cpp b/engines/bagel/hodjnpodj/mankala/bgenut.cpp
index f6db91d1b38..73e8980cc60 100644
--- a/engines/bagel/hodjnpodj/mankala/bgenut.cpp
+++ b/engines/bagel/hodjnpodj/mankala/bgenut.cpp
@@ -126,7 +126,7 @@ BOOL CGenUtil::NormalizeCRect(CRect& cRect)
//* CGenUtil::RandomSelection -- random selection of integer array
-void CGenUtil::RandomSelection(int * xpiArray, int iNum,
+void CGenUtil::RandomSelection(int *xpiArray, int iNum,
int iSize)
// xpiArray (input/output) -- array of integers to make selection from
// iNum -- number of numbers in array
diff --git a/engines/bagel/hodjnpodj/mankala/bgenut.h b/engines/bagel/hodjnpodj/mankala/bgenut.h
index 968091efa80..4109618d952 100644
--- a/engines/bagel/hodjnpodj/mankala/bgenut.h
+++ b/engines/bagel/hodjnpodj/mankala/bgenut.h
@@ -60,7 +60,7 @@ public:
BOOL PASCAL NormalizeCRect(CRect& cRect) ;
//- RandomSelection -- random selection of integer array
public:
- void RandomSelection(int * xpiArray, int iNum,
+ void RandomSelection(int *xpiArray, int iNum,
int iSize) ;
diff --git a/engines/bagel/hodjnpodj/mankala/mnkopt.cpp b/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
index 34c6a01eac8..3a5566c1b82 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
@@ -236,7 +236,7 @@ void CMnkUsr::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* xpScrollBar) {
xpScrollBar->GetScrollRange(&iValMin, &iValMax) ;
iValCur = xpScrollBar->GetScrollPos() ;
-// int * xpiVariable = (iId == IDC_USCRSHELL) ? &m_iUShells
+// int *xpiVariable = (iId == IDC_USCRSHELL) ? &m_iUShells
// : (iId == IDC_USCRSTRENGTH) ? &m_iUStrength : nullptr ;
switch (nSBCode) {
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
index 9138fa1e13a..d221e62c078 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
@@ -50,9 +50,7 @@ typedef char *XPSTR;
typedef char *LPSTR ;
typedef LPSTR *LPLPSTR ;
typedef int *XPINT ;
-typedef int *LPINT ;
typedef char *XPCHAR ;
-#define void void
typedef void *XPVOID ;
typedef void *LPVOID ;
//typedef unsigned int WORD ;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
index 3da0bf4ef3a..c1c571248b9 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
@@ -152,7 +152,7 @@ private:
// SB_HORZ (=0) or SB_VERT (=1)
int m_iId = 0; // control id
int m_iMin = 0, m_iMax = 0, m_iPosition = 0; // scroll bar values
- LPINT m_lpiVariable = 0; // ptr to integer variable
+ int *m_lpiVariable = 0; // ptr to integer variable
int m_iDocSize = 0; // document size (logical units)
int m_iDevWndSize = 0; // window size (device units)
int m_iWndSize = 0; // window size (logical units)
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
index 58eced68f45..9ac052ac954 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
@@ -618,7 +618,7 @@ private:
int EstimatePathDistance(CNode FAR * lpNode1,
CNode FAR * lpNode2) ;
//- FindShortestPath -- between two nodes
- LPINT FindShortestPath(CNode FAR * lpNode1,
+ int *FindShortestPath(CNode FAR * lpNode1,
CNode FAR * lpNode2) ;
public:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
index 068b853e5ef..30ff0df7db5 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
@@ -269,7 +269,7 @@ BOOL CGtlData::MoveCharToNode(CNode FAR *lpTargetNode)
int iK ; // loop variable
BOOL bDone = FALSE ; // flag: done with move
- LPINT lpiShortPath = nullptr ; // shortest path between nodes
+ int *lpiShortPath = nullptr ; // shortest path between nodes
gnFurlongs = 0;
@@ -855,7 +855,7 @@ int CGtlData::EstimatePathDistance(CNode FAR * lpNode1, CNode FAR * lpNode2)
}
//* CGtlData::FindShortestPath -- between two nodes
-LPINT CGtlData::FindShortestPath(CNode FAR * lpNode1,
+int *CGtlData::FindShortestPath(CNode FAR * lpNode1,
CNode FAR * lpNode2)
// lpNode1, lpNode2 -- nodes for which path is to be found
// returns: pointer to integer array, first element is length,
@@ -873,7 +873,7 @@ LPINT CGtlData::FindShortestPath(CNode FAR * lpNode1,
int iLink ; // , iTest ; // current link number
CNode FAR * lpNode ; // current node
CNode FAR * lpTestNode ; // current node
- LPINT lpiPath = nullptr ; // pointer to result path array
+ int *lpiPath = nullptr ; // pointer to result path array
BOOL bClipBounds = TRUE;
CPoint cStartPoint, cTargetPoint, cThisPoint;
CRect cBoundingRect;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
index c0fc2c4ced6..bdabdf9b778 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
@@ -112,7 +112,7 @@ void CGtlView::OnUpdate(CView *xpSender, LPARAM lHint, CObject *xpHint)
// dbgtrc = TRUE ; // debugging code
JXENTER(CGtlView::OnUpdate) ;
- CGtlHint * xpcGtlHint = (CGtlHint *)xpHint ;
+ CGtlHint *xpcGtlHint = (CGtlHint *)xpHint ;
//BOOL bDone = FALSE ; // TRUE when hint is fully identified
TRACE("Enter OnUpdate\n");
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index e5768e86531..c527f6a74c4 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -766,25 +766,25 @@ public:
int setBkMode(int nBkMode);
COLORREF setTextColor(COLORREF crColor);
BOOL textOut(int x, int y, LPCSTR lpszString, int nCount,
- int nTabPositions = 0, const LPINT lpnTabStopPositions = nullptr,
+ int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
int nTabOrigin = 0, CSize *size = nullptr);
BOOL textOut(int x, int y, const CString &str,
- int nTabPositions = 0, const LPINT lpnTabStopPositions = nullptr,
+ int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
int nTabOrigin = 0, CSize *size = nullptr);
BOOL extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- LPCSTR lpszString, UINT nCount, LPINT lpDxWidths);
+ LPCSTR lpszString, UINT nCount, int *lpDxWidths);
BOOL extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- const CString &str, LPINT lpDxWidths);
+ const CString &str, int *lpDxWidths);
CSize tabbedTextOut(int x, int y, LPCSTR lpszString, int nCount,
- int nTabPositions, const LPINT lpnTabStopPositions, int nTabOrigin);
+ int nTabPositions, const int *lpnTabStopPositions, int nTabOrigin);
CSize tabbedTextOut(int x, int y, const CString &str,
- int nTabPositions, const LPINT lpnTabStopPositions, int nTabOrigin);
+ int nTabPositions, const int *lpnTabStopPositions, int nTabOrigin);
int drawText(LPCSTR lpszString, int nCount, LPRECT lpRect, UINT nFormat,
- int nTabPositions = 0, const LPINT lpnTabStopPositions = nullptr,
+ int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
int nTabOrigin = 0, CSize *size = nullptr);
int drawText(const CString &str, LPRECT lpRect, UINT nFormat,
- int nTabPositions = 0, const LPINT lpnTabStopPositions = nullptr,
+ int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
int nTabOrigin = 0, CSize *size = nullptr);
CSize getTextExtent(LPCSTR lpszString, int nCount) const;
@@ -792,13 +792,13 @@ public:
CSize getOutputTextExtent(LPCSTR lpszString, int nCount) const;
CSize getOutputTextExtent(const CString &str) const;
CSize getTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
CSize getTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
CSize getOutputTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
CSize getOutputTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
BOOL grayString(CBrush *pBrush,
BOOL(CALLBACK *lpfnOutput)(HDC, LPARAM, int), LPARAM lpData,
int nCount, int x, int y, int nWidth, int nHeight);
@@ -921,13 +921,13 @@ public:
virtual BOOL TextOut(int x, int y, LPCSTR lpszString, int nCount);
BOOL TextOut(int x, int y, const CString &str);
virtual BOOL ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- LPCSTR lpszString, UINT nCount, LPINT lpDxWidths);
+ LPCSTR lpszString, UINT nCount, int *lpDxWidths);
BOOL ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- const CString &str, LPINT lpDxWidths);
+ const CString &str, int *lpDxWidths);
virtual CSize TabbedTextOut(int x, int y, LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions, int nTabOrigin);
+ int nTabPositions, int *lpnTabStopPositions, int nTabOrigin);
CSize TabbedTextOut(int x, int y, const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions, int nTabOrigin);
+ int nTabPositions, int *lpnTabStopPositions, int nTabOrigin);
int DrawText(LPCSTR lpszString, int nCount,
LPRECT lpRect, UINT nFormat);
int DrawText(const CString &str, LPRECT lpRect, UINT nFormat);
@@ -938,13 +938,13 @@ public:
CSize GetOutputTextExtent(LPCSTR lpszString, int nCount) const;
CSize GetOutputTextExtent(const CString &str) const;
CSize GetTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
CSize GetTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
CSize GetOutputTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
CSize GetOutputTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const;
+ int nTabPositions, int *lpnTabStopPositions) const;
virtual BOOL GrayString(CBrush *pBrush,
BOOL(CALLBACK *lpfnOutput)(HDC, LPARAM, int), LPARAM lpData,
int nCount, int x, int y, int nWidth, int nHeight);
@@ -1455,8 +1455,8 @@ public:
virtual int SetScrollPos(int nPos, BOOL bRedraw = true) {
return 0;
}
- virtual void GetScrollRange(LPINT lpMinPos, LPINT lpMaxPos) const {}
- void GetScrollRange(int /*nBar*/, LPINT lpMinPos, LPINT lpMaxPos) const {
+ virtual void GetScrollRange(int *lpMinPos, int *lpMaxPos) const {}
+ void GetScrollRange(int /*nBar*/, int *lpMinPos, int *lpMaxPos) const {
GetScrollRange(lpMinPos, lpMaxPos);
}
virtual void SetScrollRange(int nMinPos, int nMaxPos, BOOL bRedraw) {}
@@ -1735,7 +1735,7 @@ public:
int GetScrollPos() const override;
int SetScrollPos(int nPos, BOOL bRedraw = true) override;
- void GetScrollRange(LPINT lpMinPos, LPINT lpMaxPos) const override;
+ void GetScrollRange(int *lpMinPos, int *lpMaxPos) const override;
void SetScrollRange(int nMinPos, int nMaxPos, BOOL bRedraw) override;
void ShowScrollBar(BOOL bShow);
BOOL SetScrollInfo(LPSCROLLINFO lpScrollInfo, BOOL bRedraw);
diff --git a/engines/bagel/mfc/dc.cpp b/engines/bagel/mfc/dc.cpp
index 1e5e3f1969f..96c2fed28a9 100644
--- a/engines/bagel/mfc/dc.cpp
+++ b/engines/bagel/mfc/dc.cpp
@@ -562,23 +562,23 @@ BOOL CDC::TextOut(int x, int y, const CString &str) {
}
BOOL CDC::ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- LPCSTR lpszString, UINT nCount, LPINT lpDxWidths) {
+ LPCSTR lpszString, UINT nCount, int *lpDxWidths) {
return impl()->extTextOut(x, y, nOptions, lpRect, lpszString, nCount, lpDxWidths);
}
BOOL CDC::ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- const CString &str, LPINT lpDxWidths) {
+ const CString &str, int *lpDxWidths) {
return impl()->extTextOut(x, y, nOptions, lpRect, str, lpDxWidths);
}
CSize CDC::TabbedTextOut(int x, int y, LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions, int nTabOrigin) {
+ int nTabPositions, int *lpnTabStopPositions, int nTabOrigin) {
return impl()->tabbedTextOut(x, y, lpszString, nCount,
nTabPositions, lpnTabStopPositions, nTabOrigin);
}
CSize CDC::TabbedTextOut(int x, int y, const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions, int nTabOrigin) {
+ int nTabPositions, int *lpnTabStopPositions, int nTabOrigin) {
return impl()->tabbedTextOut(x, y, str, nTabPositions,
lpnTabStopPositions, nTabOrigin);
}
@@ -609,25 +609,25 @@ CSize CDC::GetOutputTextExtent(const CString &str) const {
}
CSize CDC::GetTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
return impl()->getTabbedTextExtent(lpszString, nCount,
nTabPositions, lpnTabStopPositions);
}
CSize CDC::GetTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
return impl()->getTabbedTextExtent(str, nTabPositions,
lpnTabStopPositions);
}
CSize CDC::GetOutputTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
return impl()->getOutputTabbedTextExtent(lpszString, nCount,
nTabPositions, lpnTabStopPositions);
}
CSize CDC::GetOutputTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
return impl()->getOutputTabbedTextExtent(str,
nTabPositions, lpnTabStopPositions);
}
@@ -1078,7 +1078,7 @@ COLORREF CDC::Impl::setTextColor(COLORREF crColor) {
}
BOOL CDC::Impl::textOut(int x, int y, LPCSTR lpszString, int nCount,
- int nTabPositions, const LPINT lpnTabStopPositions,
+ int nTabPositions, const int *lpnTabStopPositions,
int nTabOrigin, CSize *size) {
Gfx::Surface *dest = getSurface();
RECT r;
@@ -1111,7 +1111,7 @@ BOOL CDC::Impl::textOut(int x, int y, LPCSTR lpszString, int nCount,
}
BOOL CDC::Impl::textOut(int x, int y, const CString &str,
- int nTabPositions, const LPINT lpnTabStopPositions,
+ int nTabPositions, const int *lpnTabStopPositions,
int nTabOrigin, CSize *size) {
Gfx::Surface *dest = getSurface();
RECT r;
@@ -1127,17 +1127,17 @@ BOOL CDC::Impl::textOut(int x, int y, const CString &str,
}
BOOL CDC::Impl::extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- LPCSTR lpszString, UINT nCount, LPINT lpDxWidths) {
+ LPCSTR lpszString, UINT nCount, int *lpDxWidths) {
error("TODO: extTextOut");
}
BOOL CDC::Impl::extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
- const CString &str, LPINT lpDxWidths) {
+ const CString &str, int *lpDxWidths) {
error("TODO: extTextOut");
}
CSize CDC::Impl::tabbedTextOut(int x, int y, LPCSTR lpszString, int nCount,
- int nTabPositions, const LPINT lpnTabStopPositions, int nTabOrigin) {
+ int nTabPositions, const int *lpnTabStopPositions, int nTabOrigin) {
CString str(lpszString, nCount);
CSize size;
@@ -1148,7 +1148,7 @@ CSize CDC::Impl::tabbedTextOut(int x, int y, LPCSTR lpszString, int nCount,
}
CSize CDC::Impl::tabbedTextOut(int x, int y, const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions, int nTabOrigin) {
+ int nTabPositions, int *lpnTabStopPositions, int nTabOrigin) {
CSize size;
textOut(x, y, str, nTabPositions, lpnTabStopPositions, nTabOrigin, &size);
return size;
@@ -1156,7 +1156,7 @@ CSize CDC::Impl::tabbedTextOut(int x, int y, const CString &str,
int CDC::Impl::drawText(LPCSTR lpszString, int nCount,
LPRECT lpRect, UINT nFormat, int nTabPositions,
- const LPINT lpnTabStopPositions, int nTabOrigin,
+ const int *lpnTabStopPositions, int nTabOrigin,
CSize *size) {
return drawText(CString(lpszString, nCount),
lpRect, nFormat, nTabPositions,
@@ -1164,7 +1164,7 @@ int CDC::Impl::drawText(LPCSTR lpszString, int nCount,
}
int CDC::Impl::drawText(const CString &str, LPRECT lpRect, UINT nFormat,
- int nTabPositions, const LPINT lpnTabStopPositions,
+ int nTabPositions, const int *lpnTabStopPositions,
int nTabOrigin, CSize *size) {
Graphics::Font *font = *(CFont::Impl *)_font;
Gfx::Surface *dest = getSurface();
@@ -1215,23 +1215,23 @@ CSize CDC::Impl::getOutputTextExtent(const CString &str) const {
}
CSize CDC::Impl::getTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
// TODO: Proper implementation that handles tabs, etc.
return getTextExtent(lpszString, nCount);
}
CSize CDC::Impl::getTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
error("TODO");
}
CSize CDC::Impl::getOutputTabbedTextExtent(LPCSTR lpszString, int nCount,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
error("TODO");
}
CSize CDC::Impl::getOutputTabbedTextExtent(const CString &str,
- int nTabPositions, LPINT lpnTabStopPositions) const {
+ int nTabPositions, int *lpnTabStopPositions) const {
error("TODO");
}
diff --git a/engines/bagel/mfc/scrollbar.cpp b/engines/bagel/mfc/scrollbar.cpp
index eee4c027333..21d8ad4f896 100644
--- a/engines/bagel/mfc/scrollbar.cpp
+++ b/engines/bagel/mfc/scrollbar.cpp
@@ -50,7 +50,7 @@ int CScrollBar::SetScrollPos(int nPos, BOOL bRedraw) {
return oldPos;
}
-void CScrollBar::GetScrollRange(LPINT lpMinPos, LPINT lpMaxPos) const {
+void CScrollBar::GetScrollRange(int *lpMinPos, int *lpMaxPos) const {
if (lpMinPos)
*lpMinPos = _minValue;
if (lpMaxPos)
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index cc11236561c..19e2c838ee8 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -35,13 +35,6 @@ typedef uint16 USHORT;
typedef unsigned long ULONG;
typedef int64 LONGLONG;
typedef uint64 ULONGLONG;
-typedef float *PFLOAT;
-typedef BOOL *PBOOL;
-typedef BOOL *LPBOOL;
-typedef BYTE *PBYTE;
-typedef BYTE *LPBYTE;
-typedef int *PINT;
-typedef int *LPINT;
typedef WORD *PWORD;
typedef WORD *LPWORD;
typedef long *LPLONG;
diff --git a/engines/bagel/spacebar/baglib/dev_dlg.cpp b/engines/bagel/spacebar/baglib/dev_dlg.cpp
index 5acc0014c8a..d7fccc8b416 100644
--- a/engines/bagel/spacebar/baglib/dev_dlg.cpp
+++ b/engines/bagel/spacebar/baglib/dev_dlg.cpp
@@ -85,10 +85,10 @@ ErrorCode CDevDlg::createWindow(const char *bmp, CBofWindow *wnd, CBofPalette *p
return _errCode;
}
-void CDevDlg::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) {
+void CDevDlg::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void *) {
}
-void CDevDlg::onMouseMove(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) {
+void CDevDlg::onMouseMove(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void *) {
}
void CDevDlg::onClose() {
diff --git a/engines/bagel/spacebar/baglib/dossier_object.cpp b/engines/bagel/spacebar/baglib/dossier_object.cpp
index 44410f0de39..734f77254fa 100644
--- a/engines/bagel/spacebar/baglib/dossier_object.cpp
+++ b/engines/bagel/spacebar/baglib/dossier_object.cpp
@@ -278,7 +278,7 @@ CBofRect CBagDossierObject::getRect() {
return rect;
}
-void CBagDossierObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * /*pInfo*/) {
+void CBagDossierObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*pInfo*/) {
// If this is an inactive object (such as "plus residue too old" or "negative")
// then ignore the mousedown.
diff --git a/engines/bagel/spacebar/baglib/dossier_object.h b/engines/bagel/spacebar/baglib/dossier_object.h
index 80982e55099..1bc41b34df3 100644
--- a/engines/bagel/spacebar/baglib/dossier_object.h
+++ b/engines/bagel/spacebar/baglib/dossier_object.h
@@ -59,7 +59,7 @@ public:
ErrorCode update(CBofBitmap *, CBofPoint, CBofRect * = nullptr, int = -1) override;
- void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr) override; // run menu if available
+ void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr) override; // run menu if available
CBofRect getRect() override;
diff --git a/engines/bagel/spacebar/baglib/exam.cpp b/engines/bagel/spacebar/baglib/exam.cpp
index f8e704a6cc9..0383cd9c088 100644
--- a/engines/bagel/spacebar/baglib/exam.cpp
+++ b/engines/bagel/spacebar/baglib/exam.cpp
@@ -86,7 +86,7 @@ bool CBagExam::markBegEnd() {
return true;
}
-void CBagExam::onButtonUp(uint32 /*n flags, unused */, CBofPoint * /* point, unused */) {
+void CBagExam::onButtonUp(uint32 /*n flags, unused */, CBofPoint */* point, unused */) {
// Clean up and exit
_bLoop = false;
diff --git a/engines/bagel/spacebar/baglib/exam.h b/engines/bagel/spacebar/baglib/exam.h
index 35aa7a347ed..17d1dbd6f64 100644
--- a/engines/bagel/spacebar/baglib/exam.h
+++ b/engines/bagel/spacebar/baglib/exam.h
@@ -64,7 +64,7 @@ public:
* Resize the examination window
*/
void onReSize(CBofSize *size) override;
- void onButtonUp(uint32 /* flags */, CBofPoint * /* point */) override;
+ void onButtonUp(uint32 /* flags */, CBofPoint */* point */) override;
/**
* Set the rectangles that determine "hot" mouse locations
diff --git a/engines/bagel/spacebar/baglib/moo.h b/engines/bagel/spacebar/baglib/moo.h
index eb65ebeaa65..f152b334afe 100644
--- a/engines/bagel/spacebar/baglib/moo.h
+++ b/engines/bagel/spacebar/baglib/moo.h
@@ -45,9 +45,9 @@ public:
ErrorCode update(CBofBitmap *pBmp, CBofPoint pt, CBofRect *pSrcRect = nullptr, int nMaskColor = -1) override;
// Grab the button event of the bagbmobj and send them to the cbagsdev
- void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * /*info*/) override {
+ void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*info*/) override {
}
- void onLButtonDown(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr) override {
+ void onLButtonDown(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr) override {
}
// For public access to our movie object
diff --git a/engines/bagel/spacebar/baglib/object.cpp b/engines/bagel/spacebar/baglib/object.cpp
index 5dafd4fc63d..adcd17fa964 100644
--- a/engines/bagel/spacebar/baglib/object.cpp
+++ b/engines/bagel/spacebar/baglib/object.cpp
@@ -385,7 +385,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) {
return parseCode;
}
-void CBagObject::onLButtonUp(uint32 nFlags, CBofPoint * /*xPoint*/, void *) {
+void CBagObject::onLButtonUp(uint32 nFlags, CBofPoint */*xPoint*/, void *) {
if (getMenuPtr()) {
CBofPoint pt = getMousePos();
diff --git a/engines/bagel/spacebar/baglib/object.h b/engines/bagel/spacebar/baglib/object.h
index 888a2bd5d47..c9b07633eaa 100644
--- a/engines/bagel/spacebar/baglib/object.h
+++ b/engines/bagel/spacebar/baglib/object.h
@@ -347,9 +347,9 @@ public:
virtual ErrorCode update(CBofBitmap *pBmp, CBofPoint pt, CBofRect *pSrcRect = nullptr, int /*nMaskColor*/ = -1);
virtual bool onObjInteraction(CBagObject * /*pObj*/, CBagStorageDev * /*pSDev*/);
- virtual void onLButtonDown(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr) {
+ virtual void onLButtonDown(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr) {
}
- virtual void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr); // run menu if available
+ virtual void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr); // run menu if available
virtual bool onMouseMove(uint32 /*nFlags*/, CBofPoint /*xPoint*/, void * = nullptr);
virtual bool onMouseOver(uint32 /*nFlags*/, CBofPoint /*xPoint*/, void * = nullptr);
};
diff --git a/engines/bagel/spacebar/baglib/rp_object.cpp b/engines/bagel/spacebar/baglib/rp_object.cpp
index b3b6672e3f2..afebefd508e 100644
--- a/engines/bagel/spacebar/baglib/rp_object.cpp
+++ b/engines/bagel/spacebar/baglib/rp_object.cpp
@@ -951,7 +951,7 @@ void CBagRPObject::deactivateResiduePrintedReview() {
}
}
-void CBagRPObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * /*pv*/) {
+void CBagRPObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*pv*/) {
// Deactivate everything in the rp list
hideResiduePrintedReview();
diff --git a/engines/bagel/spacebar/baglib/storage_dev_win.cpp b/engines/bagel/spacebar/baglib/storage_dev_win.cpp
index 2b52210d2ad..2cc15767879 100644
--- a/engines/bagel/spacebar/baglib/storage_dev_win.cpp
+++ b/engines/bagel/spacebar/baglib/storage_dev_win.cpp
@@ -451,7 +451,7 @@ ErrorCode CBagStorageDev::paintStorageDevice(CBofWindow * /*pWnd*/, CBofBitmap *
return ERR_NONE;
}
-ErrorCode CBagStorageDev::onLActiveObject(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * /*vpInfo*/) {
+ErrorCode CBagStorageDev::onLActiveObject(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*vpInfo*/) {
return ERR_NONE;
}
@@ -469,7 +469,7 @@ void CBagStorageDev::onMouseMove(uint32 nFlags, CBofPoint *xPoint, void *vpInfo)
}
-ErrorCode CBagStorageDev::onMouseOver(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void *) {
+ErrorCode CBagStorageDev::onMouseOver(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void *) {
return ERR_NONE;
}
diff --git a/engines/bagel/spacebar/baglib/storage_dev_win.h b/engines/bagel/spacebar/baglib/storage_dev_win.h
index f276fcd6ebc..4f2d446207d 100644
--- a/engines/bagel/spacebar/baglib/storage_dev_win.h
+++ b/engines/bagel/spacebar/baglib/storage_dev_win.h
@@ -276,7 +276,7 @@ public:
return ERR_NONE;
}
- virtual ErrorCode onLActiveObject(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr);
+ virtual ErrorCode onLActiveObject(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr);
MouseActivity getLActivity() const {
return _nCurrMouseActivity;
@@ -323,10 +323,10 @@ public:
virtual ErrorCode loadFile(const CBofString &sWldName);
virtual ErrorCode loadFileFromStream(CBagIfstream &fpInput, const CBofString &sWldName, bool bAttach = true);
- virtual void onMouseMove(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr);
- virtual ErrorCode onMouseOver(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr);
- virtual void onLButtonDown(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr);
- virtual void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void * = nullptr);
+ virtual void onMouseMove(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr);
+ virtual ErrorCode onMouseOver(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr);
+ virtual void onLButtonDown(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr);
+ virtual void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr);
virtual ErrorCode onCursorUpdate(int /*nCurrObj*/) {
return ERR_NONE;
diff --git a/engines/bagel/spacebar/bibble_window.cpp b/engines/bagel/spacebar/bibble_window.cpp
index 02d8fe1f91c..7558d6f36ff 100644
--- a/engines/bagel/spacebar/bibble_window.cpp
+++ b/engines/bagel/spacebar/bibble_window.cpp
@@ -1040,7 +1040,7 @@ void CBibbleWindow::onLButtonDblClk(uint32 /*nFlags*/, CBofPoint *pPoint) {
}
-void CBibbleWindow::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) {
+void CBibbleWindow::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void *) {
assert(isValidObject(this));
}
diff --git a/engines/bagel/spacebar/boflib/gui/movie.cpp b/engines/bagel/spacebar/boflib/gui/movie.cpp
index c0272c7ee25..317fdef6ce6 100644
--- a/engines/bagel/spacebar/boflib/gui/movie.cpp
+++ b/engines/bagel/spacebar/boflib/gui/movie.cpp
@@ -356,7 +356,7 @@ bool CBofMovie::centerRect() {
return true;
}
-void CBofMovie::onButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/) {
+void CBofMovie::onButtonUp(uint32 /*nFlags*/, CBofPoint */*pPoint*/) {
}
diff --git a/engines/bagel/spacebar/computer.h b/engines/bagel/spacebar/computer.h
index ca93f7164f1..20f8065864d 100644
--- a/engines/bagel/spacebar/computer.h
+++ b/engines/bagel/spacebar/computer.h
@@ -137,8 +137,8 @@ public:
void onPaint(CBofRect *pRect);
void eraseBackdrop();
- void onLButtonDown(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) {}
- void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) {}
+ void onLButtonDown(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void * = nullptr) {}
+ void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void * = nullptr) {}
void onMouseMove(uint32 nFlags, CBofPoint *, void * = nullptr);
};
diff --git a/engines/bagel/spacebar/dialogs/credits_dialog.cpp b/engines/bagel/spacebar/dialogs/credits_dialog.cpp
index 52d153c99c8..15ee3175aab 100644
--- a/engines/bagel/spacebar/dialogs/credits_dialog.cpp
+++ b/engines/bagel/spacebar/dialogs/credits_dialog.cpp
@@ -210,7 +210,7 @@ void CBagCreditsDialog::onPaint(CBofRect *pRect) {
validateAnscestors();
}
-void CBagCreditsDialog::onLButtonDown(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void *) {
+void CBagCreditsDialog::onLButtonDown(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void *) {
assert(isValidObject(this));
nextScreen();
diff --git a/engines/bagel/spacebar/slot_wnd.h b/engines/bagel/spacebar/slot_wnd.h
index 80251d4c818..c8131471e80 100644
--- a/engines/bagel/spacebar/slot_wnd.h
+++ b/engines/bagel/spacebar/slot_wnd.h
@@ -127,7 +127,7 @@ public:
void onPaint(CBofRect *pRect);
void onTimer(uint32 nTimerId);
void onLButtonDown(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
- void onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*pPoint*/, void * = nullptr) { }
+ void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*pPoint*/, void * = nullptr) { }
};
diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 09a6e3a9099..98751c2f0dd 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -995,10 +995,10 @@ ErrorCode SrafComputer::detach() {
}
-void SrafComputer::onLButtonUp(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void *) {
+void SrafComputer::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void *) {
}
-void SrafComputer::onLButtonDown(uint32 /*nFlags*/, CBofPoint * /*xPoint*/, void *) {
+void SrafComputer::onLButtonDown(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void *) {
}
void SrafComputer::onKeyHit(uint32 lKey, uint32 nRepCount) {
Commit: 49688b9972d63ba2ce9816bc2f9183912cce0be3
https://github.com/scummvm/scummvm/commit/49688b9972d63ba2ce9816bc2f9183912cce0be3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:31+03:00
Commit Message:
BAGEL: LPVOID -> void *
Changed paths:
engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
engines/bagel/hodjnpodj/mankala/mnklog.cpp
engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
engines/bagel/hodjnpodj/metagame/bgen/bgen.h
engines/bagel/mfc/afxwin.h
engines/bagel/mfc/bitmap.cpp
engines/bagel/mfc/gfx/dialog_template.h
engines/bagel/mfc/global_functions.cpp
engines/bagel/mfc/global_functions.h
engines/bagel/mfc/palette.cpp
engines/bagel/mfc/win_app.cpp
engines/bagel/mfc/win_hand.h
engines/bagel/mfc/wingdi.cpp
engines/bagel/mfc/wingdi.h
engines/bagel/mfc/winnt.h
engines/bagel/mfc/wnd.cpp
engines/bagel/spacebar/baglib/dossier_object.cpp
engines/bagel/spacebar/baglib/exam.cpp
engines/bagel/spacebar/baglib/exam.h
engines/bagel/spacebar/baglib/menu_dlg.cpp
engines/bagel/spacebar/baglib/moo.h
engines/bagel/spacebar/baglib/rp_object.cpp
engines/bagel/spacebar/baglib/storage_dev_win.cpp
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
index 8bcfd748fb9..2ef4dff9ccf 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
@@ -324,7 +324,7 @@ CBitmap *ConvertDIB(CDC *pDC, HDIB hDIB, CPalette *pPal) {
HBITMAP DIBtoBitmap(HDC hDC, HPALETTE hPalette, HDIB hDib) {
BITMAPINFO *info = getDIBInfo(hDib);
- LPVOID lpbihBits = FindDIBBits(hDib);
+ void *lpbihBits = FindDIBBits(hDib);
HBITMAP hBitmap = CreateDIBitmap(hDC,
&info->bmiHeader,
CBM_INIT,
diff --git a/engines/bagel/hodjnpodj/mankala/mnklog.cpp b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
index 4cb77a87bec..bb28e26c7ab 100644
--- a/engines/bagel/hodjnpodj/mankala/mnklog.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
@@ -1154,9 +1154,9 @@ BOOL CMnk::DefensiveStaticEvaluation(CMove * xpcMove)
maxTotalBenefit = 0;
bNearClustered = FALSE;
- memset((LPVOID)iEvasionNecessary, 0x0, NUMPITS * sizeof(int));
- memset((LPVOID)iPitUnderThreat, -1, NUMPITS * sizeof(int));
- memset((LPVOID)iOtherOffensivePit, -1, NUMPITS * sizeof(int));
+ memset((void *)iEvasionNecessary, 0x0, NUMPITS * sizeof(int));
+ memset((void *)iPitUnderThreat, -1, NUMPITS * sizeof(int));
+ memset((void *)iOtherOffensivePit, -1, NUMPITS * sizeof(int));
/*
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
index 047cf6fc6aa..09a17b089d4 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
@@ -92,7 +92,7 @@ BOOL CBdbgMgr::GetDebugString(LPCSTR lpszOption, LPSTR lpszTarget, int iTargetSi
}
//* CBdbgMgr::TraceConstructor -- trace object constructor, if optioned
-BOOL CBdbgMgr::TraceConstructor(LPCSTR lpszName, LPVOID lpLoc)
+BOOL CBdbgMgr::TraceConstructor(LPCSTR lpszName, void *lpLoc)
// lpszName -- name of object
// lpLoc -- location of object
// returns: TRUE if error, FALSE otherwise
@@ -101,7 +101,7 @@ BOOL CBdbgMgr::TraceConstructor(LPCSTR lpszName, LPVOID lpLoc)
}
//* CBdbgMgr::TraceDestructor -- trace object destructor, if optioned
-BOOL CBdbgMgr::TraceDestructor(LPCSTR lpszName, LPVOID lpLoc)
+BOOL CBdbgMgr::TraceDestructor(LPCSTR lpszName, void *lpLoc)
// lpszName -- name of object
// lpLoc -- location of object
// returns: TRUE if error, FALSE otherwise
@@ -119,7 +119,7 @@ BOOL CBdbgMgr::DebugMessageBox(LPCSTR lpszPrompt, UINT nType, UINT nIDPrompt)
}
//* CBdbgMgr::AddTraceObject -- add object to trace list
-BOOL CBdbgMgr::AddTraceObject(LPCSTR lpszName, LPVOID lpPtr)
+BOOL CBdbgMgr::AddTraceObject(LPCSTR lpszName, void *lpPtr)
// lpszName -- name of object
// lpPtr -- pointer to object
// returns: TRUE if error, FALSE otherwise
@@ -128,7 +128,7 @@ BOOL CBdbgMgr::AddTraceObject(LPCSTR lpszName, LPVOID lpPtr)
}
//* CBdbgMgr::TestTraceObject -- test
-BOOL CBdbgMgr::TestTraceObject(LPCSTR lpszName, LPVOID lpPtr, BOOL bMissing)
+BOOL CBdbgMgr::TestTraceObject(LPCSTR lpszName, void *lpPtr, BOOL bMissing)
// lpszName -- name of object
// lpPtr -- pointer to object
// bMissing -- if TRUE, then correct if pointer is missing;
@@ -140,7 +140,7 @@ BOOL CBdbgMgr::TestTraceObject(LPCSTR lpszName, LPVOID lpPtr, BOOL bMissing)
}
//* CBdbgMgr::RemoveTraceObject -- add object to trace list
-BOOL CBdbgMgr::RemoveTraceObject(LPCSTR lpszName, LPVOID lpPtr)
+BOOL CBdbgMgr::RemoveTraceObject(LPCSTR lpszName, void *lpPtr)
// lpszName -- name of object
// lpPtr -- pointer to object
// returns: TRUE if error, FALSE otherwise
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
index c8eb54c775b..77cbd496114 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
@@ -51,7 +51,7 @@ public:
BOOL m_bVerifyDc ; // verify device context is ok
int m_iDebugValues[100] ; // misc debugging values
int m_iTraceObjectCount ; // max # objects to trace
- LPVOID *m_lpTraceObjects ; // trace object array
+ void **m_lpTraceObjects ; // trace object array
int m_iTraceObjectCurrent ; // # of array elements in use
int m_iErrorCount ; // number of errors encountered
char m_cEndData ;
@@ -70,14 +70,14 @@ public:
BOOL GetDebugString(LPCSTR lpszOption,
LPSTR lpszTarget, int iTargetSize,
LPCSTR lpszDefault PDFT(nullptr)) ;
- BOOL TraceConstructor(LPCSTR lpszName, LPVOID lpLoc) ;
- BOOL TraceDestructor(LPCSTR lpszName, LPVOID lpLoc) ;
+ BOOL TraceConstructor(LPCSTR lpszName, void *lpLoc) ;
+ BOOL TraceDestructor(LPCSTR lpszName, void *lpLoc) ;
BOOL DebugMessageBox(LPCSTR lpszPrompt,
UINT nType, UINT nIDPrompt) ;
- BOOL AddTraceObject(LPCSTR lpszName, LPVOID lpPtr) ;
- BOOL TestTraceObject(LPCSTR lpszName, LPVOID lpPtr,
+ BOOL AddTraceObject(LPCSTR lpszName, void *lpPtr) ;
+ BOOL TestTraceObject(LPCSTR lpszName, void *lpPtr,
BOOL bMissing PDFT(FALSE)) ;
- BOOL RemoveTraceObject(LPCSTR lpszName, LPVOID lpPtr) ;
+ BOOL RemoveTraceObject(LPCSTR lpszName, void *lpPtr) ;
BOOL ReportTraceObjects(void) ;
STATIC BOOL OutputWithTime(LPCSTR lpszPattern) ;
STATIC BOOL OutputWithWordWrap(LPCSTR lpStr1,
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
index d221e62c078..608a8627b7b 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
@@ -41,9 +41,6 @@ namespace Metagame {
#define DIMENSION(a) (sizeof(a) / sizeof(a[0]))
#define UPPERBOUND(a) (DIMENSION(a) - 1)
-// #define HIWORD(lParm) (*((unsigned int huge *)&lParm + 1) )
-// #define LOWORD(lParm) ((unsigned int)lParm )
-
typedef int BOOL ;
typedef char *XPSTR ;
typedef char *XPSTR;
@@ -52,10 +49,6 @@ typedef LPSTR *LPLPSTR ;
typedef int *XPINT ;
typedef char *XPCHAR ;
typedef void *XPVOID ;
-typedef void *LPVOID ;
-//typedef unsigned int WORD ;
-//typedef WORD * XPWORD ;
-//typedef WORD * LPWORD ;
typedef unsigned long ULONG ;
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index c527f6a74c4..74de7a45266 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -615,8 +615,8 @@ public:
BOOL CreateCompatibleBitmap(CDC *pDC, int nWidth, int nHeight);
BOOL CreateBitmap(int nWidth, int nHeight, UINT nPlanes,
UINT nBitcount, const void *lpBits);
- int GetObject(int nCount, LPVOID lpObject) const;
- long GetBitmapBits(long dwCount, LPVOID lpBits) const;
+ int GetObject(int nCount, void *lpObject) const;
+ long GetBitmapBits(long dwCount, void *lpBits) const;
BOOL GetBitmap(BITMAP *pBitMap) const {
return GetObject(sizeof(BITMAP), pBitMap);
}
@@ -642,7 +642,7 @@ public:
}
BOOL CreatePalette(LPLOGPALETTE lpLogPalette);
- int GetObject(int nCount, LPVOID lpObject) const;
+ int GetObject(int nCount, void *lpObject) const;
UINT GetEntryCount() const;
UINT GetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
LPPALETTEENTRY lpPaletteColors) const;
@@ -1066,7 +1066,7 @@ public:
typedef struct tagCREATESTRUCTA {
- LPVOID lpCreateParams = nullptr;
+ void * lpCreateParams = nullptr;
HINSTANCE hInstance = 0;
HMENU hMenu = 0;
HWND hwndParent = 0;
@@ -1350,11 +1350,11 @@ public:
BOOL CreateEx(uint32 dwExStyle, LPCTSTR lpszClassName,
LPCTSTR lpszWindowName, uint32 dwStyle,
int x, int y, int nWidth, int nHeight,
- HWND hWndParent, LPARAM nIDorHMenu, LPVOID lpParam = nullptr);
+ HWND hWndParent, LPARAM nIDorHMenu, void *lpParam = nullptr);
BOOL CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
LPCSTR lpszWindowName, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd, UINT nID,
- LPVOID lpParam = nullptr);
+ void *lpParam = nullptr);
/**
* Gets a list of CWnd pointers for parent controls
@@ -2012,7 +2012,7 @@ public:
HRSRC findResource(LPCSTR lpName, LPCSTR lpType);
size_t sizeofResource(HRSRC hResInfo);
HGLOBAL loadResource(HRSRC hResInfo);
- LPVOID lockResource(HGLOBAL hResData);
+ void *lockResource(HGLOBAL hResData);
void unlockResource(HGLOBAL hResData);
BOOL freeResource(HGLOBAL hResData);
const Libs::Resources &getResources() const {
diff --git a/engines/bagel/mfc/bitmap.cpp b/engines/bagel/mfc/bitmap.cpp
index a250153b9ff..8f8ba95ee4b 100644
--- a/engines/bagel/mfc/bitmap.cpp
+++ b/engines/bagel/mfc/bitmap.cpp
@@ -83,7 +83,7 @@ BOOL CBitmap::CreateBitmap(int nWidth, int nHeight, UINT nPlanes,
return true;
}
-int CBitmap::GetObject(int nCount, LPVOID lpObject) const {
+int CBitmap::GetObject(int nCount, void *lpObject) const {
CBitmap::Impl *src = static_cast<CBitmap::Impl *>(m_hObject);
BITMAP *dest = (BITMAP *)lpObject;
assert(src && nCount == sizeof(BITMAP));
@@ -99,7 +99,7 @@ int CBitmap::GetObject(int nCount, LPVOID lpObject) const {
return sizeof(BITMAP);
}
-long CBitmap::GetBitmapBits(long dwCount, LPVOID lpBits) const {
+long CBitmap::GetBitmapBits(long dwCount, void *lpBits) const {
const CBitmap::Impl *src = static_cast<CBitmap::Impl *>(m_hObject);
dwCount = MIN<int32>((int32)dwCount, src->pitch * src->h * src->format.bytesPerPixel);
diff --git a/engines/bagel/mfc/gfx/dialog_template.h b/engines/bagel/mfc/gfx/dialog_template.h
index 6c4910e8cb4..91b7675388a 100644
--- a/engines/bagel/mfc/gfx/dialog_template.h
+++ b/engines/bagel/mfc/gfx/dialog_template.h
@@ -47,7 +47,7 @@ namespace Gfx {
#define DS_SETFOREGROUND 0x200L /* not in win3.1 */
// Template data pointers. Note that they're
-// void * because in ScummVM we do endian-safe
+// void *because in ScummVM we do endian-safe
// loading of the data being pointed to
typedef const void *LPCDLGTEMPLATE;
typedef void *LPDLGTEMPLATE;
diff --git a/engines/bagel/mfc/global_functions.cpp b/engines/bagel/mfc/global_functions.cpp
index 8f6390a5f5d..bed1aa30fe8 100644
--- a/engines/bagel/mfc/global_functions.cpp
+++ b/engines/bagel/mfc/global_functions.cpp
@@ -46,7 +46,7 @@ HGLOBAL GlobalAlloc(UINT uFlags, size_t dwBytes) {
uFlags == GMEM_ZEROINIT);
}
-LPVOID GlobalLock(HGLOBAL hMem) {
+void *GlobalLock(HGLOBAL hMem) {
return ((MemBlock *)hMem)->_ptr;
}
@@ -239,7 +239,7 @@ HGLOBAL LoadResource(HMODULE hModule, HRSRC hResInfo) {
return AfxGetApp()->loadResource(hResInfo);
}
-LPVOID LockResource(HGLOBAL hResData) {
+void *LockResource(HGLOBAL hResData) {
return AfxGetApp()->lockResource(hResData);
}
diff --git a/engines/bagel/mfc/global_functions.h b/engines/bagel/mfc/global_functions.h
index 026d37b6965..04989b158b0 100644
--- a/engines/bagel/mfc/global_functions.h
+++ b/engines/bagel/mfc/global_functions.h
@@ -77,7 +77,7 @@ extern BOOL GetClassInfo(HINSTANCE hInstance,
extern int GetSystemMetrics(int nIndex);
extern HGLOBAL GlobalAlloc(UINT uFlags, size_t dwBytes);
-extern LPVOID GlobalLock(HGLOBAL hMem);
+extern void *GlobalLock(HGLOBAL hMem);
extern BOOL GlobalUnlock(HGLOBAL hMem);
extern HGLOBAL GlobalFree(HGLOBAL hMem);
extern size_t GlobalSize(HGLOBAL hMem);
@@ -137,7 +137,7 @@ extern HRSRC FindResource(HMODULE hModule,
LPCSTR lpName, LPCSTR lpType);
extern size_t SizeofResource(HMODULE hModule, HRSRC hResInfo);
extern HGLOBAL LoadResource(HMODULE hModule, HRSRC hResInfo);
-extern LPVOID LockResource(HGLOBAL hResData);
+extern void *LockResource(HGLOBAL hResData);
extern void UnlockResource(HGLOBAL hResData);
extern BOOL FreeResource(HGLOBAL hResData);
extern HFONT CreateFontIndirect(const LOGFONT *lf);
diff --git a/engines/bagel/mfc/palette.cpp b/engines/bagel/mfc/palette.cpp
index a1929f085ff..b2e2b538cde 100644
--- a/engines/bagel/mfc/palette.cpp
+++ b/engines/bagel/mfc/palette.cpp
@@ -35,7 +35,7 @@ BOOL CPalette::CreatePalette(LPLOGPALETTE lpLogPalette) {
return true;
}
-int CPalette::GetObject(int nCount, LPVOID lpObject) const {
+int CPalette::GetObject(int nCount, void *lpObject) const {
LOGPALETTE *pal = (LOGPALETTE *)lpObject;
const Impl *src = static_cast<const Impl *>(m_hObject);
assert(nCount >= 4);
diff --git a/engines/bagel/mfc/win_app.cpp b/engines/bagel/mfc/win_app.cpp
index 3adcd9709c4..59009484195 100644
--- a/engines/bagel/mfc/win_app.cpp
+++ b/engines/bagel/mfc/win_app.cpp
@@ -322,7 +322,7 @@ HGLOBAL CWinApp::loadResource(HRSRC hResInfo) {
return _resources.loadResource(hResInfo);
}
-LPVOID CWinApp::lockResource(HGLOBAL hResData) {
+void *CWinApp::lockResource(HGLOBAL hResData) {
return GlobalLock(hResData);
}
diff --git a/engines/bagel/mfc/win_hand.h b/engines/bagel/mfc/win_hand.h
index 2a06d8420b6..5c8541a4687 100644
--- a/engines/bagel/mfc/win_hand.h
+++ b/engines/bagel/mfc/win_hand.h
@@ -122,11 +122,11 @@ public:
void SetPermanent(HANDLE h, T *permOb) {
assert(!LookupPermanent(h));
- _permanentMap[(LPVOID)h] = permOb;
+ _permanentMap[(void *)h] = permOb;
}
void RemoveHandle(HANDLE h) {
- _permanentMap.erase((LPVOID)h);
+ _permanentMap.erase((void *)h);
}
inline T *LookupPermanent(HANDLE h) const {
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index e6740a04cb5..9b8e376bf1b 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -98,7 +98,7 @@ BOOL DeleteObject(HGDIOBJ ho) {
return true;
}
-int GetObject(HANDLE h, int c, LPVOID pv) {
+int GetObject(HANDLE h, int c, void *pv) {
error("TODO: GetObject");
}
@@ -236,7 +236,7 @@ HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih, uint32 flInit,
}
int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
- LPVOID lpvBits, LPBITMAPINFO lpbmi, UINT usage) {
+ void *lpvBits, LPBITMAPINFO lpbmi, UINT usage) {
error("TODO: GetDIBits");
}
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index 37003d0ce5a..b9ba4c1ac88 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -660,7 +660,7 @@ typedef struct tagBITMAP {
long bmWidthBytes;
WORD bmPlanes;
WORD bmBitsPixel;
- LPVOID bmBits;
+ void * bmBits;
} BITMAP, *PBITMAP, NEAR *NPBITMAP, FAR *LPBITMAP;
typedef struct tagBITMAPCOREHEADER {
@@ -736,7 +736,7 @@ extern int ReleaseDC(HWND hWnd, HDC hDC);
extern BOOL DeleteDC(HDC hdc);
extern BOOL DeleteObject(HGDIOBJ ho);
extern HDC GetDC(HWND hWnd);
-extern int GetObject(HANDLE h, int c, LPVOID pv);
+extern int GetObject(HANDLE h, int c, void *pv);
extern HDC BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint);
extern BOOL EndPaint(HWND hWnd, const PAINTSTRUCT *lpPaint);
@@ -751,7 +751,7 @@ extern BOOL ScreenToClient(HWND hWnd, LPPOINT lpPoint);
HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih,
uint32 flInit, CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage);
extern int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
- LPVOID lpvBits, LPBITMAPINFO lpbmi, UINT usage);
+ void *lpvBits, LPBITMAPINFO lpbmi, UINT usage);
extern HGDIOBJ SelectObject(HDC hdc, HGDIOBJ h);
extern HGDIOBJ GetStockObject(int i);
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index 19e2c838ee8..670d79985d7 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -40,8 +40,6 @@ typedef WORD *LPWORD;
typedef long *LPLONG;
typedef uint32 *PDWORD;
typedef uint32 *LPDWORD;
-typedef void *LPVOID;
-typedef const void *LPCVOID;
typedef const char *LPCSTR;
typedef const char *LPCTSTR;
diff --git a/engines/bagel/mfc/wnd.cpp b/engines/bagel/mfc/wnd.cpp
index eb6882508e6..1a6ad79c29b 100644
--- a/engines/bagel/mfc/wnd.cpp
+++ b/engines/bagel/mfc/wnd.cpp
@@ -136,7 +136,7 @@ BOOL CWnd::Create(LPCSTR lpszClassName, LPCSTR lpszWindowName,
BOOL CWnd::CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
LPCSTR lpszWindowName, uint32 dwStyle,
const RECT &rect, CWnd *pParentWnd, UINT nID,
- LPVOID lpParam /* = nullptr */) {
+ void *lpParam /* = nullptr */) {
return CreateEx(dwExStyle, lpszClassName, lpszWindowName, dwStyle,
rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
pParentWnd->GetSafeHwnd(), nID, lpParam);
@@ -145,7 +145,7 @@ BOOL CWnd::CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
BOOL CWnd::CreateEx(uint32 dwExStyle, LPCSTR lpszClassName,
LPCSTR lpszWindowName, uint32 dwStyle,
int x, int y, int nWidth, int nHeight,
- HWND hWndParent, LPARAM nIDorHMenu, LPVOID lpParam) {
+ HWND hWndParent, LPARAM nIDorHMenu, void *lpParam) {
// Set up create structure
CREATESTRUCT cs;
cs.x = x;
diff --git a/engines/bagel/spacebar/baglib/dossier_object.cpp b/engines/bagel/spacebar/baglib/dossier_object.cpp
index 734f77254fa..4a1dcd10fc8 100644
--- a/engines/bagel/spacebar/baglib/dossier_object.cpp
+++ b/engines/bagel/spacebar/baglib/dossier_object.cpp
@@ -278,7 +278,7 @@ CBofRect CBagDossierObject::getRect() {
return rect;
}
-void CBagDossierObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*pInfo*/) {
+void CBagDossierObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void */*pInfo*/) {
// If this is an inactive object (such as "plus residue too old" or "negative")
// then ignore the mousedown.
diff --git a/engines/bagel/spacebar/baglib/exam.cpp b/engines/bagel/spacebar/baglib/exam.cpp
index 0383cd9c088..d409796bcdc 100644
--- a/engines/bagel/spacebar/baglib/exam.cpp
+++ b/engines/bagel/spacebar/baglib/exam.cpp
@@ -118,7 +118,7 @@ bool CBagExam::rotateStop() {
}
-void CBagExam::onMouseMove(uint32 /* flags, unused */, CBofPoint *point, void * /* extraInfo, unused */) {
+void CBagExam::onMouseMove(uint32 /* flags, unused */, CBofPoint *point, void */* extraInfo, unused */) {
assert(isValidObject(this));
assert(point != nullptr);
diff --git a/engines/bagel/spacebar/baglib/exam.h b/engines/bagel/spacebar/baglib/exam.h
index 17d1dbd6f64..77d67b9e7f8 100644
--- a/engines/bagel/spacebar/baglib/exam.h
+++ b/engines/bagel/spacebar/baglib/exam.h
@@ -58,7 +58,7 @@ public:
* Called when the mouse is moved over window, check if the
* cursor is in one of the rectangle and rotate object accordingly
*/
- void onMouseMove(uint32 /* flags */, CBofPoint *point, void * /* extraInfo */ = nullptr) override;
+ void onMouseMove(uint32 /* flags */, CBofPoint *point, void */* extraInfo */ = nullptr) override;
/**
* Resize the examination window
diff --git a/engines/bagel/spacebar/baglib/menu_dlg.cpp b/engines/bagel/spacebar/baglib/menu_dlg.cpp
index 17c1b765e3e..a329ae834eb 100644
--- a/engines/bagel/spacebar/baglib/menu_dlg.cpp
+++ b/engines/bagel/spacebar/baglib/menu_dlg.cpp
@@ -494,7 +494,7 @@ bool CBagMenu::trackPopupMenu(uint32 /*nFlags*/, int x, int y, CBofWindow *pWnd,
return bReturn;
}
-bool CBagMenu::addItem(CBagObject *pObj, void *(* /*func*/)(int, void *), void * /*info*/) {
+bool CBagMenu::addItem(CBagObject *pObj, void *(* /*func*/)(int, void *), void */*info*/) {
pObj->setPosition(CBofPoint(0, _nY));
_nY = (int16)(_nY + (int16)(pObj->getRect().height() + 1));
diff --git a/engines/bagel/spacebar/baglib/moo.h b/engines/bagel/spacebar/baglib/moo.h
index f152b334afe..c8da400ce7d 100644
--- a/engines/bagel/spacebar/baglib/moo.h
+++ b/engines/bagel/spacebar/baglib/moo.h
@@ -45,7 +45,7 @@ public:
ErrorCode update(CBofBitmap *pBmp, CBofPoint pt, CBofRect *pSrcRect = nullptr, int nMaskColor = -1) override;
// Grab the button event of the bagbmobj and send them to the cbagsdev
- void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*info*/) override {
+ void onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void */*info*/) override {
}
void onLButtonDown(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * = nullptr) override {
}
diff --git a/engines/bagel/spacebar/baglib/rp_object.cpp b/engines/bagel/spacebar/baglib/rp_object.cpp
index afebefd508e..5fb3c7fbeae 100644
--- a/engines/bagel/spacebar/baglib/rp_object.cpp
+++ b/engines/bagel/spacebar/baglib/rp_object.cpp
@@ -951,7 +951,7 @@ void CBagRPObject::deactivateResiduePrintedReview() {
}
}
-void CBagRPObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*pv*/) {
+void CBagRPObject::onLButtonUp(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void */*pv*/) {
// Deactivate everything in the rp list
hideResiduePrintedReview();
diff --git a/engines/bagel/spacebar/baglib/storage_dev_win.cpp b/engines/bagel/spacebar/baglib/storage_dev_win.cpp
index 2cc15767879..bc580e383db 100644
--- a/engines/bagel/spacebar/baglib/storage_dev_win.cpp
+++ b/engines/bagel/spacebar/baglib/storage_dev_win.cpp
@@ -451,7 +451,7 @@ ErrorCode CBagStorageDev::paintStorageDevice(CBofWindow * /*pWnd*/, CBofBitmap *
return ERR_NONE;
}
-ErrorCode CBagStorageDev::onLActiveObject(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void * /*vpInfo*/) {
+ErrorCode CBagStorageDev::onLActiveObject(uint32 /*nFlags*/, CBofPoint */*xPoint*/, void */*vpInfo*/) {
return ERR_NONE;
}
Commit: 7bdda2ff77a91db0deecb4824b3cead082fd065c
https://github.com/scummvm/scummvm/commit/7bdda2ff77a91db0deecb4824b3cead082fd065c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:33+03:00
Commit Message:
BAGEL: Fix change from conflict resolution
Changed paths:
engines/bagel/hodjnpodj/beacon/beacon.cpp
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index 14c2e9778f9..e87f8022022 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -977,7 +977,7 @@ void CMainWindow::CheckUnderBeam() {
End.y = Start.y + (int)(y * radius);
bChanged = TRUE;
- LineDDA(Start.x, Start.y, End.x, End.y, StepAlongLine, (LPARAM)pDC);
+ LineDDA(Start.x, Start.y, End.x, End.y, StepAlongLine, pDC);
degrees += 1.0F;
} // end while
Commit: c89c9cc751e8d069d9b180c1b2b62dcb4bda4e5f
https://github.com/scummvm/scummvm/commit/c89c9cc751e8d069d9b180c1b2b62dcb4bda4e5f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T01:02:35+03:00
Commit Message:
BAGEL: Fix parameter type
Changed paths:
engines/bagel/mfc/dc.cpp
diff --git a/engines/bagel/mfc/dc.cpp b/engines/bagel/mfc/dc.cpp
index 96c2fed28a9..bc0688cd39a 100644
--- a/engines/bagel/mfc/dc.cpp
+++ b/engines/bagel/mfc/dc.cpp
@@ -1148,7 +1148,7 @@ CSize CDC::Impl::tabbedTextOut(int x, int y, LPCSTR lpszString, int nCount,
}
CSize CDC::Impl::tabbedTextOut(int x, int y, const CString &str,
- int nTabPositions, int *lpnTabStopPositions, int nTabOrigin) {
+ int nTabPositions, const int *lpnTabStopPositions, int nTabOrigin) {
CSize size;
textOut(x, y, str, nTabPositions, lpnTabStopPositions, nTabOrigin, &size);
return size;
More information about the Scummvm-git-logs
mailing list