♻️ Change BOOL to bool

3rdParty/Storm/Source/storm.h

@@ -103,8 +103,8 @@ struct CCritSect {
 extern "C" {
 #endif
 
-BOOL SNetCreateGame(const char *pszGameName, const char *pszGamePassword, const char *pszGameStatString, DWORD dwGameType, char *GameTemplateData, int GameTemplateSize, int playerCount, const char *creatorName, const char *a11, int *playerID);
-BOOL SNetDestroy();
+bool SNetCreateGame(const char *pszGameName, const char *pszGamePassword, const char *pszGameStatString, DWORD dwGameType, char *GameTemplateData, int GameTemplateSize, int playerCount, const char *creatorName, const char *a11, int *playerID);
+bool SNetDestroy();
 
 /*  SNetDropPlayer @ 106
  *
@@ -115,7 +115,7 @@ BOOL SNetDestroy();
  *
  *  Returns TRUE if the function was called successfully and FALSE otherwise.
  */
-BOOL SNetDropPlayer(int playerid, DWORD flags);
+bool SNetDropPlayer(int playerid, DWORD flags);
 
 /*  SNetGetGameInfo @ 107
  *
@@ -128,7 +128,7 @@ BOOL SNetDropPlayer(int playerid, DWORD flags);
  *
  *  Returns TRUE if the function was called successfully and FALSE otherwise.
  */
-BOOL SNetGetGameInfo(int type, void *dst, unsigned int length);
+bool SNetGetGameInfo(int type, void *dst, unsigned int length);
 
 /*  SNetGetTurnsInTransit @ 115
  *
@@ -139,7 +139,7 @@ BOOL SNetGetGameInfo(int type, void *dst, unsigned int length);
  *
  *  Returns TRUE if the function was called successfully and FALSE otherwise.
  */
-BOOL
+bool
     SNetGetTurnsInTransit(
         DWORD *turns);
 
@@ -169,7 +169,7 @@ typedef struct _user_info {
 	DWORD dwUnknown;
 } user_info;
 
-BOOL SNetJoinGame(int id, char *gameName, char *gamePassword, char *playerName, char *userStats, int *playerid);
+bool SNetJoinGame(int id, char *gameName, char *gamePassword, char *playerName, char *userStats, int *playerid);
 
 /*  SNetLeaveGame @ 119
  *
@@ -180,11 +180,11 @@ BOOL SNetJoinGame(int id, char *gameName, char *gamePassword, char *playerName,
  *
  *  Returns TRUE if the function was called successfully and FALSE otherwise.
  */
-BOOL SNetLeaveGame(int type);
+bool SNetLeaveGame(int type);
 
-BOOL SNetPerformUpgrade(DWORD *upgradestatus);
-BOOL SNetReceiveMessage(int *senderplayerid, char **data, int *databytes);
-BOOL SNetReceiveTurns(int a1, int arraysize, char **arraydata, DWORD *arraydatabytes, DWORD *arrayplayerstatus);
+bool SNetPerformUpgrade(DWORD *upgradestatus);
+bool SNetReceiveMessage(int *senderplayerid, char **data, int *databytes);
+bool SNetReceiveTurns(int a1, int arraysize, char **arraydata, DWORD *arraydatabytes, DWORD *arrayplayerstatus);
 
 typedef void(*SEVTHANDLER)(struct _SNETEVENT *);
 
@@ -203,7 +203,7 @@ typedef void(*SEVTHANDLER)(struct _SNETEVENT *);
  *
  *  Returns TRUE if the function was called successfully and FALSE otherwise.
  */
-BOOL SNetSendMessage(int playerID, void *data, unsigned int databytes);
+bool SNetSendMessage(int playerID, void *data, unsigned int databytes);
 
 // Macro values to target specific players
 #define SNPLAYER_ALL    -1
@@ -224,9 +224,9 @@ BOOL SNetSendMessage(int playerID, void *data, unsigned int databytes);
  *
  *  Returns TRUE if the function was called successfully and FALSE otherwise.
  */
-BOOL SNetSendTurn(char *data, unsigned int databytes);
+bool SNetSendTurn(char *data, unsigned int databytes);
 
-BOOL SFileOpenFile(const char *filename, HANDLE *phFile);
+bool SFileOpenFile(const char *filename, HANDLE *phFile);
 
 // Functions implemented in StormLib
 bool WINAPI SFileOpenArchive(const char *szMpqName, DWORD dwPriority, DWORD dwFlags, HANDLE *phMpq);
@@ -251,7 +251,7 @@ bool WINAPI SFileCloseFile(HANDLE hFile);
  *
  *  Returns TRUE if the image was supported and loaded correctly, FALSE otherwise.
  */
-BOOL
+bool
     SBmpLoadImage(
         const char *pszFileName,
         SDL_Color *pPalette,
@@ -309,15 +309,15 @@ void SErrSetLastError(DWORD dwErrCode);
  */
 void SStrCopy(char *dest, const char *src, int max_length);
 
-BOOL SFileSetBasePath(const char *);
-BOOL SVidPlayContinue(void);
-BOOL SNetGetOwnerTurnsWaiting(DWORD *);
+bool SFileSetBasePath(const char *);
+bool SVidPlayContinue(void);
+bool SNetGetOwnerTurnsWaiting(DWORD *);
 bool SNetUnregisterEventHandler(event_type, SEVTHANDLER);
 bool SNetRegisterEventHandler(event_type, SEVTHANDLER);
 bool SNetSetBasePlayer(int);
 int SNetInitializeProvider(Uint32 provider, struct GameData *gameData);
 int SNetGetProviderCaps(struct _SNETCAPS *);
-BOOL SFileEnableDirectAccess(BOOL enable);
+bool SFileEnableDirectAccess(bool enable);
 
 #if defined(__GNUC__) || defined(__cplusplus)
 }

DiabloUI/diabloui.h

@@ -27,24 +27,24 @@ typedef struct _uiheroinfo {
 
 void UiDestroy();
 void UiTitleDialog();
-void UiSetSpawned(BOOL bSpawned);
+void UiSetSpawned(bool bSpawned);
 void UiInitialize();
-BOOL UiValidPlayerName(const char *name); /* check */
-void UiSelHeroMultDialog(BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), BOOL (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16]);
-void UiSelHeroSingDialog(BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), BOOL (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16], int *difficulty);
-BOOL UiCreditsDialog();
-BOOL UiSupportDialog();
-BOOL UiMainMenuDialog(const char *name, int *pdwResult, void (*fnSound)(const char *file), int attractTimeOut);
-BOOL UiProgressDialog(const char *msg, int enable, int (*fnfunc)(), int rate);
+bool UiValidPlayerName(const char *name); /* check */
+void UiSelHeroMultDialog(bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)), bool (*fncreate)(_uiheroinfo *), bool (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16]);
+void UiSelHeroSingDialog(bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)), bool (*fncreate)(_uiheroinfo *), bool (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16], int *difficulty);
+bool UiCreditsDialog();
+bool UiSupportDialog();
+bool UiMainMenuDialog(const char *name, int *pdwResult, void (*fnSound)(const char *file), int attractTimeOut);
+bool UiProgressDialog(const char *msg, int enable, int (*fnfunc)(), int rate);
 void UiProfileCallback();
 void UiProfileDraw();
-BOOL UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7);
-BOOL UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5);
-BOOL UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, char *lpBuffer, int cchBufferMax);
-BOOL UiSoundCallback(int a1, int type, int a3);
-BOOL UiDrawDescCallback(int game_type, DWORD color, const char *lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
-BOOL UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6);
-BOOL UiArtCallback(int game_type, unsigned int art_code, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp);
+bool UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7);
+bool UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5);
+bool UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, char *lpBuffer, int cchBufferMax);
+bool UiSoundCallback(int a1, int type, int a3);
+bool UiDrawDescCallback(int game_type, DWORD color, const char *lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
+bool UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6);
+bool UiArtCallback(int game_type, unsigned int art_code, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp);
 int UiSelectGame(GameData *gameData, int *playerId);
 int UiSelectProvider(GameData *gameData);
 void UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, Uint32 type);

Source/automap.cpp

@@ -377,7 +377,7 @@ void DrawAutomapPlr(CelOutputBuffer out, int pnum)
 /**
  * @brief Returns the automap shape at the given coordinate.
  */
-WORD GetAutomapType(int x, int y, BOOL view)
+WORD GetAutomapType(int x, int y, bool view)
 {
 	WORD rv;
 

Source/capture.cpp

@@ -19,7 +19,7 @@ namespace devilution {
  * @param out File stream to write to
  * @return True on success
  */
-static BOOL CaptureHdr(short width, short height, std::ofstream *out)
+static bool CaptureHdr(short width, short height, std::ofstream *out)
 {
 	PCXHeader Buffer;
 
@@ -45,7 +45,7 @@ static BOOL CaptureHdr(short width, short height, std::ofstream *out)
  * @param out File stream for the PCX file.
  * @return True if successful, else false
  */
-static BOOL CapturePal(SDL_Color *palette, std::ofstream *out)
+static bool CapturePal(SDL_Color *palette, std::ofstream *out)
 {
 	BYTE pcx_palette[1 + 256 * 3];
 	int i;
@@ -169,7 +169,7 @@ void CaptureScreen()
 {
 	SDL_Color palette[256];
 	std::string FileName;
-	BOOL success;
+	bool success;
 
 	std::ofstream *out_stream = CaptureFile(&FileName);
 	if (out_stream == NULL)

Source/control.cpp

@@ -21,25 +21,25 @@ BYTE sgbNextTalkSave;
 BYTE sgbTalkSavePos;
 BYTE *pDurIcons;
 BYTE *pChrButtons;
-BOOL drawhpflag;
-BOOL dropGoldFlag;
-BOOL panbtn[8];
-BOOL chrbtn[4];
+bool drawhpflag;
+bool dropGoldFlag;
+bool panbtn[8];
+bool chrbtn[4];
 BYTE *pMultiBtns;
 BYTE *pPanelButtons;
 BYTE *pChrPanel;
-BOOL lvlbtndown;
+bool lvlbtndown;
 char sgszTalkSave[8][80];
 int dropGoldValue;
-BOOL drawmanaflag;
-BOOL chrbtnactive;
+bool drawmanaflag;
+bool chrbtnactive;
 char sgszTalkMsg[MAX_SEND_STR_LEN];
 BYTE *pPanelText;
 BYTE *pTalkBtns;
-BOOL pstrjust[4];
+bool pstrjust[4];
 int pnumlines;
-BOOL pinfoflag;
-BOOL talkbtndown[3];
+bool pinfoflag;
+bool talkbtndown[3];
 spell_id pSpell;
 text_color infoclr;
 int sgbPlrTalkTbl;
@@ -50,21 +50,21 @@ bool whisper[MAX_PLRS];
 int sbooktab;
 spell_type pSplType;
 int initialDropGoldIndex;
-BOOL talkflag;
+bool talkflag;
 BYTE *pSBkIconCels;
-BOOL sbookflag;
-BOOL chrflag;
-BOOL drawbtnflag;
+bool sbookflag;
+bool chrflag;
+bool drawbtnflag;
 BYTE *pSpellBkCel;
 char infostr[64];
 int numpanbtns;
 char panelstr[4][64];
-BOOL panelflag;
+bool panelflag;
 BYTE SplTransTbl[256];
 int initialDropGoldValue;
 BYTE *pSpellCels;
-BOOL panbtndown;
-BOOL spselflag;
+bool panbtndown;
+bool spselflag;
 
 /** Map of hero class names */
 const char *const ClassStrTbl[] = {
@@ -581,7 +581,7 @@ void PrintChar(CelOutputBuffer out, int sx, int sy, int nCel, text_color col)
 	CelDrawLightTo(out, sx, sy, pPanelText, nCel, 13, tbl);
 }
 
-void AddPanelString(const char *str, BOOL just)
+void AddPanelString(const char *str, bool just)
 {
 	strcpy(panelstr[pnumlines], str);
 	pstrjust[pnumlines] = just;
@@ -1194,7 +1194,7 @@ void FreeControlPan()
 	MemFreeDbg(pGBoxBuff);
 }
 
-BOOL control_WriteStringToBuffer(BYTE *str)
+bool control_WriteStringToBuffer(BYTE *str)
 {
 	int k;
 	BYTE ichar;
@@ -1211,7 +1211,7 @@ BOOL control_WriteStringToBuffer(BYTE *str)
 	return TRUE;
 }
 
-static void CPrintString(CelOutputBuffer out, int y, const char *str, BOOL center, int lines)
+static void CPrintString(CelOutputBuffer out, int y, const char *str, bool center, int lines)
 {
 	BYTE c;
 	const char *tmp;
@@ -1792,7 +1792,7 @@ void RedBack(CelOutputBuffer out)
 	}
 }
 
-static void PrintSBookStr(CelOutputBuffer out, int x, int y, BOOL cjustflag, const char *pszStr, text_color col)
+static void PrintSBookStr(CelOutputBuffer out, int x, int y, bool cjustflag, const char *pszStr, text_color col)
 {
 	BYTE c;
 	const char *tmp;
@@ -1823,7 +1823,7 @@ static void PrintSBookStr(CelOutputBuffer out, int x, int y, BOOL cjustflag, con
 	}
 }
 
-char GetSBookTrans(int ii, BOOL townok)
+char GetSBookTrans(int ii, bool townok)
 {
 	char st;
 
@@ -2132,7 +2132,7 @@ void DrawTalkPan(CelOutputBuffer out)
 	}
 }
 
-BOOL control_check_talk_btn()
+bool control_check_talk_btn()
 {
 	int i;
 
@@ -2243,7 +2243,7 @@ static void control_press_enter()
 	control_reset_talk();
 }
 
-BOOL control_talk_last_key(int vkey)
+bool control_talk_last_key(int vkey)
 {
 	int result;
 
@@ -2277,10 +2277,10 @@ static void control_up_down(int v)
 	}
 }
 
-BOOL control_presskeys(int vkey)
+bool control_presskeys(int vkey)
 {
 	int len;
-	BOOL ret;
+	bool ret;
 
 	if (gbIsMultiplayer) {
 		if (!talkflag) {

Source/control.h

@@ -29,31 +29,31 @@ typedef struct RECT32 {
 	int h;
 } RECT32;
 
-extern BOOL drawhpflag;
-extern BOOL dropGoldFlag;
-extern BOOL chrbtn[4];
-extern BOOL lvlbtndown;
+extern bool drawhpflag;
+extern bool dropGoldFlag;
+extern bool chrbtn[4];
+extern bool lvlbtndown;
 extern int dropGoldValue;
-extern BOOL drawmanaflag;
-extern BOOL chrbtnactive;
+extern bool drawmanaflag;
+extern bool chrbtnactive;
 extern BYTE *pPanelText;
 extern int pnumlines;
-extern BOOL pinfoflag;
+extern bool pinfoflag;
 extern spell_id pSpell;
 extern text_color infoclr;
 extern char tempstr[256];
 extern int sbooktab;
 extern spell_type pSplType;
 extern int initialDropGoldIndex;
-extern BOOL talkflag;
-extern BOOL sbookflag;
-extern BOOL chrflag;
-extern BOOL drawbtnflag;
+extern bool talkflag;
+extern bool sbookflag;
+extern bool chrflag;
+extern bool drawbtnflag;
 extern char infostr[64];
-extern BOOL panelflag;
+extern bool panelflag;
 extern int initialDropGoldValue;
-extern BOOL panbtndown;
-extern BOOL spselflag;
+extern bool panbtndown;
+extern bool spselflag;
 
 void DrawSpellList(CelOutputBuffer out);
 void SetSpell();
@@ -70,7 +70,7 @@ void ToggleSpell(int slot);
  */
 void PrintChar(CelOutputBuffer out, int sx, int sy, int nCel, text_color col);
 
-void AddPanelString(const char *str, BOOL just);
+void AddPanelString(const char *str, bool just);
 void ClearPanel();
 void DrawPanelBox(CelOutputBuffer out, int x, int y, int w, int h, int sx, int sy);
 
@@ -112,7 +112,7 @@ void DoAutoMap();
 void CheckPanelInfo();
 void CheckBtnUp();
 void FreeControlPan();
-BOOL control_WriteStringToBuffer(BYTE *str);
+bool control_WriteStringToBuffer(BYTE *str);
 
 /**
  * Sets a string to be drawn in the info box and then draws it.
@@ -136,12 +136,12 @@ void control_drop_gold(char vkey);
 void control_remove_gold(int pnum, int gold_index);
 void control_set_gold_curs(int pnum);
 void DrawTalkPan(CelOutputBuffer out);
-BOOL control_check_talk_btn();
+bool control_check_talk_btn();
 void control_release_talk_btn();
 void control_type_message();
 void control_reset_talk();
-BOOL control_talk_last_key(int vkey);
-BOOL control_presskeys(int vkey);
+bool control_talk_last_key(int vkey);
+bool control_presskeys(int vkey);
 
 /* rdata */
 extern const BYTE fontframe[128];

Source/cursor.cpp

@@ -216,7 +216,7 @@ void CheckCursMove()
 {
 	int i, sx, sy, fx, fy, mx, my, tx, ty, px, py, xx, yy, mi, columns, rows, xo, yo;
 	char bv;
-	BOOL flipflag, flipx, flipy;
+	bool flipflag, flipx, flipy;
 
 	sx = MouseX;
 	sy = MouseY;

Source/debug.cpp

@@ -8,7 +8,7 @@
 namespace devilution {
 
 #ifdef _DEBUG
-BOOL update_seed_check = FALSE;
+bool update_seed_check = FALSE;
 
 #define DEBUGSEEDS 4096
 int seed_index;
@@ -127,7 +127,7 @@ void SetAllSpellsCheat()
 
 int dbgplr;
 
-void PrintDebugPlayer(BOOL bNextPlayer)
+void PrintDebugPlayer(bool bNextPlayer)
 {
 	char dstr[128];
 
@@ -167,7 +167,7 @@ void PrintDebugQuest()
 
 void PrintDebugMonster(int m)
 {
-	BOOL bActive;
+	bool bActive;
 	int i;
 	char dstr[128];
 

Source/debug.h

@@ -20,7 +20,7 @@ void GiveGoldCheat();
 void TakeGoldCheat();
 void MaxSpellsCheat();
 void SetAllSpellsCheat();
-void PrintDebugPlayer(BOOL bNextPlayer);
+void PrintDebugPlayer(bool bNextPlayer);
 void PrintDebugQuest();
 void GetDebugMonster();
 void NextDebugMonster();

Source/diablo.cpp

@@ -22,16 +22,16 @@ int glMid2Seed[NUMLEVELS];
 int glMid3Seed[NUMLEVELS];
 int MouseX;
 int MouseY;
-BOOL gbGameLoopStartup;
-BOOL gbRunGame;
-BOOL gbRunGameResult;
-BOOL zoomflag;
+bool gbGameLoopStartup;
+bool gbRunGame;
+bool gbRunGameResult;
+bool zoomflag;
 /** Enable updating of player character, set to false once Diablo dies */
-BOOL gbProcessPlayers;
+bool gbProcessPlayers;
 bool gbLoadGame;
 bool cineflag;
 int force_redraw;
-BOOL light4flag;
+bool light4flag;
 int setseed;
 int PauseMode;
 bool forceSpawn;
@@ -362,9 +362,9 @@ static void run_game_loop(interface_mode uMsg)
 	}
 }
 
-BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer)
+bool StartGame(bool bNewGame, bool bSinglePlayer)
 {
-	BOOL fExitProgram;
+	bool fExitProgram;
 
 	gbSelectProvider = TRUE;
 
@@ -651,9 +651,9 @@ int DiabloMain(int argc, char **argv)
 	return 0;
 }
 
-static BOOL LeftMouseCmd(BOOL bShift)
+static bool LeftMouseCmd(bool bShift)
 {
-	BOOL bNear;
+	bool bNear;
 
 	assert(MouseY < PANEL_TOP || MouseX < PANEL_LEFT || MouseX >= PANEL_LEFT + PANEL_WIDTH);
 
@@ -706,7 +706,7 @@ static BOOL LeftMouseCmd(BOOL bShift)
 	return FALSE;
 }
 
-BOOL TryIconCurs()
+bool TryIconCurs()
 {
 	if (pcurs == CURSOR_RESURRECT) {
 		NetSendCmdParam1(TRUE, CMD_RESURRECT, pcursplr);
@@ -774,7 +774,7 @@ BOOL TryIconCurs()
 	return FALSE;
 }
 
-static BOOL LeftMouseDown(int wParam)
+static bool LeftMouseDown(int wParam)
 {
 	if (gmenu_left_mouse(TRUE))
 		return FALSE;
@@ -910,7 +910,7 @@ static void diablo_hotkey_msg(DWORD dwMsg)
 	NetSendCmdString(-1, sgOptions.Chat.szHotKeyMsgs[dwMsg]);
 }
 
-static BOOL PressSysKey(int wParam)
+static bool PressSysKey(int wParam)
 {
 	if (gmenu_is_active() || wParam != DVL_VK_F10)
 		return FALSE;
@@ -1758,10 +1758,10 @@ static void UpdateMonsterLights()
 	}
 }
 
-void LoadGameLevel(BOOL firstflag, int lvldir)
+void LoadGameLevel(bool firstflag, int lvldir)
 {
 	int i, j;
-	BOOL visited;
+	bool visited;
 
 	if (setseed)
 		glSeedTbl[currlevel] = setseed;
@@ -2032,7 +2032,7 @@ static void game_logic()
 	plrctrls_after_game_logic();
 }
 
-static void timeout_cursor(BOOL bTimeout)
+static void timeout_cursor(bool bTimeout)
 {
 	if (bTimeout) {
 		if (sgnTimeoutCurs == CURSOR_NONE && sgbMouseDown == CLICK_NONE) {
@@ -2056,7 +2056,7 @@ static void timeout_cursor(BOOL bTimeout)
 /**
  * @param bStartup Process additional ticks before returning
  */
-void game_loop(BOOL bStartup)
+void game_loop(bool bStartup)
 {
 	int i;
 

Source/diablo.h

@@ -33,17 +33,17 @@ extern DWORD glSeedTbl[NUMLEVELS];
 extern dungeon_type gnLevelTypeTbl[NUMLEVELS];
 extern int MouseX;
 extern int MouseY;
-extern BOOL gbRunGame;
-extern BOOL gbRunGameResult;
-extern BOOL zoomflag;
-extern BOOL gbProcessPlayers;
+extern bool gbRunGame;
+extern bool gbRunGameResult;
+extern bool zoomflag;
+extern bool gbProcessPlayers;
 extern bool gbLoadGame;
 extern bool cineflag;
 extern int force_redraw;
 /* These are defined in fonts.h */
-extern BOOL was_fonts_init;
+extern bool was_fonts_init;
 extern void FontsCleanup();
-extern BOOL light4flag;
+extern bool light4flag;
 extern int PauseMode;
 extern bool gbTheoQuest;
 extern bool gbCowQuest;
@@ -55,16 +55,16 @@ extern int gnTickRate;
 extern WORD gnTickDelay;
 
 void FreeGameMem();
-BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer);
+bool StartGame(bool bNewGame, bool bSinglePlayer);
 [[noreturn]] void diablo_quit(int exitStatus);
 int DiabloMain(int argc, char **argv);
-BOOL TryIconCurs();
+bool TryIconCurs();
 void diablo_pause_game();
 bool PressEscKey();
 void DisableInputWndProc(UINT uMsg, WPARAM wParam, LPARAM lParam);
 void GM_Game(UINT uMsg, WPARAM wParam, LPARAM lParam);
-void LoadGameLevel(BOOL firstflag, int lvldir);
-void game_loop(BOOL bStartup);
+void LoadGameLevel(bool firstflag, int lvldir);
+void game_loop(bool bStartup);
 void diablo_color_cyc_logic();
 
 /* rdata */

Source/drlg_l1.cpp

@@ -21,7 +21,7 @@ namespace {
 BYTE L5dungeon[80][80];
 BYTE L5dflags[DMAXX][DMAXY];
 /** Specifies whether a single player quest DUN has been loaded. */
-BOOL L5setloadflag;
+bool L5setloadflag;
 /** Specifies whether to generate a horizontal room at position 1 in the Cathedral. */
 int HR1;
 /** Specifies whether to generate a horizontal room at position 2 in the Cathedral. */
@@ -30,11 +30,11 @@ int HR2;
 int HR3;
 
 /** Specifies whether to generate a vertical room at position 1 in the Cathedral. */
-BOOL VR1;
+bool VR1;
 /** Specifies whether to generate a vertical room at position 2 in the Cathedral. */
-BOOL VR2;
+bool VR2;
 /** Specifies whether to generate a vertical room at position 3 in the Cathedral. */
-BOOL VR3;
+bool VR3;
 /** Contains the contents of the single player quest DUN file. */
 BYTE *L5pSetPiece;
 
@@ -850,7 +850,7 @@ static void DRLG_L1Shadows()
 	int x, y, i;
 	BYTE sd[2][2];
 	BYTE tnv3;
-	BOOL patflag;
+	bool patflag;
 
 	for (y = 1; y < DMAXY; y++) {
 		for (x = 1; x < DMAXX; x++) {
@@ -935,10 +935,10 @@ static void DRLG_L1Shadows()
 	}
 }
 
-static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, BOOL setview, int noquad, int ldir)
+static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, bool setview, int noquad, int ldir)
 {
 	int sx, sy, sw, sh, xx, yy, i, ii, numt, found, t;
-	BOOL abort;
+	bool abort;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -1334,7 +1334,7 @@ static void L5drawRoom(int x, int y, int w, int h)
 	}
 }
 
-static BOOL L5checkRoom(int x, int y, int width, int height)
+static bool L5checkRoom(int x, int y, int width, int height)
 {
 	int i, j;
 
@@ -1352,7 +1352,7 @@ static BOOL L5checkRoom(int x, int y, int width, int height)
 
 static void L5roomGen(int x, int y, int w, int h, int dir)
 {
-	BOOL ran, ran2;
+	bool ran, ran2;
 	int width, height, rx, ry, ry2;
 	int cw, ch, cx1, cy1, cx2;
 
@@ -1552,7 +1552,7 @@ static void L5makeDmt()
 static int L5HWallOk(int i, int j)
 {
 	int x;
-	BOOL wallok;
+	bool wallok;
 
 	for (x = 1; dungeon[i + x][j] == 13; x++) {
 		if (dungeon[i + x][j - 1] != 13 || dungeon[i + x][j + 1] != 13 || L5dflags[i + x][j])
@@ -1578,7 +1578,7 @@ static int L5HWallOk(int i, int j)
 static int L5VWallOk(int i, int j)
 {
 	int y;
-	BOOL wallok;
+	bool wallok;
 
 	for (y = 1; dungeon[i][j + y] == 13; y++) {
 		if (dungeon[i - 1][j + y] != 13 || dungeon[i + 1][j + y] != 13 || L5dflags[i][j + y])
@@ -1741,7 +1741,7 @@ static void L5AddWall()
 	}
 }
 
-static void DRLG_L5GChamber(int sx, int sy, BOOL topflag, BOOL bottomflag, BOOL leftflag, BOOL rightflag)
+static void DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool leftflag, bool rightflag)
 {
 	int i, j;
 
@@ -1942,7 +1942,7 @@ static void L5tileFix()
 void drlg_l1_crypt_rndset(const BYTE *miniset, int rndper)
 {
 	int sx, sy, sw, sh, xx, yy, ii, kk;
-	BOOL found;
+	bool found;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -2510,7 +2510,7 @@ static void DRLG_L5(int entry)
 {
 	int i, j;
 	LONG minarea;
-	BOOL doneflag;
+	bool doneflag;
 
 	switch (currlevel) {
 	case 1:

Source/drlg_l2.cpp

@@ -1603,10 +1603,10 @@ int Patterns[100][10] = {
 
 } // namespace
 
-static BOOL DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, BOOL setview, int ldir)
+static bool DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir)
 {
 	int sx, sy, sw, sh, xx, yy, i, ii, numt, bailcnt;
-	BOOL found;
+	bool found;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -1692,7 +1692,7 @@ static BOOL DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx,
 static void DRLG_L2PlaceRndSet(const BYTE *miniset, int rndper)
 {
 	int sx, sy, sw, sh, xx, yy, ii, kk;
-	BOOL found;
+	bool found;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -1781,7 +1781,7 @@ static void DRLG_L2Subs()
 static void DRLG_L2Shadows()
 {
 	int x, y, i;
-	BOOL patflag;
+	bool patflag;
 	BYTE sd[2][2];
 
 	for (y = 1; y < DMAXY; y++) {
@@ -1882,7 +1882,7 @@ static void DRLG_L2SetRoom(int rx1, int ry1)
 	}
 }
 
-static void DefineRoom(int nX1, int nY1, int nX2, int nY2, BOOL ForceHW)
+static void DefineRoom(int nX1, int nY1, int nX2, int nY2, bool ForceHW)
 {
 	int i, j;
 
@@ -1922,7 +1922,7 @@ static void DefineRoom(int nX1, int nY1, int nX2, int nY2, BOOL ForceHW)
 
 static void CreateDoorType(int nX, int nY)
 {
-	BOOL fDoneflag;
+	bool fDoneflag;
 
 	fDoneflag = FALSE;
 
@@ -1994,7 +1994,7 @@ static void AddHall(int nX1, int nY1, int nX2, int nY2, int nHd)
  * @param nH Height of the room, if ForceHW is set.
  * @param nW Width of the room, if ForceHW is set.
  */
-static void CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir, BOOL ForceHW, int nH, int nW)
+static void CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir, bool ForceHW, int nH, int nW)
 {
 	int nAw, nAh, nRw, nRh, nRx1, nRy1, nRx2, nRy2, nHw, nHh, nHx1, nHy1, nHx2, nHy2, nRid;
 
@@ -2139,7 +2139,7 @@ static void GetHall(int *nX1, int *nY1, int *nX2, int *nY2, int *nHd)
 static void ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd)
 {
 	int nCurrd, nDx, nDy, nRp, nOrigX1, nOrigY1, fMinusFlag, fPlusFlag;
-	BOOL fDoneflag, fInroom;
+	bool fDoneflag, fInroom;
 
 	fDoneflag = FALSE;
 	fMinusFlag = random_(0, 100);
@@ -2381,7 +2381,7 @@ static void L2TileFix()
 	}
 }
 
-static BOOL DL2_Cont(BOOL x1f, BOOL y1f, BOOL x2f, BOOL y2f)
+static bool DL2_Cont(bool x1f, bool y1f, bool x2f, bool y2f)
 {
 	if (x1f && x2f && y1f && y2f) {
 		return FALSE;
@@ -2465,10 +2465,10 @@ static void DL2_KnockWalls(int x1, int y1, int x2, int y2)
 	}
 }
 
-static BOOL DL2_FillVoids()
+static bool DL2_FillVoids()
 {
 	int ii, jj, xx, yy, x1, x2, y1, y2;
-	BOOL xf1, xf2, yf1, yf2;
+	bool xf1, xf2, yf1, yf2;
 	int to;
 
 	to = 0;
@@ -2737,10 +2737,10 @@ static BOOL DL2_FillVoids()
 	return DL2_NumNoChar() <= 700;
 }
 
-static BOOL CreateDungeon()
+static bool CreateDungeon()
 {
 	int i, j, nHx1, nHy1, nHx2, nHy2, nHd, ForceH, ForceW;
-	BOOL ForceHW;
+	bool ForceHW;
 
 	ForceW = 0;
 	ForceH = 0;
@@ -3010,7 +3010,7 @@ static void L2DirtFix()
 void L2LockoutFix()
 {
 	int i, j;
-	BOOL doorok;
+	bool doorok;
 
 	for (j = 0; j < DMAXY; j++) {
 		for (i = 0; i < DMAXX; i++) {
@@ -3093,7 +3093,7 @@ void L2DoorFix()
 static void DRLG_L2(int entry)
 {
 	int i, j;
-	BOOL doneflag;
+	bool doneflag;
 
 	doneflag = FALSE;
 	while (!doneflag) {

Source/drlg_l3.cpp

@@ -850,7 +850,7 @@ static void InitL3Dungeon()
 	}
 }
 
-static BOOL DRLG_L3FillRoom(int x1, int y1, int x2, int y2)
+static bool DRLG_L3FillRoom(int x1, int y1, int x2, int y2)
 {
 	int i, j, v;
 
@@ -1175,7 +1175,7 @@ static void DRLG_L3River()
 	int river[3][100];
 	int rivercnt, riveramt;
 	int i, trys, found, bridge, lpcnt;
-	BOOL bail;
+	bool bail;
 
 	rivercnt = 0;
 	bail = FALSE;
@@ -1421,9 +1421,9 @@ static void DRLG_L3River()
 	}
 }
 
-static BOOL DRLG_L3Spawn(int x, int y, int *totarea);
+static bool DRLG_L3Spawn(int x, int y, int *totarea);
 
-static BOOL DRLG_L3SpawnEdge(int x, int y, int *totarea)
+static bool DRLG_L3SpawnEdge(int x, int y, int *totarea)
 {
 	BYTE i;
 	static BYTE spawntable[15] = { 0x00, 0x0A, 0x43, 0x05, 0x2c, 0x06, 0x09, 0x00, 0x00, 0x1c, 0x83, 0x06, 0x09, 0x0A, 0x05 };
@@ -1473,7 +1473,7 @@ static BOOL DRLG_L3SpawnEdge(int x, int y, int *totarea)
 	return FALSE;
 }
 
-static BOOL DRLG_L3Spawn(int x, int y, int *totarea)
+static bool DRLG_L3Spawn(int x, int y, int *totarea)
 {
 	BYTE i;
 	static BYTE spawntable[15] = { 0x00, 0x0A, 0x03, 0x05, 0x0C, 0x06, 0x09, 0x00, 0x00, 0x0C, 0x03, 0x06, 0x09, 0x0A, 0x05 };
@@ -1534,7 +1534,7 @@ static BOOL DRLG_L3Spawn(int x, int y, int *totarea)
 static void DRLG_L3Pool()
 {
 	int i, j, dunx, duny, totarea, poolchance;
-	BOOL found;
+	bool found;
 	BYTE k;
 	static BYTE poolsub[15] = { 0, 35, 26, 36, 25, 29, 34, 7, 33, 28, 27, 37, 32, 31, 30 };
 
@@ -1610,10 +1610,10 @@ static void DRLG_L3PoolFix()
 	}
 }
 
-static BOOL DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, BOOL setview, int ldir)
+static bool DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir)
 {
 	int sx, sy, sw, sh, xx, yy, i, ii, numt, trys;
-	BOOL found;
+	bool found;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -1694,7 +1694,7 @@ static BOOL DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx,
 static void DRLG_L3PlaceRndSet(const BYTE *miniset, int rndper)
 {
 	int sx, sy, sw, sh, xx, yy, ii, kk;
-	BOOL found;
+	bool found;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -1748,7 +1748,7 @@ static void DRLG_L3PlaceRndSet(const BYTE *miniset, int rndper)
 bool drlg_l3_hive_rnd_piece(const BYTE *miniset, int rndper)
 {
 	int sx, sy, sw, sh, xx, yy, ii, kk;
-	BOOL found;
+	bool found;
 	bool placed;
 
 	placed = FALSE;
@@ -1804,7 +1804,7 @@ bool drlg_l3_hive_rnd_piece(const BYTE *miniset, int rndper)
 	return placed;
 }
 
-static BOOL WoodVertU(int i, int y)
+static bool WoodVertU(int i, int y)
 {
 	if ((dungeon[i + 1][y] > 152 || dungeon[i + 1][y] < 130)
 	    && (dungeon[i - 1][y] > 152 || dungeon[i - 1][y] < 130)) {
@@ -1831,7 +1831,7 @@ static BOOL WoodVertU(int i, int y)
 	return FALSE;
 }
 
-static BOOL WoodVertD(int i, int y)
+static bool WoodVertD(int i, int y)
 {
 	if ((dungeon[i + 1][y] > 152 || dungeon[i + 1][y] < 130)
 	    && (dungeon[i - 1][y] > 152 || dungeon[i - 1][y] < 130)) {
@@ -1852,7 +1852,7 @@ static BOOL WoodVertD(int i, int y)
 	return FALSE;
 }
 
-static BOOL WoodHorizL(int x, int j)
+static bool WoodHorizL(int x, int j)
 {
 	if ((dungeon[x][j + 1] > 152 || dungeon[x][j + 1] < 130)
 	    && (dungeon[x][j - 1] > 152 || dungeon[x][j - 1] < 130)) {
@@ -1879,7 +1879,7 @@ static BOOL WoodHorizL(int x, int j)
 	return FALSE;
 }
 
-static BOOL WoodHorizR(int x, int j)
+static bool WoodHorizR(int x, int j)
 {
 	if ((dungeon[x][j + 1] > 152 || dungeon[x][j + 1] < 130)
 	    && (dungeon[x][j - 1] > 152 || dungeon[x][j - 1] < 130)) {
@@ -1979,7 +1979,7 @@ static void DRLG_L3Wood()
 
 #endif
 	int i, j, x, y, xx, yy, rt, rp, x1, y1, x2, y2;
-	BOOL skip;
+	bool skip;
 
 	for (j = 1; j < DMAXY - 1; j++) {     // BUGFIX: Change '0' to '1' (fixed)
 		for (i = 1; i < DMAXX - 1; i++) { // BUGFIX: Change '0' to '1' (fixed)
@@ -2171,10 +2171,10 @@ static void DRLG_L3Wood()
 	FenceDoorFix();
 }
 
-static BOOL DRLG_L3Anvil()
+static bool DRLG_L3Anvil()
 {
 	int sx, sy, sw, sh, xx, yy, ii, trys;
-	BOOL found;
+	bool found;
 
 	sw = L3ANVIL[0];
 	sh = L3ANVIL[1];
@@ -2293,7 +2293,7 @@ static void DRLG_L3LockRec(int x, int y)
 	DRLG_L3LockRec(x + 1, y);
 }
 
-BOOL DRLG_L3Lockout()
+bool DRLG_L3Lockout()
 {
 	int i, j, t, fx, fy;
 
@@ -2320,7 +2320,7 @@ BOOL DRLG_L3Lockout()
 static void DRLG_L3(int entry)
 {
 	int x1, y1, x2, y2, i, j;
-	BOOL found, genok;
+	bool found, genok;
 
 	lavapool = 0;
 

Source/drlg_l4.cpp

@@ -18,7 +18,7 @@ int diabquad4y;
 
 namespace {
 
-BOOL hallok[20];
+bool hallok[20];
 int l4holdx;
 int l4holdy;
 int SP4x1;
@@ -149,7 +149,7 @@ const BYTE L4BTYPES[140] = {
 static void DRLG_L4Shadows()
 {
 	int x, y;
-	BOOL okflag;
+	bool okflag;
 
 	for (y = 1; y < DMAXY; y++) {
 		for (x = 1; x < DMAXY; x++) {
@@ -259,7 +259,7 @@ static void L4makeDmt()
 static int L4HWallOk(int i, int j)
 {
 	int x;
-	BOOL wallok;
+	bool wallok;
 
 	for (x = 1; dungeon[i + x][j] == 6; x++) {
 		if (dflags[i + x][j] != 0) {
@@ -310,7 +310,7 @@ static int L4HWallOk(int i, int j)
 static int L4VWallOk(int i, int j)
 {
 	int y;
-	BOOL wallok;
+	bool wallok;
 
 	for (y = 1; dungeon[i][j + y] == 6; y++) {
 		if (dflags[i][j + y] != 0) {
@@ -1098,7 +1098,7 @@ static void L4drawRoom(int x, int y, int width, int height)
 	}
 }
 
-static BOOL L4checkRoom(int x, int y, int width, int height)
+static bool L4checkRoom(int x, int y, int width, int height)
 {
 	int i, j;
 
@@ -1122,7 +1122,7 @@ static BOOL L4checkRoom(int x, int y, int width, int height)
 
 static void L4roomGen(int x, int y, int w, int h, int dir)
 {
-	BOOL ran, ran2;
+	bool ran, ran2;
 	int width, height, rx, ry, ry2;
 	int cw, ch, cx1, cy1, cx2;
 
@@ -1272,7 +1272,7 @@ void DRLG_L4SetRoom(BYTE *pSetPiece, int rx1, int ry1)
 	}
 }
 
-void DRLG_LoadDiabQuads(BOOL preflag)
+void DRLG_LoadDiabQuads(bool preflag)
 {
 	BYTE *lpSetPiece;
 
@@ -1313,10 +1313,10 @@ void DRLG_LoadDiabQuads(BOOL preflag)
 	mem_free_dbg(lpSetPiece);
 }
 
-static BOOL DRLG_L4PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, BOOL setview, int ldir)
+static bool DRLG_L4PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir)
 {
 	int sx, sy, sw, sh, xx, yy, i, ii, numt, bailcnt;
-	BOOL found;
+	bool found;
 
 	sw = miniset[0];
 	sh = miniset[1];
@@ -1474,7 +1474,7 @@ static void DRLG_L4FloodTVal()
 #pragma GCC pop_options
 #endif
 
-BOOL IsDURWall(char d)
+bool IsDURWall(char d)
 {
 	if (d == 25) {
 		return TRUE;
@@ -1489,7 +1489,7 @@ BOOL IsDURWall(char d)
 	return FALSE;
 }
 
-BOOL IsDLLWall(char dd)
+bool IsDLLWall(char dd)
 {
 	if (dd == 27) {
 		return TRUE;
@@ -1592,7 +1592,7 @@ void DRLG_L4GeneralFix()
 static void DRLG_L4(int entry)
 {
 	int i, j, spi, spj, ar;
-	BOOL doneflag;
+	bool doneflag;
 
 	do {
 		DRLG_InitTrans();

Source/drlg_l4.h

@@ -19,8 +19,8 @@ extern int diabquad3x;
 extern int diabquad3y;
 extern int diabquad4x;
 extern int diabquad4y;
-BOOL IsDURWall(char d);
-BOOL IsDLLWall(char dd);
+bool IsDURWall(char d);
+bool IsDLLWall(char dd);
 void CreateL4Dungeon(DWORD rseed, int entry);
 
 #ifdef __cplusplus

Source/effects.cpp

@@ -1058,7 +1058,7 @@ TSFX sgSFX[] = {
 	// clang-format on
 };
 
-BOOL effect_is_playing(int nSFX)
+bool effect_is_playing(int nSFX)
 {
 	TSFX *sfx = &sgSFX[nSFX];
 	if (sfx->pSnd)
@@ -1082,7 +1082,7 @@ void stream_stop()
 
 static void stream_play(TSFX *pSFX, int lVolume, int lPan)
 {
-	BOOL success;
+	bool success;
 #ifndef DISABLE_STREAMING_SOUNDS
 	constexpr bool kAllowStreaming = true;
 #else
@@ -1162,7 +1162,7 @@ void FreeMonsterSnd()
 	}
 }
 
-BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan)
+bool calc_snd_position(int x, int y, int *plVolume, int *plPan)
 {
 	int pan, volume;
 
@@ -1187,7 +1187,7 @@ BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan)
 	return TRUE;
 }
 
-static void PlaySFX_priv(TSFX *pSFX, BOOL loc, int x, int y)
+static void PlaySFX_priv(TSFX *pSFX, bool loc, int x, int y)
 {
 	int lPan, lVolume;
 

Source/effects.h

@@ -1065,11 +1065,11 @@ struct TSFX {
 extern int sfxdelay;
 extern _sfx_id sfxdnum;
 
-BOOL effect_is_playing(int nSFX);
+bool effect_is_playing(int nSFX);
 void stream_stop();
 void InitMonsterSND(int monst);
 void FreeMonsterSnd();
-BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan);
+bool calc_snd_position(int x, int y, int *plVolume, int *plPan);
 void PlayEffect(int i, int mode);
 void PlaySFX(_sfx_id psfx, bool randomizeByCategory = true);
 void PlaySfxLoc(_sfx_id psfx, int x, int y);

Source/engine.cpp

@@ -224,7 +224,7 @@ void CelBlitLightSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pRLEBytes, in
 void CelBlitLightTransSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth)
 {
 	int w;
-	BOOL shift;
+	bool shift;
 	BYTE *tbl;
 
 	assert(pRLEBytes != NULL);

Source/gamemenu.cpp

@@ -66,7 +66,7 @@ const char *const color_cycling_toggle_names[] = { "Color Cycling Off", "Color C
 
 static void gamemenu_update_single(TMenuItem *pMenuItems)
 {
-	BOOL enable;
+	bool enable;
 
 	gmenu_enable(&sgSingleMenu[3], gbValidSaveFile);
 
@@ -105,12 +105,12 @@ void gamemenu_handle_previous()
 		gamemenu_on();
 }
 
-void gamemenu_previous(BOOL bActivate)
+void gamemenu_previous(bool bActivate)
 {
 	gamemenu_on();
 }
 
-void gamemenu_new_game(BOOL bActivate)
+void gamemenu_new_game(bool bActivate)
 {
 	int i;
 
@@ -127,13 +127,13 @@ void gamemenu_new_game(BOOL bActivate)
 	gamemenu_off();
 }
 
-void gamemenu_quit_game(BOOL bActivate)
+void gamemenu_quit_game(bool bActivate)
 {
 	gamemenu_new_game(bActivate);
 	gbRunGameResult = FALSE;
 }
 
-void gamemenu_load_game(BOOL bActivate)
+void gamemenu_load_game(bool bActivate)
 {
 	WNDPROC saveProc = SetWindowProc(DisableInputWndProc);
 	gamemenu_off();
@@ -155,7 +155,7 @@ void gamemenu_load_game(BOOL bActivate)
 	SetWindowProc(saveProc);
 }
 
-void gamemenu_save_game(BOOL bActivate)
+void gamemenu_save_game(bool bActivate)
 {
 	if (pcurs != CURSOR_HAND) {
 		return;
@@ -183,7 +183,7 @@ void gamemenu_save_game(BOOL bActivate)
 	SetWindowProc(saveProc);
 }
 
-void gamemenu_restart_town(BOOL bActivate)
+void gamemenu_restart_town(bool bActivate)
 {
 	NetSendCmd(TRUE, CMD_RETOWN);
 }
@@ -262,7 +262,7 @@ static int gamemenu_slider_gamma()
 	return gmenu_slider_get(&sgOptionsMenu[2], 30, 100);
 }
 
-void gamemenu_options(BOOL bActivate)
+void gamemenu_options(bool bActivate)
 {
 	gamemenu_get_music();
 	gamemenu_get_sound();
@@ -273,7 +273,7 @@ void gamemenu_options(BOOL bActivate)
 	gmenu_set_items(sgOptionsMenu, NULL);
 }
 
-void gamemenu_music_volume(BOOL bActivate)
+void gamemenu_music_volume(bool bActivate)
 {
 	int volume;
 
@@ -319,7 +319,7 @@ void gamemenu_music_volume(BOOL bActivate)
 	gamemenu_get_music();
 }
 
-void gamemenu_sound_volume(BOOL bActivate)
+void gamemenu_sound_volume(bool bActivate)
 {
 	int volume;
 	if (bActivate) {
@@ -347,7 +347,7 @@ void gamemenu_sound_volume(BOOL bActivate)
 	gamemenu_get_sound();
 }
 
-void gamemenu_loadjog(BOOL bActivate)
+void gamemenu_loadjog(bool bActivate)
 {
 	if (!gbIsMultiplayer) {
 		sgOptions.Gameplay.bRunInTown = !sgOptions.Gameplay.bRunInTown;
@@ -357,7 +357,7 @@ void gamemenu_loadjog(BOOL bActivate)
 	}
 }
 
-void gamemenu_gamma(BOOL bActivate)
+void gamemenu_gamma(bool bActivate)
 {
 	int gamma;
 	if (bActivate) {
@@ -374,7 +374,7 @@ void gamemenu_gamma(BOOL bActivate)
 	gamemenu_get_gamma();
 }
 
-void gamemenu_speed(BOOL bActivate)
+void gamemenu_speed(bool bActivate)
 {
 	if (bActivate) {
 		if (gnTickRate != 20)
@@ -390,7 +390,7 @@ void gamemenu_speed(BOOL bActivate)
 	gnTickDelay = 1000 / gnTickRate;
 }
 
-void gamemenu_color_cycling(BOOL bActivate)
+void gamemenu_color_cycling(bool bActivate)
 {
 	sgOptions.Graphics.bColorCycling = !sgOptions.Graphics.bColorCycling;
 	sgOptionsMenu[3].pszStr = color_cycling_toggle_names[sgOptions.Graphics.bColorCycling ? 1 : 0];

Source/gamemenu.h

@@ -16,19 +16,19 @@ extern bool gbRunInTown;
 void gamemenu_on();
 void gamemenu_off();
 void gamemenu_handle_previous();
-void gamemenu_previous(BOOL bActivate);
-void gamemenu_new_game(BOOL bActivate);
-void gamemenu_quit_game(BOOL bActivate);
-void gamemenu_load_game(BOOL bActivate);
-void gamemenu_save_game(BOOL bActivate);
-void gamemenu_restart_town(BOOL bActivate);
-void gamemenu_options(BOOL bActivate);
-void gamemenu_music_volume(BOOL bActivate);
-void gamemenu_sound_volume(BOOL bActivate);
-void gamemenu_loadjog(BOOL bActivate);
-void gamemenu_gamma(BOOL bActivate);
-void gamemenu_speed(BOOL bActivate);
-void gamemenu_color_cycling(BOOL bActivate);
+void gamemenu_previous(bool bActivate);
+void gamemenu_new_game(bool bActivate);
+void gamemenu_quit_game(bool bActivate);
+void gamemenu_load_game(bool bActivate);
+void gamemenu_save_game(bool bActivate);
+void gamemenu_restart_town(bool bActivate);
+void gamemenu_options(bool bActivate);
+void gamemenu_music_volume(bool bActivate);
+void gamemenu_sound_volume(bool bActivate);
+void gamemenu_loadjog(bool bActivate);
+void gamemenu_gamma(bool bActivate);
+void gamemenu_speed(bool bActivate);
+void gamemenu_color_cycling(bool bActivate);
 
 #ifdef __cplusplus
 }

Source/gendung.cpp

@@ -24,7 +24,7 @@ int setpc_h;
 /** Contains the contents of the single player quest DUN file. */
 BYTE *pSetPiece;
 /** Specifies whether a single player quest DUN has been loaded. */
-BOOL setloadflag;
+bool setloadflag;
 BYTE *pSpecialCels;
 /** Specifies the tile definitions of the active dungeon type; (e.g. levels/l1data/l1.til). */
 BYTE *pMegaTiles;
@@ -335,13 +335,13 @@ void Make_SetPC(int x, int y, int w, int h)
 	}
 }
 
-BOOL DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height)
+bool DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height)
 {
 	int ii, xx, yy;
 	int xSmallest, ySmallest;
 	int xArray[20], yArray[20];
 	int xCount, yCount;
-	BOOL yFlag, xFlag;
+	bool yFlag, xFlag;
 
 	yFlag = TRUE;
 	xFlag = TRUE;
@@ -579,7 +579,7 @@ void DRLG_HoldThemeRooms()
 	}
 }
 
-BOOL SkipThemeRoom(int x, int y)
+bool SkipThemeRoom(int x, int y)
 {
 	int i;
 

Source/gendung.h

@@ -60,7 +60,7 @@ extern int setpc_y;
 extern int setpc_w;
 extern int setpc_h;
 extern BYTE *pSetPiece;
-extern BOOL setloadflag;
+extern bool setloadflag;
 extern BYTE *pSpecialCels;
 extern BYTE *pMegaTiles;
 extern BYTE *pLevelPieces;
@@ -122,7 +122,7 @@ void DRLG_SetPC();
 void Make_SetPC(int x, int y, int w, int h);
 void DRLG_PlaceThemeRooms(int minSize, int maxSize, int floor, int freq, int rndSize);
 void DRLG_HoldThemeRooms();
-BOOL SkipThemeRoom(int x, int y);
+bool SkipThemeRoom(int x, int y);
 void InitLevels();
 
 }

Source/gmenu.cpp

@@ -101,12 +101,12 @@ void gmenu_init_menu()
 	optbar_cel = LoadFileInMem("Data\\optbar.CEL", NULL);
 }
 
-BOOL gmenu_is_active()
+bool gmenu_is_active()
 {
 	return sgpCurrentMenu != NULL;
 }
 
-static void gmenu_up_down(BOOL isDown)
+static void gmenu_up_down(bool isDown)
 {
 	int i;
 
@@ -136,7 +136,7 @@ static void gmenu_up_down(BOOL isDown)
 	}
 }
 
-static void gmenu_left_right(BOOL isRight)
+static void gmenu_left_right(bool isRight)
 {
 	int step, steps;
 
@@ -276,7 +276,7 @@ void gmenu_draw(CelOutputBuffer out)
 	}
 }
 
-BOOL gmenu_presskeys(int vkey)
+bool gmenu_presskeys(int vkey)
 {
 	if (!sgpCurrentMenu)
 		return FALSE;
@@ -324,7 +324,7 @@ static bool gmenu_get_mouse_slider(int *plOffset)
 	return TRUE;
 }
 
-BOOL gmenu_on_mouse_move()
+bool gmenu_on_mouse_move()
 {
 	int step, nSteps;
 
@@ -341,7 +341,7 @@ BOOL gmenu_on_mouse_move()
 	return TRUE;
 }
 
-BOOL gmenu_left_mouse(BOOL isDown)
+bool gmenu_left_mouse(bool isDown)
 {
 	TMenuItem *pItem;
 	int i, w, dummy;
@@ -390,7 +390,7 @@ BOOL gmenu_left_mouse(BOOL isDown)
 	return TRUE;
 }
 
-void gmenu_enable(TMenuItem *pMenuItem, BOOL enable)
+void gmenu_enable(TMenuItem *pMenuItem, bool enable)
 {
 	if (enable)
 		pMenuItem->dwFlags |= GMENU_ENABLED;

Source/gmenu.h

@@ -16,7 +16,7 @@ extern "C" {
 typedef struct TMenuItem {
 	Uint32 dwFlags;
 	const char *pszStr;
-	void (*fnMenu)(BOOL);
+	void (*fnMenu)(bool);
 } TMenuItem;
 
 extern TMenuItem *sgpCurrentMenu;
@@ -24,13 +24,13 @@ extern TMenuItem *sgpCurrentMenu;
 void gmenu_draw_pause(CelOutputBuffer out);
 void FreeGMenu();
 void gmenu_init_menu();
-BOOL gmenu_is_active();
+bool gmenu_is_active();
 void gmenu_set_items(TMenuItem *pItem, void (*gmFunc)(TMenuItem *));
 void gmenu_draw(CelOutputBuffer out);
-BOOL gmenu_presskeys(int vkey);
-BOOL gmenu_on_mouse_move();
-BOOL gmenu_left_mouse(BOOL isDown);
-void gmenu_enable(TMenuItem *pMenuItem, BOOL enable);
+bool gmenu_presskeys(int vkey);
+bool gmenu_on_mouse_move();
+bool gmenu_left_mouse(bool isDown);
+void gmenu_enable(TMenuItem *pMenuItem, bool enable);
 void gmenu_slider_set(TMenuItem *pItem, int min, int max, int gamma);
 int gmenu_slider_get(TMenuItem *pItem, int min, int max);
 void gmenu_slider_steps(TMenuItem *pItem, int dwTicks);

Source/help.cpp

@@ -8,7 +8,7 @@
 namespace devilution {
 
 int help_select_line;
-BOOL helpflag;
+bool helpflag;
 int HelpTop;
 
 const char gszSpawnHelpText[] = {

Source/help.h

@@ -11,7 +11,7 @@ namespace devilution {
 extern "C" {
 #endif
 
-extern BOOL helpflag;
+extern bool helpflag;
 
 void InitHelp();
 void DrawHelp(CelOutputBuffer out);

Source/inv.cpp

@@ -8,9 +8,9 @@
 
 namespace devilution {
 
-BOOL invflag;
+bool invflag;
 BYTE *pInvCels;
-BOOL drawsbarflag;
+bool drawsbarflag;
 int sgdwLastTime; // check name
 
 /**
@@ -165,7 +165,7 @@ static void InvDrawSlotBack(CelOutputBuffer out, int X, int Y, int W, int H)
 
 void DrawInv(CelOutputBuffer out)
 {
-	BOOL invtest[NUM_INV_GRID_ELEM];
+	bool invtest[NUM_INV_GRID_ELEM];
 	int frame, frame_width, color, screen_x, screen_y, i, j, ii;
 
 	CelDrawTo(out, RIGHT_PANEL_X, 351, pInvCels, 1, SPANEL_WIDTH);
@@ -994,7 +994,7 @@ bool AutoPlaceItemInInventorySlot(int playerNumber, int slotIndex, const ItemStr
 }
 
 
-BOOL GoldAutoPlace(int pnum)
+bool GoldAutoPlace(int pnum)
 {
 	bool done = false;
 
@@ -1047,7 +1047,7 @@ BOOL GoldAutoPlace(int pnum)
 	return done;
 }
 
-BOOL WeaponAutoPlace(int pnum)
+bool WeaponAutoPlace(int pnum)
 {
 	if (plr[pnum]._pClass == PC_MONK)
 		return FALSE;
@@ -1094,7 +1094,7 @@ void CheckInvPaste(int pnum, int mx, int my)
 {
 	int r, sx, sy;
 	int i, j, xx, yy, ii;
-	BOOL done, done2h;
+	bool done, done2h;
 	int il, cn, it, iv, ig, gt;
 	ItemStruct tempitem;
 
@@ -1489,7 +1489,7 @@ void CheckInvPaste(int pnum, int mx, int my)
 	}
 }
 
-void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, BOOL bId, uint32_t dwBuff)
+void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, bool bId, uint32_t dwBuff)
 {
 	PlayerStruct *p;
 
@@ -1519,7 +1519,7 @@ void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, BOOL bId, ui
 void CheckInvCut(int pnum, int mx, int my, bool automaticMove)
 {
 	int r;
-	BOOL done;
+	bool done;
 	char ii;
 	int iv, i, j, offs, ig;
 	PlayerStruct &player = plr[pnum];
@@ -2125,7 +2125,7 @@ void AutoGetItem(int pnum, ItemStruct *item, int ii)
 {
 	int i, idx;
 	int w, h;
-	BOOL done;
+	bool done;
 
 	if (pcurs != CURSOR_HAND) {
 		return;
@@ -2232,7 +2232,7 @@ void SyncGetItem(int x, int y, int idx, WORD ci, int iseed)
 	assert(FindGetItem(idx, ci, iseed) == -1);
 }
 
-BOOL CanPut(int x, int y)
+bool CanPut(int x, int y)
 {
 	char oi, oi2;
 
@@ -2269,7 +2269,7 @@ BOOL CanPut(int x, int y)
 	return TRUE;
 }
 
-BOOL TryInvPut()
+bool TryInvPut()
 {
 	int dir;
 
@@ -2307,7 +2307,7 @@ void DrawInvMsg(const char *msg)
 
 int InvPutItem(int pnum, int x, int y)
 {
-	BOOL done;
+	bool done;
 	int d;
 	int i, j, l;
 	int xx, yy;
@@ -2397,7 +2397,7 @@ int InvPutItem(int pnum, int x, int y)
 
 int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int to_hit, int max_dam, int min_str, int min_mag, int min_dex, int ac)
 {
-	BOOL done;
+	bool done;
 	int d;
 	int i, j, l;
 	int xx, yy;
@@ -2602,7 +2602,7 @@ void RemoveScroll(int pnum)
 	}
 }
 
-BOOL UseScroll()
+bool UseScroll()
 {
 	int i;
 
@@ -2642,7 +2642,7 @@ void UseStaffCharge(int pnum)
 	}
 }
 
-BOOL UseStaff()
+bool UseStaff()
 {
 	if (pcurs == CURSOR_HAND) {
 		if (!plr[myplr].InvBody[INVLOC_HAND_LEFT].isEmpty()
@@ -2669,11 +2669,11 @@ void StartGoldDrop()
 		control_reset_talk();
 }
 
-BOOL UseInvItem(int pnum, int cii)
+bool UseInvItem(int pnum, int cii)
 {
 	int c, idata;
 	ItemStruct *Item;
-	BOOL speedlist;
+	bool speedlist;
 
 	if (plr[pnum]._pInvincible && plr[pnum]._pHitPoints == 0 && pnum == myplr)
 		return TRUE;
@@ -2833,7 +2833,7 @@ int CalculateGold(int pnum)
 	return gold;
 }
 
-BOOL DropItemBeforeTrig()
+bool DropItemBeforeTrig()
 {
 	if (TryInvPut()) {
 		NetSendCmdPItem(TRUE, CMD_PUTITEM, cursmx, cursmy);

Source/inv.h

@@ -27,8 +27,8 @@ typedef struct InvXY {
 	Sint32 Y;
 } InvXY;
 
-extern BOOL invflag;
-extern BOOL drawsbarflag;
+extern bool invflag;
+extern bool drawsbarflag;
 extern const InvXY InvRect[73];
 
 void FreeInvGFX();
@@ -45,8 +45,8 @@ bool AutoEquip(int playerNumber, const ItemStruct &item, bool persistItem = true
 bool AutoPlaceItemInInventory(int playerNumber, const ItemStruct &item, bool persistItem = false);
 bool AutoPlaceItemInInventorySlot(int playerNumber, int slotIndex, const ItemStruct &item, bool persistItem);
 bool AutoPlaceItemInBelt(int playerNumber, const ItemStruct &item, bool persistItem = false);
-BOOL GoldAutoPlace(int pnum);
-void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, BOOL bId, uint32_t dwBuff);
+bool GoldAutoPlace(int pnum);
+void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, bool bId, uint32_t dwBuff);
 void inv_update_rem_item(int pnum, BYTE iv);
 void RemoveInvItem(int pnum, int iv);
 void RemoveSpdBarItem(int pnum, int iv);
@@ -57,20 +57,20 @@ void InvGetItem(int pnum, ItemStruct *item, int ii);
 void AutoGetItem(int pnum, ItemStruct *item, int ii);
 int FindGetItem(int idx, WORD ci, int iseed);
 void SyncGetItem(int x, int y, int idx, WORD ci, int iseed);
-BOOL CanPut(int x, int y);
-BOOL TryInvPut();
+bool CanPut(int x, int y);
+bool TryInvPut();
 void DrawInvMsg(const char *msg);
 int InvPutItem(int pnum, int x, int y);
 int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int to_hit, int max_dam, int min_str, int min_mag, int min_dex, int ac);
 char CheckInvHLight();
 void RemoveScroll(int pnum);
-BOOL UseScroll();
+bool UseScroll();
 void UseStaffCharge(int pnum);
-BOOL UseStaff();
-BOOL UseInvItem(int pnum, int cii);
+bool UseStaff();
+bool UseInvItem(int pnum, int cii);
 void DoTelekinesis();
 int CalculateGold(int pnum);
-BOOL DropItemBeforeTrig();
+bool DropItemBeforeTrig();
 
 /* data */
 

Source/items.cpp

@@ -565,7 +565,7 @@ void InitItemGFX()
 	memset(UniqueItemFlag, 0, sizeof(UniqueItemFlag));
 }
 
-BOOL ItemPlace(int xp, int yp)
+bool ItemPlace(int xp, int yp)
 {
 	if (dMonster[xp][yp] != 0)
 		return FALSE;
@@ -688,7 +688,7 @@ void InitItems()
 	uitemflag = FALSE;
 }
 
-void CalcPlrItemVals(int p, BOOL Loadgfx)
+void CalcPlrItemVals(int p, bool Loadgfx)
 {
 	int pvid, d;
 
@@ -1145,7 +1145,7 @@ void CalcSelfItems(int pnum)
 	int i;
 	PlayerStruct *p;
 	ItemStruct *pi;
-	BOOL sf, changeflag;
+	bool sf, changeflag;
 	int sa, ma, da;
 
 	p = &plr[pnum];
@@ -1190,7 +1190,7 @@ void CalcSelfItems(int pnum)
 	} while (changeflag);
 }
 
-static BOOL ItemMinStats(PlayerStruct *p, ItemStruct *x)
+static bool ItemMinStats(PlayerStruct *p, ItemStruct *x)
 {
 	if (p->_pMagic < x->_iMinMag)
 		return FALSE;
@@ -1257,7 +1257,7 @@ void CalcPlrBookVals(int p)
 	}
 }
 
-void CalcPlrInv(int p, BOOL Loadgfx)
+void CalcPlrInv(int p, bool Loadgfx)
 {
 	CalcPlrItemMin(p);
 	CalcSelfItems(p);
@@ -1326,7 +1326,7 @@ void GetPlrHandSeed(ItemStruct *h)
 void GetGoldSeed(int pnum, ItemStruct *h)
 {
 	int i, ii, s;
-	BOOL doneflag;
+	bool doneflag;
 
 	do {
 		doneflag = TRUE;
@@ -1508,7 +1508,7 @@ void CreatePlrItems(int p)
 	CalcPlrItemVals(p, FALSE);
 }
 
-BOOL ItemSpaceOk(int i, int j)
+bool ItemSpaceOk(int i, int j)
 {
 	int oi;
 
@@ -1551,7 +1551,7 @@ static bool GetItemSpace(int x, int y, char inum)
 {
 	int i, j, rs;
 	int xx, yy;
-	BOOL savail;
+	bool savail;
 
 	yy = 0;
 	for (j = y - 1; j <= y + 1; j++) {
@@ -1716,12 +1716,12 @@ void GetBookSpell(int i, int lvl)
 		items[i]._iCurs = ICURS_BOOK_GREY;
 }
 
-void GetStaffPower(int i, int lvl, int bs, BOOL onlygood)
+void GetStaffPower(int i, int lvl, int bs, bool onlygood)
 {
 	int l[256];
 	char istr[128];
 	int nl, j, preidx;
-	BOOL addok;
+	bool addok;
 	int tmp;
 
 	tmp = random_(15, 10);
@@ -1773,7 +1773,7 @@ void GetStaffPower(int i, int lvl, int bs, BOOL onlygood)
 	CalcItemValue(i);
 }
 
-void GetStaffSpell(int i, int lvl, BOOL onlygood)
+void GetStaffSpell(int i, int lvl, bool onlygood)
 {
 	int l, rv, minc, maxc, v;
 	char istr[68];
@@ -2336,7 +2336,7 @@ static void SaveItemSuffix(int i, int sufidx)
 	    PL_Suffix[sufidx].PLMultVal);
 }
 
-void GetItemPower(int i, int minlvl, int maxlvl, int flgs, BOOL onlygood)
+void GetItemPower(int i, int minlvl, int maxlvl, int flgs, bool onlygood)
 {
 	int pre, post, nt, nl, j, preidx, sufidx;
 	int l[256];
@@ -2427,7 +2427,7 @@ void GetItemPower(int i, int minlvl, int maxlvl, int flgs, BOOL onlygood)
 		CalcItemValue(i);
 }
 
-void GetItemBonus(int i, int idata, int minlvl, int maxlvl, BOOL onlygood, bool allowspells)
+void GetItemBonus(int i, int idata, int minlvl, int maxlvl, bool onlygood, bool allowspells)
 {
 	if (minlvl > 25)
 		minlvl = 25;
@@ -2536,7 +2536,7 @@ int RndUItem(int m)
 {
 	int i, ri;
 	int ril[512];
-	BOOL okflag;
+	bool okflag;
 
 	if (m != -1 && (monster[m].MData->mTreasure & 0x8000) != 0 && !gbIsMultiplayer)
 		return -((monster[m].MData->mTreasure & 0xFFF) + 1);
@@ -2606,7 +2606,7 @@ int RndAllItems()
 int RndTypeItems(int itype, int imid, int lvl)
 {
 	int i, ri;
-	BOOL okflag;
+	bool okflag;
 	int ril[512];
 
 	ri = 0;
@@ -2632,7 +2632,7 @@ int RndTypeItems(int itype, int imid, int lvl)
 	return ril[random_(27, ri)];
 }
 
-int CheckUnique(int i, int lvl, int uper, BOOL recreate)
+int CheckUnique(int i, int lvl, int uper, bool recreate)
 {
 	int j, idata, numu;
 	bool uok[128];
@@ -2724,7 +2724,7 @@ void ItemRndDur(int ii)
 		items[ii]._iDurability = random_(0, items[ii]._iMaxDur >> 1) + (items[ii]._iMaxDur >> 2) + 1;
 }
 
-void SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, BOOL onlygood, BOOL recreate, BOOL pregen)
+void SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, bool onlygood, bool recreate, bool pregen)
 {
 	int iblvl, uid;
 
@@ -2779,10 +2779,10 @@ void SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, BOOL onlygood,
 	SetupItem(ii);
 }
 
-void SpawnItem(int m, int x, int y, BOOL sendmsg)
+void SpawnItem(int m, int x, int y, bool sendmsg)
 {
 	int idx;
-	BOOL onlygood;
+	bool onlygood;
 
 	if (monster[m]._uniqtype || ((monster[m].MData->mTreasure & 0x8000) && gbIsMultiplayer)) {
 		idx = RndUItem(m);
@@ -2841,7 +2841,7 @@ static void SetupBaseItem(Sint32 x, Sint32 y, Sint32 idx, bool onlygood, bool se
 		DeltaAddItem(ii);
 }
 
-void CreateRndItem(int x, int y, BOOL onlygood, BOOL sendmsg, BOOL delta)
+void CreateRndItem(int x, int y, bool onlygood, bool sendmsg, bool delta)
 {
 	int idx = onlygood ? RndUItem(-1) : RndAllItems();
 
@@ -2895,7 +2895,7 @@ void SetupAllUseful(int ii, int iseed, int lvl)
 	SetupItem(ii);
 }
 
-void CreateRndUseful(int pnum, int x, int y, BOOL sendmsg)
+void CreateRndUseful(int pnum, int x, int y, bool sendmsg)
 {
 	if (numitems >= MAXITEMS)
 		return;
@@ -2909,7 +2909,7 @@ void CreateRndUseful(int pnum, int x, int y, BOOL sendmsg)
 		NetSendCmdDItem(FALSE, ii);
 }
 
-void CreateTypeItem(int x, int y, BOOL onlygood, int itype, int imisc, BOOL sendmsg, BOOL delta)
+void CreateTypeItem(int x, int y, bool onlygood, int itype, int imisc, bool sendmsg, bool delta)
 {
 	int idx;
 
@@ -3182,7 +3182,7 @@ void SpawnTheodore(int xx, int yy)
 	SpawnRewardItem(IDI_THEODORE, xx, yy);
 }
 
-void RespawnItem(ItemStruct *item, BOOL FlipFlag)
+void RespawnItem(ItemStruct *item, bool FlipFlag)
 {
 	int it;
 
@@ -3406,7 +3406,7 @@ void DoRecharge(int pnum, int cii)
 		SetCursor_(CURSOR_HAND);
 }
 
-static BOOL OilItem(ItemStruct *x, PlayerStruct *p)
+static bool OilItem(ItemStruct *x, PlayerStruct *p)
 {
 	int dur, r;
 
@@ -3993,7 +3993,7 @@ static void DrawUTextBack(CelOutputBuffer out)
 	DrawHalfTransparentRectTo(out, RIGHT_PANEL_X - SPANEL_WIDTH + 27, 28, 265, 297);
 }
 
-void PrintUString(CelOutputBuffer out, int x, int y, BOOL cjustflag, const char *str, text_color col)
+void PrintUString(CelOutputBuffer out, int x, int y, bool cjustflag, const char *str, text_color col)
 {
 	int len, width, sx, sy, i, k;
 	BYTE c;
@@ -4448,9 +4448,9 @@ void UseItem(int p, item_misc_id Mid, spell_id spl)
 	}
 }
 
-BOOL StoreStatOk(ItemStruct *h)
+bool StoreStatOk(ItemStruct *h)
 {
-	BOOL sf;
+	bool sf;
 
 	sf = TRUE;
 	if (plr[myplr]._pStrength < h->_iMinStr)
@@ -4463,9 +4463,9 @@ BOOL StoreStatOk(ItemStruct *h)
 	return sf;
 }
 
-BOOL SmithItemOk(int i)
+bool SmithItemOk(int i)
 {
-	BOOL rv;
+	bool rv;
 
 	rv = TRUE;
 	if (AllItemsList[i].itype == ITYPE_MISC)
@@ -4519,7 +4519,7 @@ void BubbleSwapItem(ItemStruct *a, ItemStruct *b)
 void SortSmith()
 {
 	int j, k;
-	BOOL sorted;
+	bool sorted;
 
 	j = 0;
 	while (!smithitem[j + 1].isEmpty()) {
@@ -4576,9 +4576,9 @@ void SpawnSmith(int lvl)
 	items[0] = holditem;
 }
 
-BOOL PremiumItemOk(int i)
+bool PremiumItemOk(int i)
 {
-	BOOL rv;
+	bool rv;
 
 	rv = TRUE;
 	if (AllItemsList[i].itype == ITYPE_MISC)
@@ -4764,9 +4764,9 @@ void SpawnPremium(int pnum)
 	}
 }
 
-BOOL WitchItemOk(int i)
+bool WitchItemOk(int i)
 {
-	BOOL rv;
+	bool rv;
 
 	rv = FALSE;
 	if (AllItemsList[i].itype == ITYPE_MISC)
@@ -4817,7 +4817,7 @@ int RndWitchItem(int lvl)
 void SortWitch()
 {
 	int j, k;
-	BOOL sorted;
+	bool sorted;
 
 	j = 3;
 	while (!witchitem[j + 1].isEmpty()) {
@@ -5083,7 +5083,7 @@ void SpawnBoy(int lvl)
 	}
 }
 
-BOOL HealerItemOk(int i)
+bool HealerItemOk(int i)
 {
 	if (AllItemsList[i].itype != ITYPE_MISC)
 		return FALSE;
@@ -5135,7 +5135,7 @@ int RndHealerItem(int lvl)
 void SortHealer()
 {
 	int j, k;
-	BOOL sorted;
+	bool sorted;
 
 	j = 2;
 	while (!healitem[j + 1].isEmpty()) {
@@ -5337,7 +5337,7 @@ int ItemNoFlippy()
 	return r;
 }
 
-void CreateSpellBook(int x, int y, spell_id ispell, BOOL sendmsg, BOOL delta)
+void CreateSpellBook(int x, int y, spell_id ispell, bool sendmsg, bool delta)
 {
 	int lvl = currlevel;
 
@@ -5368,7 +5368,7 @@ void CreateSpellBook(int x, int y, spell_id ispell, BOOL sendmsg, BOOL delta)
 		DeltaAddItem(ii);
 }
 
-static void CreateMagicItem(int x, int y, int lvl, int imisc, int imid, int icurs, BOOL sendmsg, BOOL delta)
+static void CreateMagicItem(int x, int y, int lvl, int imisc, int imid, int icurs, bool sendmsg, bool delta)
 {
 	if (numitems >= MAXITEMS)
 		return;
@@ -5392,18 +5392,18 @@ static void CreateMagicItem(int x, int y, int lvl, int imisc, int imid, int icur
 		DeltaAddItem(ii);
 }
 
-void CreateMagicArmor(int x, int y, int imisc, int icurs, BOOL sendmsg, BOOL delta)
+void CreateMagicArmor(int x, int y, int imisc, int icurs, bool sendmsg, bool delta)
 {
 	int lvl = items_get_currlevel();
 	CreateMagicItem(x, y, lvl, imisc, IMISC_NONE, icurs, sendmsg, delta);
 }
 
-void CreateAmulet(int x, int y, int lvl, BOOL sendmsg, BOOL delta)
+void CreateAmulet(int x, int y, int lvl, bool sendmsg, bool delta)
 {
 	CreateMagicItem(x, y, lvl, ITYPE_AMULET, IMISC_AMULET, ICURS_AMULET, sendmsg, delta);
 }
 
-void CreateMagicWeapon(int x, int y, int imisc, int icurs, BOOL sendmsg, BOOL delta)
+void CreateMagicWeapon(int x, int y, int imisc, int icurs, bool sendmsg, bool delta)
 {
 	int imid = IMISC_NONE;
 	if (imisc == ITYPE_STAFF)
@@ -5428,7 +5428,7 @@ static void NextItemRecord(int i)
 	itemrecord[i].nIndex = itemrecord[gnNumGetRecords].nIndex;
 }
 
-BOOL GetItemRecord(int nSeed, WORD wCI, int nIndex)
+bool GetItemRecord(int nSeed, WORD wCI, int nIndex)
 {
 	int i;
 	DWORD dwTicks;

Source/items.h

@@ -271,29 +271,29 @@ bool IsItemAvailable(int i);
 bool IsUniqueAvailable(int i);
 void InitItemGFX();
 void InitItems();
-void CalcPlrItemVals(int p, BOOL Loadgfx);
+void CalcPlrItemVals(int p, bool Loadgfx);
 void CalcPlrScrolls(int p);
 void CalcPlrStaff(int p);
-void CalcPlrInv(int p, BOOL Loadgfx);
+void CalcPlrInv(int p, bool Loadgfx);
 void SetPlrHandItem(ItemStruct *h, int idata);
 void GetPlrHandSeed(ItemStruct *h);
 void GetGoldSeed(int pnum, ItemStruct *h);
 int GetGoldCursor(int value);
 void SetPlrHandGoldCurs(ItemStruct *h);
 void CreatePlrItems(int p);
-BOOL ItemSpaceOk(int i, int j);
+bool ItemSpaceOk(int i, int j);
 int AllocateItem();
 void GetSuperItemLoc(int x, int y, int *xx, int *yy);
 void GetItemAttrs(int i, int idata, int lvl);
 void SaveItemPower(int i, item_effect_type power, int param1, int param2, int minval, int maxval, int multval);
-void GetItemPower(int i, int minlvl, int maxlvl, int flgs, BOOL onlygood);
+void GetItemPower(int i, int minlvl, int maxlvl, int flgs, bool onlygood);
 void SetupItem(int i);
 int RndItem(int m);
 void SpawnUnique(int uid, int x, int y);
-void SpawnItem(int m, int x, int y, BOOL sendmsg);
-void CreateRndItem(int x, int y, BOOL onlygood, BOOL sendmsg, BOOL delta);
-void CreateRndUseful(int pnum, int x, int y, BOOL sendmsg);
-void CreateTypeItem(int x, int y, BOOL onlygood, int itype, int imisc, BOOL sendmsg, BOOL delta);
+void SpawnItem(int m, int x, int y, bool sendmsg);
+void CreateRndItem(int x, int y, bool onlygood, bool sendmsg, bool delta);
+void CreateRndUseful(int pnum, int x, int y, bool sendmsg);
+void CreateTypeItem(int x, int y, bool onlygood, int itype, int imisc, bool sendmsg, bool delta);
 void RecreateItem(int ii, int idx, WORD icreateinfo, int iseed, int ivalue, bool isHellfire);
 void RecreateEar(int ii, WORD ic, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff);
 void items_427A72();
@@ -304,7 +304,7 @@ void SpawnRewardItem(int itemid, int xx, int yy);
 void SpawnMapOfDoom(int xx, int yy);
 void SpawnRuneBomb(int xx, int yy);
 void SpawnTheodore(int xx, int yy);
-void RespawnItem(ItemStruct *item, BOOL FlipFlag);
+void RespawnItem(ItemStruct *item, bool FlipFlag);
 void DeleteItem(int ii, int i);
 void ProcessItems();
 void FreeItemGFX();
@@ -319,7 +319,7 @@ void DrawUniqueInfo(CelOutputBuffer out);
 void PrintItemDetails(ItemStruct *x);
 void PrintItemDur(ItemStruct *x);
 void UseItem(int p, item_misc_id Mid, spell_id spl);
-BOOL StoreStatOk(ItemStruct *h);
+bool StoreStatOk(ItemStruct *h);
 void SpawnSmith(int lvl);
 void SpawnPremium(int pnum);
 void WitchBookLevel(int ii);
@@ -330,11 +330,11 @@ void SpawnStoreGold();
 void RecreateTownItem(int ii, int idx, WORD icreateinfo, int iseed, int ivalue);
 void RecalcStoreStats();
 int ItemNoFlippy();
-void CreateSpellBook(int x, int y, spell_id ispell, BOOL sendmsg, BOOL delta);
-void CreateMagicArmor(int x, int y, int imisc, int icurs, BOOL sendmsg, BOOL delta);
-void CreateAmulet(int x, int y, int curlv, BOOL sendmsg, BOOL delta);
-void CreateMagicWeapon(int x, int y, int imisc, int icurs, BOOL sendmsg, BOOL delta);
-BOOL GetItemRecord(int nSeed, WORD wCI, int nIndex);
+void CreateSpellBook(int x, int y, spell_id ispell, bool sendmsg, bool delta);
+void CreateMagicArmor(int x, int y, int imisc, int icurs, bool sendmsg, bool delta);
+void CreateAmulet(int x, int y, int curlv, bool sendmsg, bool delta);
+void CreateMagicWeapon(int x, int y, int imisc, int icurs, bool sendmsg, bool delta);
+bool GetItemRecord(int nSeed, WORD wCI, int nIndex);
 void SetItemRecord(int nSeed, WORD wCI, int nIndex);
 void PutItemRecord(int nSeed, WORD wCI, int nIndex);
 

Source/lighting.cpp

@@ -12,14 +12,14 @@ BYTE lightactive[MAXLIGHTS];
 LightListStruct LightList[MAXLIGHTS];
 int numlights;
 BYTE lightradius[16][128];
-BOOL dovision;
+bool dovision;
 int numvision;
 char lightmax;
-BOOL dolighting;
+bool dolighting;
 BYTE lightblock[64][16][16];
 int visionid;
 BYTE *pLightTbl;
-BOOL lightflag;
+bool lightflag;
 
 /**
  * CrawlTable specifies X- and Y-coordinate deltas from a missile target coordinate.
@@ -668,9 +668,9 @@ void DoUnVision(int nXPos, int nYPos, int nRadius)
 	}
 }
 
-void DoVision(int nXPos, int nYPos, int nRadius, BOOL doautomap, BOOL visible)
+void DoVision(int nXPos, int nYPos, int nRadius, bool doautomap, bool visible)
 {
-	BOOL nBlockerFlag;
+	bool nBlockerFlag;
 	int nCrawlX, nCrawlY, nLineLen, nTrans;
 	int j, k, v, x1adj, x2adj, y1adj, y2adj;
 
@@ -1173,7 +1173,7 @@ void InitVision()
 	}
 }
 
-int AddVision(int x, int y, int r, BOOL mine)
+int AddVision(int x, int y, int r, bool mine)
 {
 	int vid = -1; // BUGFIX: if numvision >= MAXVISION behavior is undefined (fixed)
 
@@ -1229,7 +1229,7 @@ void ChangeVisionXY(int id, int x, int y)
 void ProcessVisionList()
 {
 	int i;
-	BOOL delflag;
+	bool delflag;
 
 	if (dovision) {
 		for (i = 0; i < numvision; i++) {

Source/lighting.h

@@ -32,14 +32,14 @@ extern LightListStruct LightList[MAXLIGHTS];
 extern int numlights;
 extern int numvision;
 extern char lightmax;
-extern BOOL dolighting;
+extern bool dolighting;
 extern int visionid;
 extern BYTE *pLightTbl;
-extern BOOL lightflag;
+extern bool lightflag;
 
 void DoLighting(int nXPos, int nYPos, int nRadius, int Lnum);
 void DoUnVision(int nXPos, int nYPos, int nRadius);
-void DoVision(int nXPos, int nYPos, int nRadius, BOOL doautomap, BOOL visible);
+void DoVision(int nXPos, int nYPos, int nRadius, bool doautomap, bool visible);
 void FreeLightTable();
 void InitLightTable();
 void MakeLightTable();
@@ -57,7 +57,7 @@ void ChangeLight(int i, int x, int y, int r);
 void ProcessLightList();
 void SavePreLighting();
 void InitVision();
-int AddVision(int x, int y, int r, BOOL mine);
+int AddVision(int x, int y, int r, bool mine);
 void ChangeVisionRadius(int id, int r);
 void ChangeVisionXY(int id, int x, int y);
 void ProcessVisionList();

Source/loadsave.cpp

@@ -978,7 +978,7 @@ void RemoveEmptyLevelItems()
  * @brief Load game state
  * @param firstflag Can be set to false if we are simply reloading the current game
  */
-void LoadGame(BOOL firstflag)
+void LoadGame(bool firstflag)
 {
 	FreeGameMem();
 	pfile_remove_temp_files();

Source/loadsave.h

@@ -27,7 +27,7 @@ void LoadHeroItems(PlayerStruct *pPlayer);
  * @param pnum The id of the player
  */
 void RemoveEmptyInventory(int pnum);
-void LoadGame(BOOL firstflag);
+void LoadGame(bool firstflag);
 void SaveHotkeys();
 void SaveHeroItems(PlayerStruct *pPlayer);
 void SaveGame();

Source/mainmenu.cpp

@@ -34,9 +34,9 @@ void mainmenu_refresh_music()
 	} while (menu_music_track_id == TMUSIC_TOWN || menu_music_track_id == TMUSIC_L1);
 }
 
-static BOOL mainmenu_init_menu(int type)
+static bool mainmenu_init_menu(int type)
 {
-	BOOL success;
+	bool success;
 
 	if (type == SELHERO_PREVIOUS)
 		return TRUE;
@@ -50,13 +50,13 @@ static BOOL mainmenu_init_menu(int type)
 	return success;
 }
 
-static BOOL mainmenu_single_player()
+static bool mainmenu_single_player()
 {
 	gbIsMultiplayer = false;
 	return mainmenu_init_menu(SELHERO_NEW_DUNGEON);
 }
 
-static BOOL mainmenu_multi_player()
+static bool mainmenu_multi_player()
 {
 	gbIsMultiplayer = true;
 	return mainmenu_init_menu(SELHERO_CONNECT);
@@ -108,7 +108,7 @@ bool mainmenu_select_hero_dialog(GameData *gameData)
 
 void mainmenu_loop()
 {
-	BOOL done;
+	bool done;
 	int menu;
 
 	mainmenu_refresh_music();

Source/missiles.cpp

@@ -216,10 +216,10 @@ void GetDamageAmt(int i, int *mind, int *maxd)
 	}
 }
 
-BOOL CheckBlock(int fx, int fy, int tx, int ty)
+bool CheckBlock(int fx, int fy, int tx, int ty)
 {
 	int pn;
-	BOOL coll;
+	bool coll;
 
 	coll = FALSE;
 	while (fx != tx || fy != ty) {
@@ -528,10 +528,10 @@ void MoveMissilePos(int i)
 	}
 }
 
-BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift)
+bool MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift)
 {
 	int hit, hper, dam, mor;
-	BOOL resist, ret;
+	bool resist, ret;
 
 	resist = FALSE;
 	if (monster[m].mtalkmsg) {
@@ -609,10 +609,10 @@ BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift)
 	}
 }
 
-BOOL MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, bool shift)
+bool MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, bool shift)
 {
 	int hit, hper, dam, mor;
-	BOOL resist, ret;
+	bool resist, ret;
 
 	resist = FALSE;
 	if (monster[m].mtalkmsg
@@ -735,7 +735,7 @@ BOOL MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, bool
 	return FALSE;
 }
 
-BOOL PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool shift, int earflag, bool *blocked)
+bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool shift, int earflag, bool *blocked)
 {
 	int hit, hper, tac, dam, blk, blkper, resper;
 	*blocked = false;
@@ -903,7 +903,7 @@ BOOL PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s
 	return FALSE;
 }
 
-BOOL Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, bool shift, bool *blocked)
+bool Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, bool shift, bool *blocked)
 {
 	int dam, blk, blkper, hper, hit, resper;
 
@@ -1027,7 +1027,7 @@ BOOL Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, b
 	return FALSE;
 }
 
-void CheckMissileCol(int i, int mindam, int maxdam, BOOL shift, int mx, int my, bool nodel)
+void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, bool nodel)
 {
 	int oi;
 	bool blocked;
@@ -1594,7 +1594,7 @@ void AddJester(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid
 void AddStealPotions(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam)
 {
 	int i, l, k, j, tx, ty, si, ii, pnum;
-	BOOL hasPlayedSFX;
+	bool hasPlayedSFX;
 
 	missile[mi]._misource = id;
 	for (i = 0; i < 3; i++) {
@@ -2431,7 +2431,7 @@ void AddWeapexp(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mi
 	missile[mi]._mirange = missile[mi]._miAnimLen - 1;
 }
 
-BOOL CheckIfTrig(int x, int y)
+bool CheckIfTrig(int x, int y)
 {
 	int i;
 
@@ -5118,7 +5118,7 @@ void MI_Infra(Sint32 i)
 void MI_Apoca(Sint32 i)
 {
 	int j, k, id;
-	BOOL exit;
+	bool exit;
 
 	id = missile[i]._misource;
 	exit = FALSE;
@@ -5148,7 +5148,7 @@ void MI_Wave(Sint32 i)
 {
 	int sx, sy, sd, nxa, nxb, nya, nyb, dira, dirb;
 	int j, id, pn;
-	BOOL f1, f2;
+	bool f1, f2;
 	int v1, v2;
 
 	f1 = FALSE;

Source/missiles.h

@@ -76,8 +76,8 @@ int GetSpellLevel(int id, int sn);
 int GetDirection8(int x1, int y1, int x2, int y2);
 int GetDirection16(int x1, int y1, int x2, int y2);
 void DeleteMissile(int mi, int i);
-BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift);
-BOOL PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool shift, int earflag, bool *blocked);
+bool MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift);
+bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool shift, int earflag, bool *blocked);
 void SetMissAnim(int mi, int animtype);
 void SetMissDir(int mi, int dir);
 void LoadMissileGFX(BYTE mi);

Source/monster.cpp

@@ -116,7 +116,7 @@ void (*AiProc[])(int i) = {
 	&MAI_BoneDemon
 };
 
-void InitMonsterTRN(int monst, BOOL special)
+void InitMonsterTRN(int monst, bool special)
 {
 	BYTE *f;
 	int i, n, j;
@@ -167,7 +167,7 @@ void InitLevelMonsters()
 
 int AddMonsterType(_monster_id type, int placeflag)
 {
-	BOOL done = FALSE;
+	bool done = FALSE;
 	int i;
 
 	for (i = 0; i < nummtypes && !done; i++) {
@@ -593,7 +593,7 @@ void ClrAllMonsters()
 	}
 }
 
-BOOL MonstPlace(int xp, int yp)
+bool MonstPlace(int xp, int yp)
 {
 	char f;
 
@@ -660,7 +660,7 @@ void PlaceUniqueMonst(int uniqindex, int miniontype, int bosspacksize)
 	int uniqtype;
 	int count2;
 	char filestr[64];
-	BOOL zharflag, done;
+	bool zharflag, done;
 	const UniqMonstStruct *Uniq;
 	MonsterStruct *Monst;
 	int count;
@@ -888,7 +888,7 @@ void PlaceUniqueMonst(int uniqindex, int miniontype, int bosspacksize)
 static void PlaceUniques()
 {
 	int u, mt;
-	BOOL done;
+	bool done;
 
 	for (u = 0; UniqMonst[u].mtype != -1; u++) {
 		if (UniqMonst[u].mlevel != currlevel)
@@ -1218,7 +1218,7 @@ void DeleteMonster(int i)
 	monstactive[i] = temp;
 }
 
-int AddMonster(int x, int y, int dir, int mtype, BOOL InMap)
+int AddMonster(int x, int y, int dir, int mtype, bool InMap)
 {
 	if (nummonsters < MAXMONSTERS) {
 		int i = monstactive[nummonsters++];
@@ -1275,13 +1275,13 @@ void NewMonsterAnim(int i, AnimStruct *anim, int md)
 	Monst->_mdir = md;
 }
 
-BOOL M_Ranged(int i)
+bool M_Ranged(int i)
 {
 	char ai = monster[i]._mAi;
 	return ai == AI_SKELBOW || ai == AI_GOATBOW || ai == AI_SUCC || ai == AI_LAZHELP;
 }
 
-BOOL M_Talker(int i)
+bool M_Talker(int i)
 {
 	char ai = monster[i]._mAi;
 	return ai == AI_LAZURUS
@@ -1664,7 +1664,7 @@ void M_StartHit(int i, int pnum, int dam)
 	}
 }
 
-void M_DiabloDeath(int i, BOOL sendmsg)
+void M_DiabloDeath(int i, bool sendmsg)
 {
 	MonsterStruct *Monst;
 	int dist;
@@ -1705,7 +1705,7 @@ void M_DiabloDeath(int i, BOOL sendmsg)
 	Monst->_mVar6 = (int)((Monst->_mVar4 - (Monst->_my << 16)) / (double)dist);
 }
 
-void SpawnLoot(int i, BOOL sendmsg)
+void SpawnLoot(int i, bool sendmsg)
 {
 	int nSFX;
 	MonsterStruct *Monst;
@@ -1785,7 +1785,7 @@ void M2MStartHit(int mid, int i, int dam)
 	}
 }
 
-void MonstStartKill(int i, int pnum, BOOL sendmsg)
+void MonstStartKill(int i, int pnum, bool sendmsg)
 {
 	int md;
 	MonsterStruct *Monst;
@@ -1923,7 +1923,7 @@ void M_SyncStartKill(int i, int x, int y, int pnum)
 	}
 }
 
-void M_StartFadein(int i, int md, BOOL backwards)
+void M_StartFadein(int i, int md, bool backwards)
 {
 	assurance((DWORD)i < MAXMONSTERS, i);
 	assurance(monster[i].MType != NULL, i);
@@ -1944,7 +1944,7 @@ void M_StartFadein(int i, int md, BOOL backwards)
 	}
 }
 
-void M_StartFadeout(int i, int md, BOOL backwards)
+void M_StartFadeout(int i, int md, bool backwards)
 {
 	assurance((DWORD)i < MAXMONSTERS, i);
 	assurance(monster[i].MType != NULL, i);
@@ -2009,7 +2009,7 @@ void M_ChangeLightOffset(int monst)
 		ChangeLightOff(monster[monst].mlid, _mxoff, _myoff);
 }
 
-BOOL M_DoStand(int i)
+bool M_DoStand(int i)
 {
 	MonsterStruct *Monst;
 
@@ -2085,7 +2085,7 @@ bool M_DoWalk(int i, int variant)
 
 void M_TryM2MHit(int i, int mid, int hper, int mind, int maxd)
 {
-	BOOL ret;
+	bool ret;
 
 	assurance((DWORD)mid < MAXMONSTERS, mid);
 	assurance(monster[mid].MType != NULL, mid);
@@ -2282,7 +2282,7 @@ void M_TryH2HHit(int i, int pnum, int Hit, int MinDam, int MaxDam)
 	}
 }
 
-BOOL M_DoAttack(int i)
+bool M_DoAttack(int i)
 {
 	MonsterStruct *Monst;
 
@@ -2314,7 +2314,7 @@ BOOL M_DoAttack(int i)
 	return FALSE;
 }
 
-BOOL M_DoRAttack(int i)
+bool M_DoRAttack(int i)
 {
 	int multimissiles, mi;
 
@@ -2353,7 +2353,7 @@ BOOL M_DoRAttack(int i)
 	return FALSE;
 }
 
-BOOL M_DoRSpAttack(int i)
+bool M_DoRSpAttack(int i)
 {
 	commitment((DWORD)i < MAXMONSTERS, i);
 	commitment(monster[i].MType != NULL, i);
@@ -2390,7 +2390,7 @@ BOOL M_DoRSpAttack(int i)
 	return FALSE;
 }
 
-BOOL M_DoSAttack(int i)
+bool M_DoSAttack(int i)
 {
 	commitment((DWORD)i < MAXMONSTERS, i);
 	commitment(monster[i].MType != NULL, i);
@@ -2407,7 +2407,7 @@ BOOL M_DoSAttack(int i)
 	return FALSE;
 }
 
-BOOL M_DoFadein(int i)
+bool M_DoFadein(int i)
 {
 	commitment((DWORD)i < MAXMONSTERS, i);
 
@@ -2422,7 +2422,7 @@ BOOL M_DoFadein(int i)
 	return TRUE;
 }
 
-BOOL M_DoFadeout(int i)
+bool M_DoFadeout(int i)
 {
 	int mt;
 
@@ -2446,7 +2446,7 @@ BOOL M_DoFadeout(int i)
 	return TRUE;
 }
 
-BOOL M_DoHeal(int i)
+bool M_DoHeal(int i)
 {
 	MonsterStruct *Monst;
 
@@ -2472,7 +2472,7 @@ BOOL M_DoHeal(int i)
 	return FALSE;
 }
 
-BOOL M_DoTalk(int i)
+bool M_DoTalk(int i)
 {
 	MonsterStruct *Monst;
 	int tren;
@@ -2542,7 +2542,7 @@ BOOL M_DoTalk(int i)
 
 void M_Teleport(int i)
 {
-	BOOL done;
+	bool done;
 	MonsterStruct *Monst;
 	int k, j, x, y, _mx, _my, rx, ry;
 
@@ -2582,7 +2582,7 @@ void M_Teleport(int i)
 	}
 }
 
-BOOL M_DoGotHit(int i)
+bool M_DoGotHit(int i)
 {
 	commitment((DWORD)i < MAXMONSTERS, i);
 	commitment(monster[i].MType != NULL, i);
@@ -2615,7 +2615,7 @@ void M_UpdateLeader(int i)
 
 void DoEnding()
 {
-	BOOL bMusicOn;
+	bool bMusicOn;
 	int musicVolume;
 
 	if (gbIsMultiplayer) {
@@ -2686,7 +2686,7 @@ void PrepDoEnding()
 	}
 }
 
-BOOL M_DoDeath(int i)
+bool M_DoDeath(int i)
 {
 	int x, y;
 
@@ -2726,7 +2726,7 @@ BOOL M_DoDeath(int i)
 	return FALSE;
 }
 
-BOOL M_DoSpStand(int i)
+bool M_DoSpStand(int i)
 {
 	commitment((DWORD)i < MAXMONSTERS, i);
 	commitment(monster[i].MType != NULL, i);
@@ -2742,7 +2742,7 @@ BOOL M_DoSpStand(int i)
 	return FALSE;
 }
 
-BOOL M_DoDelay(int i)
+bool M_DoDelay(int i)
 {
 	int oFrame;
 
@@ -2765,7 +2765,7 @@ BOOL M_DoDelay(int i)
 	return FALSE;
 }
 
-BOOL M_DoStone(int i)
+bool M_DoStone(int i)
 {
 	commitment((DWORD)i < MAXMONSTERS, i);
 
@@ -2815,7 +2815,7 @@ void M_WalkDir(int i, int md)
 void GroupUnity(int i)
 {
 	int leader, m, j;
-	BOOL clear;
+	bool clear;
 
 	assurance((DWORD)i < MAXMONSTERS, i);
 
@@ -2870,10 +2870,10 @@ void GroupUnity(int i)
 	}
 }
 
-BOOL M_CallWalk(int i, int md)
+bool M_CallWalk(int i, int md)
 {
 	int mdtemp;
-	BOOL ok;
+	bool ok;
 
 	mdtemp = md;
 	ok = DirOK(i, md);
@@ -2894,10 +2894,10 @@ BOOL M_CallWalk(int i, int md)
 	return ok;
 }
 
-BOOL M_PathWalk(int i)
+bool M_PathWalk(int i)
 {
 	Sint8 path[MAX_PATH_LENGTH];
-	BOOL(*Check)
+	bool(*Check)
 	(int, int, int);
 
 	/** Maps from walking path step to facing direction. */
@@ -2917,9 +2917,9 @@ BOOL M_PathWalk(int i)
 	return FALSE;
 }
 
-BOOL M_CallWalk2(int i, int md)
+bool M_CallWalk2(int i, int md)
 {
-	BOOL ok;
+	bool ok;
 	int mdtemp;
 
 	mdtemp = md;
@@ -2936,9 +2936,9 @@ BOOL M_CallWalk2(int i, int md)
 	return ok;
 }
 
-BOOL M_DumbWalk(int i, int md)
+bool M_DumbWalk(int i, int md)
 {
-	BOOL ok;
+	bool ok;
 	ok = DirOK(i, md);
 	if (ok)
 		M_WalkDir(i, md);
@@ -2946,10 +2946,10 @@ BOOL M_DumbWalk(int i, int md)
 	return ok;
 }
 
-BOOL M_RoundWalk(int i, int md, Sint32 *dir)
+bool M_RoundWalk(int i, int md, Sint32 *dir)
 {
 	int mdtemp;
-	BOOL ok;
+	bool ok;
 	if (*dir)
 		md = left[left[md]];
 	else
@@ -3051,10 +3051,10 @@ void MAI_SkelSd(int i)
 		Monst->_mAnimData = Monst->MType->Anims[MA_STAND].Data[md];
 }
 
-BOOL MAI_Path(int i)
+bool MAI_Path(int i)
 {
 	MonsterStruct *Monst;
-	BOOL clear;
+	bool clear;
 
 	commitment((DWORD)i < MAXMONSTERS, i);
 
@@ -3241,7 +3241,7 @@ void MAI_SkelBow(int i)
 {
 	MonsterStruct *Monst;
 	int mx, my, md, v;
-	BOOL walking;
+	bool walking;
 
 	walking = FALSE;
 	assurance((DWORD)i < MAXMONSTERS, i);
@@ -3535,7 +3535,7 @@ void MAI_Cleaver(int i)
 		Monst->_mAnimData = Monst->MType->Anims[MA_STAND].Data[md];
 }
 
-void MAI_Round(int i, BOOL special)
+void MAI_Round(int i, bool special)
 {
 	MonsterStruct *Monst;
 	int fx, fy;
@@ -3598,7 +3598,7 @@ void MAI_GoatMc(int i)
 	MAI_Round(i, TRUE);
 }
 
-void MAI_Ranged(int i, int missile_type, BOOL special)
+void MAI_Ranged(int i, int missile_type, bool special)
 {
 	int md;
 	int fx, fy, mx, my;
@@ -3691,7 +3691,7 @@ void MAI_Torchant(int i)
 
 void MAI_Scav(int i)
 {
-	BOOL done;
+	bool done;
 	int x, y;
 	MonsterStruct *Monst;
 
@@ -3826,7 +3826,7 @@ void MAI_Garg(int i)
 	MAI_Round(i, FALSE);
 }
 
-void MAI_RoundRanged(int i, int missile_type, BOOL checkdoors, int dam, int lessmissiles)
+void MAI_RoundRanged(int i, int missile_type, bool checkdoors, int dam, int lessmissiles)
 {
 	MonsterStruct *Monst;
 	int mx, my;
@@ -3991,7 +3991,7 @@ void MAI_Golum(int i)
 	int mx, my, _mex, _mey;
 	int md, j, k, _menemy;
 	MonsterStruct *Monst;
-	BOOL have_enemy, ok;
+	bool have_enemy, ok;
 
 	assurance((DWORD)i < MAXMONSTERS, i);
 
@@ -4659,7 +4659,7 @@ void DeleteMonsterList()
 void ProcessMonsters()
 {
 	int i, mi, mx, my, _menemy;
-	BOOL raflag;
+	bool raflag;
 	MonsterStruct *Monst;
 
 	DeleteMonsterList();
@@ -4823,7 +4823,7 @@ void FreeMonsters()
 	FreeMissiles2();
 }
 
-BOOL DirOK(int i, int mdir)
+bool DirOK(int i, int mdir)
 {
 	int fx, fy;
 	int x, y;
@@ -4877,24 +4877,24 @@ BOOL DirOK(int i, int mdir)
 	return mcount == monster[i].packsize;
 }
 
-BOOL PosOkMissile(int x, int y)
+bool PosOkMissile(int x, int y)
 {
 	return !nMissileTable[dPiece[x][y]] && !(dFlags[x][y] & BFLAG_MONSTLR);
 }
 
-BOOL CheckNoSolid(int x, int y)
+bool CheckNoSolid(int x, int y)
 {
 	return nSolidTable[dPiece[x][y]] == FALSE;
 }
 
-BOOL LineClearF(BOOL (*Clear)(int, int), int x1, int y1, int x2, int y2)
+bool LineClearF(bool (*Clear)(int, int), int x1, int y1, int x2, int y2)
 {
 	int xorg, yorg;
 	int dx, dy;
 	int d;
 	int xincD, yincD, dincD, dincH;
 	int tmp;
-	BOOL done = FALSE;
+	bool done = FALSE;
 
 	xorg = x1;
 	yorg = y1;
@@ -4968,19 +4968,19 @@ BOOL LineClearF(BOOL (*Clear)(int, int), int x1, int y1, int x2, int y2)
 	return x1 == x2 && y1 == y2;
 }
 
-BOOL LineClear(int x1, int y1, int x2, int y2)
+bool LineClear(int x1, int y1, int x2, int y2)
 {
 	return LineClearF(PosOkMissile, x1, y1, x2, y2);
 }
 
-BOOL LineClearF1(BOOL (*Clear)(int, int, int), int monst, int x1, int y1, int x2, int y2)
+bool LineClearF1(bool (*Clear)(int, int, int), int monst, int x1, int y1, int x2, int y2)
 {
 	int dx, dy;
 	int d;
 	int xorg, yorg;
 	int xincD, yincD, dincD, dincH;
 	int tmp;
-	BOOL done = FALSE;
+	bool done = FALSE;
 
 	xorg = x1;
 	yorg = y1;
@@ -5356,10 +5356,10 @@ void MissToMonst(int i, int x, int y)
 	}
 }
 
-BOOL PosOkMonst(int i, int x, int y)
+bool PosOkMonst(int i, int x, int y)
 {
 	int oi, mi, j;
-	BOOL ret, fire;
+	bool ret, fire;
 
 	ret = !SolidLoc(x, y) && dPlayer[x][y] == 0 && dMonster[x][y] == 0;
 	if (ret && dObject[x][y] != 0) {
@@ -5413,10 +5413,10 @@ bool monster_posok(int i, int x, int y)
 	return ret;
 }
 
-BOOL PosOkMonst2(int i, int x, int y)
+bool PosOkMonst2(int i, int x, int y)
 {
 	int oi, mi, j;
-	BOOL ret, fire;
+	bool ret, fire;
 
 	ret = !SolidLoc(x, y);
 	if (ret && dObject[x][y] != 0) {
@@ -5430,7 +5430,7 @@ BOOL PosOkMonst2(int i, int x, int y)
 	return ret;
 }
 
-BOOL PosOkMonst3(int i, int x, int y)
+bool PosOkMonst3(int i, int x, int y)
 {
 	int j, oi, objtype, mi;
 	bool ret, fire, isdoor;
@@ -5457,14 +5457,14 @@ BOOL PosOkMonst3(int i, int x, int y)
 	return ret;
 }
 
-BOOL IsSkel(int mt)
+bool IsSkel(int mt)
 {
 	return (mt >= MT_WSKELAX && mt <= MT_XSKELAX)
 	    || (mt >= MT_WSKELBW && mt <= MT_XSKELBW)
 	    || (mt >= MT_WSKELSD && mt <= MT_XSKELSD);
 }
 
-BOOL IsGoat(int mt)
+bool IsGoat(int mt)
 {
 	return (mt >= MT_NGOATMC && mt <= MT_GGOATMC)
 	    || (mt >= MT_NGOATBW && mt <= MT_GGOATBW);
@@ -5509,10 +5509,10 @@ void ActivateSpawn(int i, int x, int y, int dir)
 	M_StartSpStand(i, dir);
 }
 
-BOOL SpawnSkeleton(int ii, int x, int y)
+bool SpawnSkeleton(int ii, int x, int y)
 {
 	int dx, dy, xx, yy, dir, j, k, rs;
-	BOOL savail;
+	bool savail;
 	int monstok[3][3];
 
 	if (ii == -1)
@@ -5651,7 +5651,7 @@ void SpawnGolum(int i, int x, int y, int mi)
 	}
 }
 
-BOOL CanTalkToMonst(int m)
+bool CanTalkToMonst(int m)
 {
 	commitment((DWORD)m < MAXMONSTERS, m);
 
@@ -5662,7 +5662,7 @@ BOOL CanTalkToMonst(int m)
 	return monster[m]._mgoal == MGOAL_TALKING;
 }
 
-BOOL CheckMonsterHit(int m, BOOL *ret)
+bool CheckMonsterHit(int m, bool *ret)
 {
 	commitment((DWORD)m < MAXMONSTERS, m);
 

Source/monster.h

@@ -205,9 +205,9 @@ void PlaceGroup(int mtype, int num, int leaderf, int leader);
 void InitMonsters();
 void SetMapMonsters(BYTE *pMap, int startx, int starty);
 void DeleteMonster(int i);
-int AddMonster(int x, int y, int dir, int mtype, BOOL InMap);
+int AddMonster(int x, int y, int dir, int mtype, bool InMap);
 void monster_43C785(int i);
-BOOL M_Talker(int i);
+bool M_Talker(int i);
 void M_StartStand(int i, int md);
 void M_ClearSquares(int i);
 void M_GetKnockback(int i);
@@ -229,9 +229,9 @@ void MAI_Sneak(int i);
 void MAI_Fireman(int i);
 void MAI_Fallen(int i);
 void MAI_Cleaver(int i);
-void MAI_Round(int i, BOOL special);
+void MAI_Round(int i, bool special);
 void MAI_GoatMc(int i);
-void MAI_Ranged(int i, int missile_type, BOOL special);
+void MAI_Ranged(int i, int missile_type, bool special);
 void MAI_GoatBow(int i);
 void MAI_Succ(int i);
 void MAI_Lich(int i);
@@ -243,7 +243,7 @@ void MAI_Firebat(int i);
 void MAI_Torchant(int i);
 void MAI_Scav(int i);
 void MAI_Garg(int i);
-void MAI_RoundRanged(int i, int missile_type, BOOL checkdoors, int dam, int lessmissiles);
+void MAI_RoundRanged(int i, int missile_type, bool checkdoors, int dam, int lessmissiles);
 void MAI_Magma(int i);
 void MAI_Storm(int i);
 void MAI_BoneDemon(int i);
@@ -265,30 +265,30 @@ void MAI_Warlord(int i);
 void DeleteMonsterList();
 void ProcessMonsters();
 void FreeMonsters();
-BOOL DirOK(int i, int mdir);
-BOOL PosOkMissile(int x, int y);
-BOOL CheckNoSolid(int x, int y);
-BOOL LineClearF(BOOL (*Clear)(int, int), int x1, int y1, int x2, int y2);
-BOOL LineClear(int x1, int y1, int x2, int y2);
-BOOL LineClearF1(BOOL (*Clear)(int, int, int), int monst, int x1, int y1, int x2, int y2);
+bool DirOK(int i, int mdir);
+bool PosOkMissile(int x, int y);
+bool CheckNoSolid(int x, int y);
+bool LineClearF(bool (*Clear)(int, int), int x1, int y1, int x2, int y2);
+bool LineClear(int x1, int y1, int x2, int y2);
+bool LineClearF1(bool (*Clear)(int, int, int), int monst, int x1, int y1, int x2, int y2);
 void SyncMonsterAnim(int i);
 void M_FallenFear(int x, int y);
 void PrintMonstHistory(int mt);
 void PrintUniqueHistory();
 void MissToMonst(int i, int x, int y);
-BOOL PosOkMonst(int i, int x, int y);
+bool PosOkMonst(int i, int x, int y);
 bool monster_posok(int i, int x, int y);
-BOOL PosOkMonst2(int i, int x, int y);
-BOOL PosOkMonst3(int i, int x, int y);
-BOOL IsSkel(int mt);
-BOOL IsGoat(int mt);
+bool PosOkMonst2(int i, int x, int y);
+bool PosOkMonst3(int i, int x, int y);
+bool IsSkel(int mt);
+bool IsGoat(int mt);
 int M_SpawnSkel(int x, int y, int dir);
-BOOL SpawnSkeleton(int ii, int x, int y);
+bool SpawnSkeleton(int ii, int x, int y);
 int PreSpawnSkeleton();
 void TalktoMonster(int i);
 void SpawnGolum(int i, int x, int y, int mi);
-BOOL CanTalkToMonst(int m);
-BOOL CheckMonsterHit(int m, BOOL *ret);
+bool CanTalkToMonst(int m);
+bool CheckMonsterHit(int m, bool *ret);
 int encode_enemy(int m);
 void decode_enemy(int m, int enemy);
 

Source/movie.cpp

@@ -12,14 +12,14 @@ namespace devilution {
 /** Should the movie continue playing. */
 BYTE movie_playing;
 /** Should the movie play in a loop. */
-BOOL loop_movie;
+bool loop_movie;
 
 /**
  * @brief Start playback of a given video.
  * @param pszMovie The file name of the video
  * @param user_can_close Set to false to make the video unskippable.
  */
-void play_movie(const char *pszMovie, BOOL user_can_close)
+void play_movie(const char *pszMovie, bool user_can_close)
 {
 	HANDLE video_stream;
 

Source/movie.h

@@ -12,9 +12,9 @@ extern "C" {
 #endif
 
 extern BYTE movie_playing;
-extern BOOL loop_movie;
+extern bool loop_movie;
 
-void play_movie(const char *pszMovie, BOOL user_can_close);
+void play_movie(const char *pszMovie, bool user_can_close);
 
 #ifdef __cplusplus
 }

Source/mpqapi.cpp

@@ -489,7 +489,7 @@ void mpqapi_remove_hash_entry(const char *pszName)
 	}
 }
 
-void mpqapi_remove_hash_entries(BOOL (*fnGetName)(DWORD, char *))
+void mpqapi_remove_hash_entries(bool (*fnGetName)(DWORD, char *))
 {
 	DWORD dwIndex, i;
 	char pszFileName[MAX_PATH];
@@ -530,7 +530,7 @@ static _BLOCKENTRY *mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk, int
 	return pBlk;
 }
 
-static BOOL mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, DWORD dwLen, _BLOCKENTRY *pBlk)
+static bool mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, DWORD dwLen, _BLOCKENTRY *pBlk)
 {
 	const char *tmp;
 	while ((tmp = strchr(pszName, ':')))
@@ -610,7 +610,7 @@ static BOOL mpqapi_write_file_contents(const char *pszName, const BYTE *pbData,
 	return TRUE;
 }
 
-BOOL mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen)
+bool mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen)
 {
 	_BLOCKENTRY *blockEntry;
 
@@ -641,12 +641,12 @@ void mpqapi_rename(char *pszOld, char *pszNew)
 	}
 }
 
-BOOL mpqapi_has_file(const char *pszName)
+bool mpqapi_has_file(const char *pszName)
 {
 	return FetchHandle(pszName) != -1;
 }
 
-BOOL OpenMPQ(const char *pszArchive, DWORD dwChar)
+bool OpenMPQ(const char *pszArchive, DWORD dwChar)
 {
 	DWORD key;
 	_FILEHEADER fhdr;
@@ -699,7 +699,7 @@ on_error:
 	return FALSE;
 }
 
-BOOL mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, DWORD dwChar)
+bool mpqapi_flush_and_close(const char *pszArchive, bool bFree, DWORD dwChar)
 {
 	return cur_archive.Close(/*clear_tables=*/bFree);
 }

Source/mpqapi.h

@@ -40,12 +40,12 @@ typedef struct _BLOCKENTRY {
 } _BLOCKENTRY;
 
 void mpqapi_remove_hash_entry(const char *pszName);
-void mpqapi_remove_hash_entries(BOOL (*fnGetName)(DWORD, char *));
-BOOL mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen);
+void mpqapi_remove_hash_entries(bool (*fnGetName)(DWORD, char *));
+bool mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen);
 void mpqapi_rename(char *pszOld, char *pszNew);
-BOOL mpqapi_has_file(const char *pszName);
-BOOL OpenMPQ(const char *pszArchive, DWORD dwChar);
-BOOL mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, DWORD dwChar);
+bool mpqapi_has_file(const char *pszName);
+bool OpenMPQ(const char *pszArchive, DWORD dwChar);
+bool mpqapi_flush_and_close(const char *pszArchive, bool bFree, DWORD dwChar);
 
 #ifdef __cplusplus
 }

Source/msg.cpp

@@ -23,7 +23,7 @@ static DJunk sgJunk;
 static TMegaPkt *sgpMegaPkt;
 static bool sgbDeltaChanged;
 static BYTE sgbDeltaChunks;
-BOOL deltaload;
+bool deltaload;
 BYTE gbBufferMsgs;
 int dwRecCount;
 
@@ -108,7 +108,7 @@ void msg_send_drop_pkt(int pnum, int reason)
 
 static int msg_wait_for_turns()
 {
-	BOOL received;
+	bool received;
 	DWORD turns;
 
 	if (sgbDeltaChunks == 0) {
@@ -139,9 +139,9 @@ static int msg_wait_for_turns()
 	return 100 * sgbDeltaChunks / MAX_CHUNKS;
 }
 
-BOOL msg_wait_resync()
+bool msg_wait_resync()
 {
-	BOOL success;
+	bool success;
 
 	msg_get_next_packet();
 	sgbDeltaChunks = 0;
@@ -511,7 +511,7 @@ static void delta_sync_object(int oi, _cmd_id bCmd, BYTE bLevel)
 	sgLevels[bLevel].object[oi].bCmd = bCmd;
 }
 
-static BOOL delta_get_item(TCmdGItem *pI, BYTE bLevel)
+static bool delta_get_item(TCmdGItem *pI, BYTE bLevel)
 {
 	int i;
 
@@ -605,12 +605,12 @@ static void delta_put_item(TCmdPItem *pI, int x, int y, BYTE bLevel)
 	}
 }
 
-BOOL delta_portal_inited(int i)
+bool delta_portal_inited(int i)
 {
 	return sgJunk.portal[i].x == 0xFF;
 }
 
-BOOL delta_quest_inited(int i)
+bool delta_quest_inited(int i)
 {
 	return sgJunk.quests[i].qstate != 0xFF;
 }
@@ -679,7 +679,7 @@ void DeltaLoadLevel()
 	int ot;
 	int i, j, k, l;
 	int x, y, xx, yy;
-	BOOL done;
+	bool done;
 
 	if (!gbIsMultiplayer)
 		return;
@@ -829,7 +829,7 @@ void DeltaLoadLevel()
 	deltaload = FALSE;
 }
 
-void NetSendCmd(BOOL bHiPri, _cmd_id bCmd)
+void NetSendCmd(bool bHiPri, _cmd_id bCmd)
 {
 	TCmd cmd;
 
@@ -854,7 +854,7 @@ void NetSendCmdGolem(BYTE mx, BYTE my, BYTE dir, BYTE menemy, int hp, BYTE cl)
 	NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLoc(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y)
+void NetSendCmdLoc(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y)
 {
 	ALIGN_BY_1 TCmdLoc cmd;
 
@@ -867,7 +867,7 @@ void NetSendCmdLoc(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLocParam1(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1)
+void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1)
 {
 	TCmdLocParam1 cmd;
 
@@ -881,7 +881,7 @@ void NetSendCmdLocParam1(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLocParam2(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2)
+void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2)
 {
 	TCmdLocParam2 cmd;
 
@@ -896,7 +896,7 @@ void NetSendCmdLocParam2(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdLocParam3(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3)
+void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3)
 {
 	TCmdLocParam3 cmd;
 
@@ -912,7 +912,7 @@ void NetSendCmdLocParam3(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdParam1(BOOL bHiPri, _cmd_id bCmd, WORD wParam1)
+void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, WORD wParam1)
 {
 	ALIGN_BY_1 TCmdParam1 cmd;
 
@@ -924,7 +924,7 @@ void NetSendCmdParam1(BOOL bHiPri, _cmd_id bCmd, WORD wParam1)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdParam2(BOOL bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2)
+void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2)
 {
 	TCmdParam2 cmd;
 
@@ -937,7 +937,7 @@ void NetSendCmdParam2(BOOL bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdParam3(BOOL bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3)
+void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3)
 {
 	TCmdParam3 cmd;
 
@@ -951,7 +951,7 @@ void NetSendCmdParam3(BOOL bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WOR
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdQuest(BOOL bHiPri, BYTE q)
+void NetSendCmdQuest(bool bHiPri, BYTE q)
 {
 	TCmdQuest cmd;
 
@@ -966,7 +966,7 @@ void NetSendCmdQuest(BOOL bHiPri, BYTE q)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdGItem(BOOL bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii)
+void NetSendCmdGItem(bool bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii)
 {
 	TCmdGItem cmd;
 
@@ -1014,7 +1014,7 @@ void NetSendCmdGItem(BOOL bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdGItem2(BOOL usonly, _cmd_id bCmd, BYTE mast, BYTE pnum, TCmdGItem *p)
+void NetSendCmdGItem2(bool usonly, _cmd_id bCmd, BYTE mast, BYTE pnum, TCmdGItem *p)
 {
 	TCmdGItem cmd;
 
@@ -1039,7 +1039,7 @@ void NetSendCmdGItem2(BOOL usonly, _cmd_id bCmd, BYTE mast, BYTE pnum, TCmdGItem
 	multi_msg_add((BYTE *)&cmd.bCmd, sizeof(cmd));
 }
 
-BOOL NetSendCmdReq2(_cmd_id bCmd, BYTE mast, BYTE pnum, TCmdGItem *p)
+bool NetSendCmdReq2(_cmd_id bCmd, BYTE mast, BYTE pnum, TCmdGItem *p)
 {
 	TCmdGItem cmd;
 
@@ -1069,7 +1069,7 @@ void NetSendCmdExtra(TCmdGItem *p)
 	NetSendHiPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdPItem(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y)
+void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y)
 {
 	TCmdPItem cmd;
 
@@ -1112,7 +1112,7 @@ void NetSendCmdPItem(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdChItem(BOOL bHiPri, BYTE bLoc)
+void NetSendCmdChItem(bool bHiPri, BYTE bLoc)
 {
 	TCmdChItem cmd;
 
@@ -1130,7 +1130,7 @@ void NetSendCmdChItem(BOOL bHiPri, BYTE bLoc)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdDelItem(BOOL bHiPri, BYTE bLoc)
+void NetSendCmdDelItem(bool bHiPri, BYTE bLoc)
 {
 	TCmdDelItem cmd;
 
@@ -1142,7 +1142,7 @@ void NetSendCmdDelItem(BOOL bHiPri, BYTE bLoc)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdDItem(BOOL bHiPri, int ii)
+void NetSendCmdDItem(bool bHiPri, int ii)
 {
 	TCmdPItem cmd;
 
@@ -1185,7 +1185,7 @@ void NetSendCmdDItem(BOOL bHiPri, int ii)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-static BOOL i_own_level(int nReqLevel)
+static bool i_own_level(int nReqLevel)
 {
 	int i;
 
@@ -1203,7 +1203,7 @@ static BOOL i_own_level(int nReqLevel)
 	return i == myplr;
 }
 
-void NetSendCmdDamage(BOOL bHiPri, BYTE bPlr, DWORD dwDam)
+void NetSendCmdDamage(bool bHiPri, BYTE bPlr, DWORD dwDam)
 {
 	TCmdDamage cmd;
 
@@ -1216,7 +1216,7 @@ void NetSendCmdDamage(BOOL bHiPri, BYTE bPlr, DWORD dwDam)
 		NetSendLoPri((BYTE *)&cmd, sizeof(cmd));
 }
 
-void NetSendCmdMonDmg(BOOL bHiPri, WORD wMon, DWORD dwDam)
+void NetSendCmdMonDmg(bool bHiPri, WORD wMon, DWORD dwDam)
 {
 	TCmdMonDamage cmd;
 
@@ -1987,7 +1987,7 @@ static DWORD On_AWAKEGOLEM(TCmd *pCmd, int pnum)
 	else if (pnum != myplr) {
 		int i;
 		// check if this player already has an active golem
-		BOOL addGolem = TRUE;
+		bool addGolem = TRUE;
 		for (i = 0; i < nummissiles; i++) {
 			int mi = missileactive[i];
 			if (missile[mi]._mitype == MIS_GOLEM && missile[mi]._misource == pnum) {
@@ -2255,7 +2255,7 @@ static DWORD On_ACTIVATEPORTAL(TCmd *pCmd, int pnum)
 			if (currlevel == 0)
 				AddInTownPortal(pnum);
 			else if (currlevel == plr[pnum].plrlevel) {
-				BOOL addPortal = TRUE;
+				bool addPortal = TRUE;
 				for (int i = 0; i < nummissiles; i++) {
 					int mi = missileactive[i];
 					if (missile[mi]._mitype == MIS_TOWN && missile[mi]._misource == pnum) {

Source/msg.h

@@ -406,40 +406,40 @@ struct TBuffer {
 	Uint8 bData[4096];
 };
 
-extern BOOL deltaload;
+extern bool deltaload;
 extern BYTE gbBufferMsgs;
 extern int dwRecCount;
 
 void msg_send_drop_pkt(int pnum, int reason);
-BOOL msg_wait_resync();
+bool msg_wait_resync();
 void run_delta_info();
 void DeltaExportData(int pnum);
 void delta_init();
 void delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel);
 void delta_monster_hp(int mi, int hp, BYTE bLevel);
 void delta_sync_monster(const TSyncMonster *pSync, BYTE bLevel);
-BOOL delta_portal_inited(int i);
-BOOL delta_quest_inited(int i);
+bool delta_portal_inited(int i);
+bool delta_quest_inited(int i);
 void DeltaAddItem(int ii);
 void DeltaSaveLevel();
 void DeltaLoadLevel();
-void NetSendCmd(BOOL bHiPri, _cmd_id bCmd);
+void NetSendCmd(bool bHiPri, _cmd_id bCmd);
 void NetSendCmdGolem(BYTE mx, BYTE my, BYTE dir, BYTE menemy, int hp, BYTE cl);
-void NetSendCmdLoc(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y);
-void NetSendCmdLocParam1(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1);
-void NetSendCmdLocParam2(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2);
-void NetSendCmdLocParam3(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3);
-void NetSendCmdParam1(BOOL bHiPri, _cmd_id bCmd, WORD wParam1);
-void NetSendCmdParam2(BOOL bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2);
-void NetSendCmdParam3(BOOL bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3);
-void NetSendCmdQuest(BOOL bHiPri, BYTE q);
-void NetSendCmdGItem(BOOL bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii);
-void NetSendCmdPItem(BOOL bHiPri, _cmd_id bCmd, BYTE x, BYTE y);
-void NetSendCmdChItem(BOOL bHiPri, BYTE bLoc);
-void NetSendCmdDelItem(BOOL bHiPri, BYTE bLoc);
-void NetSendCmdDItem(BOOL bHiPri, int ii);
-void NetSendCmdDamage(BOOL bHiPri, BYTE bPlr, DWORD dwDam);
-void NetSendCmdMonDmg(BOOL bHiPri, WORD bMon, DWORD dwDam);
+void NetSendCmdLoc(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y);
+void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1);
+void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2);
+void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3);
+void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, WORD wParam1);
+void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2);
+void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3);
+void NetSendCmdQuest(bool bHiPri, BYTE q);
+void NetSendCmdGItem(bool bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii);
+void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y);
+void NetSendCmdChItem(bool bHiPri, BYTE bLoc);
+void NetSendCmdDelItem(bool bHiPri, BYTE bLoc);
+void NetSendCmdDItem(bool bHiPri, int ii);
+void NetSendCmdDamage(bool bHiPri, BYTE bPlr, DWORD dwDam);
+void NetSendCmdMonDmg(bool bHiPri, WORD bMon, DWORD dwDam);
 void NetSendCmdString(int pmask, const char *pszStr);
 void delta_close_portal(int pnum);
 DWORD ParseCmd(int pnum, TCmd *pCmd);

Source/multi.cpp

@@ -19,7 +19,7 @@ PkPlayerStruct netplr[MAX_PLRS];
 bool sgbPlayerTurnBitTbl[MAX_PLRS];
 bool sgbPlayerLeftGameTbl[MAX_PLRS];
 DWORD sgbSentThisCycle;
-BOOL gbShouldValidatePackage;
+bool gbShouldValidatePackage;
 BYTE gbActivePlayers;
 bool gbGameDestroyed;
 bool sgbSendDeltaTbl[MAX_PLRS];
@@ -37,7 +37,7 @@ bool gbIsMultiplayer;
 bool sgbTimeout;
 char szPlayerName[128];
 BYTE gbDeltaSender;
-BOOL sgbNetInited;
+bool sgbNetInited;
 int player_state[MAX_PLRS];
 
 /**
@@ -380,7 +380,7 @@ static void multi_begin_timeout()
 int multi_handle_delta()
 {
 	int i;
-	BOOL received;
+	bool received;
 
 	if (gbGameDestroyed) {
 		gbRunGame = FALSE;
@@ -446,7 +446,7 @@ void multi_process_network_packets()
 	TPktHdr *pkt;
 	DWORD dwMsgSize;
 	DWORD dwID;
-	BOOL cond;
+	bool cond;
 	char *data;
 
 	multi_clear_left_tbl();
@@ -636,9 +636,9 @@ static void SetupLocalCoords()
 	plr[myplr].destAction = ACTION_NONE;
 }
 
-static BOOL multi_upgrade(BOOL *pfExitProgram)
+static bool multi_upgrade(bool *pfExitProgram)
 {
-	BOOL result;
+	bool result;
 	int status;
 
 	SNetPerformUpgrade((LPDWORD)&status);
@@ -695,7 +695,7 @@ static void multi_handle_events(_SNETEVENT *pEvt)
 	}
 }
 
-static void multi_event_handler(BOOL add)
+static void multi_event_handler(bool add)
 {
 	DWORD i;
 	bool (*fn)(event_type, SEVTHANDLER);
@@ -728,7 +728,7 @@ void NetClose()
 		SDL_Delay(2000);
 }
 
-BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram)
+bool NetInit(bool bSinglePlayer, bool *pfExitProgram)
 {
 	while (1) {
 		*pfExitProgram = FALSE;
@@ -809,7 +809,7 @@ BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram)
 	return TRUE;
 }
 
-BOOL multi_init_single(GameData *gameData)
+bool multi_init_single(GameData *gameData)
 {
 	int unused;
 
@@ -829,9 +829,9 @@ BOOL multi_init_single(GameData *gameData)
 	return TRUE;
 }
 
-BOOL multi_init_multi(GameData *gameData, BOOL *pfExitProgram)
+bool multi_init_multi(GameData *gameData, bool *pfExitProgram)
 {
-	BOOL first;
+	bool first;
 	int playerId;
 
 	for (first = TRUE;; first = FALSE) {
@@ -861,7 +861,7 @@ BOOL multi_init_multi(GameData *gameData, BOOL *pfExitProgram)
 	}
 }
 
-void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, BOOL recv)
+void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, bool recv)
 {
 	const char *szEvent;
 

Source/multi.h

@@ -50,10 +50,10 @@ int multi_handle_delta();
 void multi_process_network_packets();
 void multi_send_zero_packet(int pnum, _cmd_id bCmd, BYTE *pbSrc, DWORD dwLen);
 void NetClose();
-BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram);
-BOOL multi_init_single(GameData *gameData);
-BOOL multi_init_multi(GameData *gameData, BOOL *pfExitProgram);
-void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, BOOL recv);
+bool NetInit(bool bSinglePlayer, bool *pfExitProgram);
+bool multi_init_single(GameData *gameData);
+bool multi_init_multi(GameData *gameData, bool *pfExitProgram);
+void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, bool recv);
 
 #ifdef __cplusplus
 }

Source/nthread.cpp

@@ -73,7 +73,7 @@ DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta)
 	return new_cur_turn;
 }
 
-BOOL nthread_recv_turns(BOOL *pfSendAsync)
+bool nthread_recv_turns(bool *pfSendAsync)
 {
 	*pfSendAsync = FALSE;
 	sgbPacketCountdown--;
@@ -116,7 +116,7 @@ BOOL nthread_recv_turns(BOOL *pfSendAsync)
 static unsigned int nthread_handler(void *data)
 {
 	int delta;
-	BOOL received;
+	bool received;
 
 	if (nthread_should_run) {
 		while (1) {
@@ -144,7 +144,7 @@ void nthread_set_turn_upper_bit()
 	turn_upper_bit = 0x80000000;
 }
 
-void nthread_start(BOOL set_turn_upper_bit)
+void nthread_start(bool set_turn_upper_bit)
 {
 	const char *err, *err2;
 	DWORD largestMsgSize;
@@ -213,7 +213,7 @@ void nthread_cleanup()
 	}
 }
 
-void nthread_ignore_mutex(BOOL bStart)
+void nthread_ignore_mutex(bool bStart)
 {
 	if (sghThread != NULL) {
 		if (bStart)
@@ -228,7 +228,7 @@ void nthread_ignore_mutex(BOOL bStart)
  * @brief Checks if it's time for the logic to advance
  * @return True if the engine should tick
  */
-BOOL nthread_has_500ms_passed()
+bool nthread_has_500ms_passed()
 {
 	DWORD currentTickCount;
 	int ticksElapsed;

Source/nthread.h

@@ -21,12 +21,12 @@ extern DWORD gdwNormalMsgSize;
 
 void nthread_terminate_game(const char *pszFcn);
 DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta);
-BOOL nthread_recv_turns(BOOL *pfSendAsync);
+bool nthread_recv_turns(bool *pfSendAsync);
 void nthread_set_turn_upper_bit();
-void nthread_start(BOOL set_turn_upper_bit);
+void nthread_start(bool set_turn_upper_bit);
 void nthread_cleanup();
-void nthread_ignore_mutex(BOOL bStart);
-BOOL nthread_has_500ms_passed();
+void nthread_ignore_mutex(bool bStart);
+bool nthread_has_500ms_passed();
 
 #ifdef __cplusplus
 }

Source/objects.cpp

@@ -58,8 +58,8 @@ int nobjects;
 int leverid;
 int objectavail[MAXOBJECTS];
 ObjectStruct object[MAXOBJECTS];
-BOOL InitObjFlag;
-BOOL LoadMapObjsFlag;
+bool InitObjFlag;
+bool LoadMapObjsFlag;
 int numobjfiles;
 int dword_6DE0E0;
 
@@ -2646,7 +2646,7 @@ void OperateL2RDoor(int pnum, int oi, bool sendflag)
 	}
 }
 
-void OperateL2LDoor(int pnum, int oi, BOOL sendflag)
+void OperateL2LDoor(int pnum, int oi, bool sendflag)
 {
 	int xp, yp;
 	bool dok;
@@ -4144,7 +4144,7 @@ void OperateShrine(int pnum, int i, _sfx_id sType)
 		if (pnum != myplr)
 			return;
 		InitDiabloMsg(EMSG_SHRINE_MURPHYS);
-		BOOL broke = FALSE;
+		bool broke = FALSE;
 		for (int j = 0; j < NUM_INVLOC; j++) {
 			ItemStruct *item = &plr[myplr].InvBody[j];
 			if (!item->isEmpty() && random_(0, 3) == 0) {
@@ -4229,7 +4229,7 @@ void OperateDecap(int pnum, int i, bool sendmsg)
 
 void OperateArmorStand(int pnum, int i, bool sendmsg)
 {
-	BOOL uniqueRnd;
+	bool uniqueRnd;
 
 	if (object[i]._oSelFlag != 0) {
 		object[i]._oSelFlag = 0;
@@ -4308,7 +4308,7 @@ bool OperateFountains(int pnum, int i)
 {
 	int prev, add, rnd, cnt;
 	bool applied;
-	BOOL done;
+	bool done;
 
 	applied = FALSE;
 	SetRndSeed(object[i]._oRndSeed);
@@ -4494,9 +4494,9 @@ void OperateLazStand(int pnum, int i)
 	}
 }
 
-void OperateObject(int pnum, int i, BOOL TeleFlag)
+void OperateObject(int pnum, int i, bool TeleFlag)
 {
-	BOOL sendmsg;
+	bool sendmsg;
 
 	sendmsg = (pnum == myplr);
 	switch (object[i]._otype) {
@@ -4798,7 +4798,7 @@ void BreakCrux(int i)
 	ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4);
 }
 
-void BreakBarrel(int pnum, int i, int dam, BOOL forcebreak, BOOL sendmsg)
+void BreakBarrel(int pnum, int i, int dam, bool forcebreak, bool sendmsg)
 {
 	int oi;
 	int xp, yp;

Source/objects.h

@@ -46,8 +46,8 @@ extern int objectactive[MAXOBJECTS];
 extern int nobjects;
 extern int objectavail[MAXOBJECTS];
 extern ObjectStruct object[MAXOBJECTS];
-extern BOOL InitObjFlag;
-extern BOOL LoadMapObjsFlag;
+extern bool InitObjFlag;
+extern bool LoadMapObjsFlag;
 
 void InitObjectGFX();
 void FreeObjectGFX();
@@ -73,7 +73,7 @@ void ObjChangeMap(int x1, int y1, int x2, int y2);
 void ObjChangeMapResync(int x1, int y1, int x2, int y2);
 void TryDisarm(int pnum, int i);
 int ItemMiscIdIdx(item_misc_id imiscid);
-void OperateObject(int pnum, int i, BOOL TeleFlag);
+void OperateObject(int pnum, int i, bool TeleFlag);
 void SyncOpObject(int pnum, int cmd, int i);
 void BreakObject(int pnum, int oi);
 void SyncBreakObj(int pnum, int oi);

Source/pack.cpp

@@ -43,7 +43,7 @@ void PackItem(PkItemStruct *id, const ItemStruct *is)
 	}
 }
 
-void PackPlayer(PkPlayerStruct *pPack, int pnum, BOOL manashield)
+void PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield)
 {
 	PlayerStruct *pPlayer;
 	int i;
@@ -199,7 +199,7 @@ void VerifyGoldSeeds(PlayerStruct *pPlayer)
 	}
 }
 
-void UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOL netSync)
+void UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool netSync)
 {
 	PlayerStruct *pPlayer;
 	int i;

Source/pack.h

@@ -78,8 +78,8 @@ typedef struct PkPlayerStruct {
 } PkPlayerStruct;
 #pragma pack(pop)
 
-void PackPlayer(PkPlayerStruct *pPack, int pnum, BOOL manashield);
-void UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOL netSync);
+void PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield);
+void UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool netSync);
 void PackItem(PkItemStruct *id, const ItemStruct *is);
 void UnPackItem(const PkItemStruct *is, ItemStruct *id, bool isHellfire);
 

Source/path.cpp

@@ -46,7 +46,7 @@ Sint8 path_directions[9] = { 5, 1, 6, 2, 0, 3, 8, 4, 7 };
  * check that each step is a valid position. Store the step directions (see
  * path_directions) in path, which must have room for 24 steps
  */
-int FindPath(BOOL (*PosOk)(int, int, int), int PosOkArg, int sx, int sy, int dx, int dy, Sint8 path[MAX_PATH_LENGTH])
+int FindPath(bool (*PosOk)(int, int, int), int PosOkArg, int sx, int sy, int dx, int dy, Sint8 path[MAX_PATH_LENGTH])
 {
 	PATHNODE *path_start, *next_node, *current;
 	int path_length, i;
@@ -148,9 +148,9 @@ PATHNODE *GetNextPath()
  *
  *  @return true if step is allowed
  */
-BOOL path_solid_pieces(PATHNODE *pPath, int dx, int dy)
+bool path_solid_pieces(PATHNODE *pPath, int dx, int dy)
 {
-	BOOL rv = TRUE;
+	bool rv = TRUE;
 	switch (path_directions[3 * (dy - pPath->y) + 3 - pPath->x + 1 + dx]) {
 	case 5:
 		rv = !nSolidTable[dPiece[dx][dy + 1]] && !nSolidTable[dPiece[dx + 1][dy]];
@@ -173,11 +173,11 @@ BOOL path_solid_pieces(PATHNODE *pPath, int dx, int dy)
  *
  * @return FALSE if we ran out of preallocated nodes to use, else TRUE
  */
-BOOL path_get_path(BOOL (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, int x, int y)
+bool path_get_path(bool (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, int x, int y)
 {
 	int dx, dy;
 	int i;
-	BOOL ok;
+	bool ok;
 
 	for (i = 0; i < 8; i++) {
 		dx = pPath->x + pathxdir[i];
@@ -197,7 +197,7 @@ BOOL path_get_path(BOOL (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath,
  *
  * @return TRUE if step successfully added, FALSE if we ran out of nodes to use
  */
-BOOL path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy)
+bool path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy)
 {
 	int next_g;
 	PATHNODE *dxdy;

Source/path.h

@@ -22,12 +22,12 @@ typedef struct PATHNODE {
 	struct PATHNODE *NextNode;
 } PATHNODE;
 
-int FindPath(BOOL (*PosOk)(int, int, int), int PosOkArg, int sx, int sy, int dx, int dy, Sint8 path[MAX_PATH_LENGTH]);
+int FindPath(bool (*PosOk)(int, int, int), int PosOkArg, int sx, int sy, int dx, int dy, Sint8 path[MAX_PATH_LENGTH]);
 int path_get_h_cost(int sx, int sy, int dx, int dy);
 PATHNODE *GetNextPath();
-BOOL path_solid_pieces(PATHNODE *pPath, int dx, int dy);
-BOOL path_get_path(BOOL (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, int x, int y);
-BOOL path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy);
+bool path_solid_pieces(PATHNODE *pPath, int dx, int dy);
+bool path_get_path(bool (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, int x, int y);
+bool path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy);
 PATHNODE *path_get_node1(int dx, int dy);
 PATHNODE *path_get_node2(int dx, int dy);
 void path_next_node(PATHNODE *pPath);

Source/pfile.cpp

@@ -51,7 +51,7 @@ std::string GetSavePath(DWORD save_num)
 
 /** List of character names for the character selection screen. */
 static char hero_names[MAX_CHARACTERS][PLR_NAME_LEN];
-BOOL gbValidSaveFile;
+bool gbValidSaveFile;
 
 const char *pfile_get_password()
 {
@@ -97,7 +97,7 @@ static BYTE *pfile_read_archive(HANDLE archive, const char *pszName, DWORD *pdwL
 	return buf;
 }
 
-static BOOL pfile_read_hero(HANDLE archive, PkPlayerStruct *pPack)
+static bool pfile_read_hero(HANDLE archive, PkPlayerStruct *pPack)
 {
 	DWORD read;
 	BYTE *buf;
@@ -106,7 +106,7 @@ static BOOL pfile_read_hero(HANDLE archive, PkPlayerStruct *pPack)
 	if (buf == NULL)
 		return FALSE;
 
-	BOOL ret = FALSE;
+	bool ret = FALSE;
 	if (read == sizeof(*pPack)) {
 		memcpy(pPack, buf, sizeof(*pPack));
 		ret = TRUE;
@@ -129,7 +129,7 @@ static void pfile_encode_hero(const PkPlayerStruct *pPack)
 	mem_free_dbg(packed);
 }
 
-static BOOL pfile_open_archive(DWORD save_num)
+static bool pfile_open_archive(DWORD save_num)
 {
 	if (OpenMPQ(GetSavePath(save_num).c_str(), save_num))
 		return TRUE;
@@ -137,7 +137,7 @@ static BOOL pfile_open_archive(DWORD save_num)
 	return FALSE;
 }
 
-static void pfile_flush(BOOL is_single_player, DWORD save_num)
+static void pfile_flush(bool is_single_player, DWORD save_num)
 {
 	mpqapi_flush_and_close(GetSavePath(save_num).c_str(), is_single_player, save_num);
 }
@@ -173,7 +173,7 @@ void pfile_write_hero()
 	}
 }
 
-static void game_2_ui_player(const PlayerStruct *p, _uiheroinfo *heroinfo, BOOL bHasSaveFile)
+static void game_2_ui_player(const PlayerStruct *p, _uiheroinfo *heroinfo, bool bHasSaveFile)
 {
 	memset(heroinfo, 0, sizeof(*heroinfo));
 	strncpy(heroinfo->name, p->_pName, sizeof(heroinfo->name) - 1);
@@ -190,7 +190,7 @@ static void game_2_ui_player(const PlayerStruct *p, _uiheroinfo *heroinfo, BOOL
 	heroinfo->spawned = gbIsSpawn;
 }
 
-BOOL pfile_create_player_description()
+bool pfile_create_player_description()
 {
 	char desc[128];
 	_uiheroinfo uihero;
@@ -208,7 +208,7 @@ void pfile_flush_W()
 	pfile_flush(TRUE, pfile_get_save_num_from_name(plr[myplr]._pName));
 }
 
-BOOL pfile_ui_set_hero_infos(BOOL (*ui_add_hero_info)(_uiheroinfo *))
+bool pfile_ui_set_hero_infos(bool (*ui_add_hero_info)(_uiheroinfo *))
 {
 	memset(hero_names, 0, sizeof(hero_names));
 
@@ -239,7 +239,7 @@ BOOL pfile_ui_set_hero_infos(BOOL (*ui_add_hero_info)(_uiheroinfo *))
 	return TRUE;
 }
 
-BOOL pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num)
+bool pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num)
 {
 	if (gbIsMultiplayer)
 		return FALSE;
@@ -263,7 +263,7 @@ void pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *cla
 	class_stats->vitality = VitalityTbl[player_class_nr];
 }
 
-BOOL pfile_ui_save_create(_uiheroinfo *heroinfo)
+bool pfile_ui_save_create(_uiheroinfo *heroinfo)
 {
 	DWORD save_num;
 	PkPlayerStruct pkplr;
@@ -296,7 +296,7 @@ BOOL pfile_ui_save_create(_uiheroinfo *heroinfo)
 	return TRUE;
 }
 
-BOOL pfile_get_file_name(DWORD lvl, char *dst)
+bool pfile_get_file_name(DWORD lvl, char *dst)
 {
 	const char *fmt;
 
@@ -321,7 +321,7 @@ BOOL pfile_get_file_name(DWORD lvl, char *dst)
 	return TRUE;
 }
 
-BOOL pfile_delete_save(_uiheroinfo *hero_info)
+bool pfile_delete_save(_uiheroinfo *hero_info)
 {
 	DWORD save_num;
 
@@ -385,7 +385,7 @@ void GetTempLevelNames(char *szTemp)
 void GetPermLevelNames(char *szPerm)
 {
 	DWORD save_num;
-	BOOL has_file;
+	bool has_file;
 
 	save_num = pfile_get_save_num_from_name(plr[myplr]._pName);
 	GetTempLevelNames(szPerm);
@@ -402,7 +402,7 @@ void GetPermLevelNames(char *szPerm)
 	}
 }
 
-static BOOL GetPermSaveNames(DWORD dwIndex, char *szPerm)
+static bool GetPermSaveNames(DWORD dwIndex, char *szPerm)
 {
 	const char *fmt;
 
@@ -418,7 +418,7 @@ static BOOL GetPermSaveNames(DWORD dwIndex, char *szPerm)
 	return TRUE;
 }
 
-static BOOL GetTempSaveNames(DWORD dwIndex, char *szTemp)
+static bool GetTempSaveNames(DWORD dwIndex, char *szTemp)
 {
 	const char *fmt;
 
@@ -449,7 +449,7 @@ void pfile_remove_temp_files()
 void pfile_rename_temp_to_perm()
 {
 	DWORD dwChar, dwIndex;
-	BOOL bResult;
+	bool bResult;
 	char szTemp[MAX_PATH];
 	char szPerm[MAX_PATH];
 

Source/pfile.h

@@ -14,18 +14,18 @@ namespace devilution {
 extern "C" {
 #endif
 
-extern BOOL gbValidSaveFile;
+extern bool gbValidSaveFile;
 
 const char *pfile_get_password();
 void pfile_write_hero();
-BOOL pfile_create_player_description();
+bool pfile_create_player_description();
 void pfile_flush_W();
-BOOL pfile_ui_set_hero_infos(BOOL (*ui_add_hero_info)(_uiheroinfo *));
-BOOL pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num);
+bool pfile_ui_set_hero_infos(bool (*ui_add_hero_info)(_uiheroinfo *));
+bool pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num);
 void pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *class_stats);
-BOOL pfile_ui_save_create(_uiheroinfo *heroinfo);
-BOOL pfile_get_file_name(DWORD lvl, char *dst);
-BOOL pfile_delete_save(_uiheroinfo *hero_info);
+bool pfile_ui_save_create(_uiheroinfo *heroinfo);
+bool pfile_get_file_name(DWORD lvl, char *dst);
+bool pfile_delete_save(_uiheroinfo *hero_info);
 void pfile_read_player_from_save();
 bool LevelFileExists();
 void GetTempLevelNames(char *szTemp);

Source/player.cpp

@@ -13,7 +13,7 @@ namespace devilution {
 
 int myplr;
 PlayerStruct plr[MAX_PLRS];
-BOOL deathflag;
+bool deathflag;
 int deathdelay;
 
 /** Maps from armor animation to letter used in graphic files. */
@@ -954,7 +954,7 @@ void AddPlrMonstExper(int lvl, int exp, char pmask)
 	}
 }
 
-void InitPlayer(int pnum, BOOL FirstTime)
+void InitPlayer(int pnum, bool FirstTime)
 {
 	DWORD i;
 
@@ -1081,7 +1081,7 @@ void InitMultiView()
 	ViewY = plr[myplr]._py;
 }
 
-BOOL SolidLoc(int x, int y)
+bool SolidLoc(int x, int y)
 {
 	if (x < 0 || y < 0 || x >= MAXDUNX || y >= MAXDUNY) {
 		return FALSE;
@@ -1090,10 +1090,10 @@ BOOL SolidLoc(int x, int y)
 	return nSolidTable[dPiece[x][y]];
 }
 
-BOOL PlrDirOK(int pnum, int dir)
+bool PlrDirOK(int pnum, int dir)
 {
 	int px, py;
-	BOOL isOk;
+	bool isOk;
 
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("PlrDirOK: illegal player %d", pnum);
@@ -1584,7 +1584,7 @@ void RemovePlrFromMap(int pnum)
 				dPlayer[x][y] = 0;
 }
 
-void StartPlrHit(int pnum, int dam, BOOL forcehit)
+void StartPlrHit(int pnum, int dam, bool forcehit)
 {
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("StartPlrHit: illegal player %d", pnum);
@@ -1692,7 +1692,7 @@ __attribute__((no_sanitize("shift-base")))
 void
 StartPlayerKill(int pnum, int earflag)
 {
-	BOOL diablolevel;
+	bool diablolevel;
 	int i, pdd;
 	PlayerStruct *p;
 	ItemStruct ear;
@@ -2115,7 +2115,7 @@ void StartWarpLvl(int pnum, int pidx)
 	}
 }
 
-BOOL PM_DoStand(int pnum)
+bool PM_DoStand(int pnum)
 {
 	return FALSE;
 }
@@ -2230,7 +2230,7 @@ static bool WeaponDurDecay(int pnum, int ii)
 	return false;
 }
 
-BOOL WeaponDur(int pnum, int durrnd)
+bool WeaponDur(int pnum, int durrnd)
 {
 	if (pnum != myplr) {
 		return FALSE;
@@ -2308,13 +2308,13 @@ BOOL WeaponDur(int pnum, int durrnd)
 	return FALSE;
 }
 
-BOOL PlrHitMonst(int pnum, int m)
+bool PlrHitMonst(int pnum, int m)
 {
-	BOOL rv, ret;
+	bool rv, ret;
 	int hit, hper, mind, maxd, ddp, dam, skdam, phanditype, tmac;
 	hper = 0;
 	ret = FALSE;
-	BOOL adjacentDamage = FALSE;
+	bool adjacentDamage = FALSE;
 
 	if ((DWORD)m >= MAXMONSTERS) {
 		app_fatal("PlrHitMonst: illegal monster %d", m);
@@ -2553,9 +2553,9 @@ BOOL PlrHitMonst(int pnum, int m)
 	return rv;
 }
 
-BOOL PlrHitPlr(int pnum, char p)
+bool PlrHitPlr(int pnum, char p)
 {
-	BOOL rv;
+	bool rv;
 	int hit, hper, blk, blkper, mind, maxd, dam, lvl, skdam, tac;
 
 	if ((DWORD)p >= MAX_PLRS) {
@@ -2647,7 +2647,7 @@ BOOL PlrHitPlr(int pnum, char p)
 	return rv;
 }
 
-BOOL PlrHitObj(int pnum, int mx, int my)
+bool PlrHitObj(int pnum, int mx, int my)
 {
 	int oi;
 
@@ -2665,10 +2665,10 @@ BOOL PlrHitObj(int pnum, int mx, int my)
 	return FALSE;
 }
 
-BOOL PM_DoAttack(int pnum)
+bool PM_DoAttack(int pnum)
 {
 	int frame, dir, dx, dy, m;
-	BOOL didhit = FALSE;
+	bool didhit = FALSE;
 
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("PM_DoAttack: illegal player %d", pnum);
@@ -2777,7 +2777,7 @@ BOOL PM_DoAttack(int pnum)
 	}
 }
 
-BOOL PM_DoRangeAttack(int pnum)
+bool PM_DoRangeAttack(int pnum)
 {
 	int origFrame, mistype;
 
@@ -2896,7 +2896,7 @@ void ShieldDur(int pnum)
 	}
 }
 
-BOOL PM_DoBlock(int pnum)
+bool PM_DoBlock(int pnum)
 {
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("PM_DoBlock: illegal player %d", pnum);
@@ -2969,7 +2969,7 @@ static void ArmorDur(int pnum)
 	CalcPlrInv(pnum, TRUE);
 }
 
-BOOL PM_DoSpell(int pnum)
+bool PM_DoSpell(int pnum)
 {
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("PM_DoSpell: illegal player %d", pnum);
@@ -3007,7 +3007,7 @@ BOOL PM_DoSpell(int pnum)
 	return FALSE;
 }
 
-BOOL PM_DoGotHit(int pnum)
+bool PM_DoGotHit(int pnum)
 {
 	int frame;
 
@@ -3039,7 +3039,7 @@ BOOL PM_DoGotHit(int pnum)
 	return FALSE;
 }
 
-BOOL PM_DoDeath(int pnum)
+bool PM_DoDeath(int pnum)
 {
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("PM_DoDeath: illegal player %d", pnum);
@@ -3068,7 +3068,7 @@ BOOL PM_DoDeath(int pnum)
 	return FALSE;
 }
 
-BOOL PM_DoNewLvl(int pnum)
+bool PM_DoNewLvl(int pnum)
 {
 	return FALSE;
 }
@@ -3397,7 +3397,7 @@ void CheckNewPath(int pnum)
 	}
 }
 
-BOOL PlrDeathModeOK(int p)
+bool PlrDeathModeOK(int p)
 {
 	if (p != myplr) {
 		return TRUE;
@@ -3620,7 +3620,7 @@ void ClrPlrPath(int pnum)
 	memset(plr[pnum].walkpath, WALK_NONE, sizeof(plr[pnum].walkpath));
 }
 
-BOOL PosOkPlayer(int pnum, int x, int y)
+bool PosOkPlayer(int pnum, int x, int y)
 {
 	DWORD p;
 	char bv;
@@ -3670,7 +3670,7 @@ BOOL PosOkPlayer(int pnum, int x, int y)
 	return TRUE;
 }
 
-void MakePlrPath(int pnum, int xx, int yy, BOOL endspace)
+void MakePlrPath(int pnum, int xx, int yy, bool endspace)
 {
 	int path;
 
@@ -3732,7 +3732,7 @@ void MakePlrPath(int pnum, int xx, int yy, BOOL endspace)
 
 void CheckPlrSpell()
 {
-	BOOL addflag = FALSE;
+	bool addflag = FALSE;
 	int rspell, sd, sl;
 
 	if ((DWORD)myplr >= MAX_PLRS) {
@@ -3904,7 +3904,7 @@ void SyncInitPlrPos(int pnum)
 {
 	int x, y, xx, yy, range;
 	DWORD i;
-	BOOL posOk;
+	bool posOk;
 
 	plr[pnum]._ptargx = plr[pnum]._px;
 	plr[pnum]._ptargy = plr[pnum]._py;

Source/player.h

@@ -270,7 +270,7 @@ extern "C" {
 
 extern int myplr;
 extern PlayerStruct plr[MAX_PLRS];
-extern BOOL deathflag;
+extern bool deathflag;
 extern int ToBlkTbl[NUM_CLASSES];
 
 void LoadPlrGFX(int pnum, player_graphic gfxflag);
@@ -286,9 +286,9 @@ void NextPlrLevel(int pnum);
 #endif
 void AddPlrExperience(int pnum, int lvl, int exp);
 void AddPlrMonstExper(int lvl, int exp, char pmask);
-void InitPlayer(int pnum, BOOL FirstTime);
+void InitPlayer(int pnum, bool FirstTime);
 void InitMultiView();
-BOOL SolidLoc(int x, int y);
+bool SolidLoc(int x, int y);
 void PlrClrTrans(int x, int y);
 void PlrDoTrans(int x, int y);
 void SetPlayerOld(int pnum);
@@ -298,7 +298,7 @@ void StartAttack(int pnum, direction d);
 void StartPlrBlock(int pnum, direction dir);
 void FixPlrWalkTags(int pnum);
 void RemovePlrFromMap(int pnum);
-void StartPlrHit(int pnum, int dam, BOOL forcehit);
+void StartPlrHit(int pnum, int dam, bool forcehit);
 void StartPlayerKill(int pnum, int earflag);
 void DropHalfPlayersGold(int pnum);
 void StripTopGold(int pnum);
@@ -309,8 +309,8 @@ void RestartTownLvl(int pnum);
 void StartWarpLvl(int pnum, int pidx);
 void ProcessPlayers();
 void ClrPlrPath(int pnum);
-BOOL PosOkPlayer(int pnum, int x, int y);
-void MakePlrPath(int pnum, int xx, int yy, BOOL endspace);
+bool PosOkPlayer(int pnum, int x, int y);
+void MakePlrPath(int pnum, int xx, int yy, bool endspace);
 void CheckPlrSpell();
 void SyncPlrAnim(int pnum);
 void SyncInitPlrPos(int pnum);

Source/plrmsg.cpp

@@ -13,7 +13,7 @@ _plrmsg plr_msgs[PMSG_COUNT];
 /** Maps from player_num to text color, as used in chat messages. */
 const text_color text_color_from_player_num[MAX_PLRS + 1] = { COL_WHITE, COL_WHITE, COL_WHITE, COL_WHITE, COL_GOLD };
 
-void plrmsg_delay(BOOL delay)
+void plrmsg_delay(bool delay)
 {
 	int i;
 	_plrmsg *pMsg;

Source/plrmsg.h

@@ -19,7 +19,7 @@ typedef struct _plrmsg {
 	char str[144];
 } _plrmsg;
 
-void plrmsg_delay(BOOL delay);
+void plrmsg_delay(bool delay);
 void ErrorPlrMsg(const char *pszMsg);
 size_t EventPlrMsg(const char *pszFmt, ...);
 void SendPlrMsg(int pnum, const char *pszStr);

Source/portal.cpp

@@ -27,7 +27,7 @@ void InitPortals()
 	}
 }
 
-void SetPortalStats(int i, BOOL o, int x, int y, int lvl, dungeon_type lvltype)
+void SetPortalStats(int i, bool o, int x, int y, int lvl, dungeon_type lvltype)
 {
 	portal[i].open = o;
 	portal[i].x = x;
@@ -79,7 +79,7 @@ void AddInTownPortal(int i)
 	AddWarpMissile(i, WarpDropX[i], WarpDropY[i]);
 }
 
-void ActivatePortal(int i, int x, int y, int lvl, dungeon_type lvltype, BOOL sp)
+void ActivatePortal(int i, int x, int y, int lvl, dungeon_type lvltype, bool sp)
 {
 	portal[i].open = TRUE;
 
@@ -97,7 +97,7 @@ void DeactivatePortal(int i)
 	portal[i].open = FALSE;
 }
 
-BOOL PortalOnLevel(int i)
+bool PortalOnLevel(int i)
 {
 	if (portal[i].level == currlevel)
 		return TRUE;
@@ -172,7 +172,7 @@ void GetPortalLvlPos()
 	}
 }
 
-BOOL PosOkPortal(int lvl, int x, int y)
+bool PosOkPortal(int lvl, int x, int y)
 {
 	int i;
 

Source/portal.h

@@ -23,18 +23,18 @@ typedef struct PortalStruct {
 extern PortalStruct portal[MAXPORTAL];
 
 void InitPortals();
-void SetPortalStats(int i, BOOL o, int x, int y, int lvl, dungeon_type lvltype);
+void SetPortalStats(int i, bool o, int x, int y, int lvl, dungeon_type lvltype);
 void AddWarpMissile(int i, int x, int y);
 void SyncPortals();
 void AddInTownPortal(int i);
-void ActivatePortal(int i, int x, int y, int lvl, dungeon_type lvltype, BOOL sp);
+void ActivatePortal(int i, int x, int y, int lvl, dungeon_type lvltype, bool sp);
 void DeactivatePortal(int i);
-BOOL PortalOnLevel(int i);
+bool PortalOnLevel(int i);
 void RemovePortalMissile(int id);
 void SetCurrentPortal(int p);
 void GetPortalLevel();
 void GetPortalLvlPos();
-BOOL PosOkPortal(int lvl, int x, int y);
+bool PosOkPortal(int lvl, int x, int y);
 
 #ifdef __cplusplus
 }

Source/quests.cpp

@@ -252,7 +252,7 @@ void CheckQuests()
 	}
 }
 
-BOOL ForceQuests()
+bool ForceQuests()
 {
 	int i, j, qx, qy, ql;
 
@@ -284,7 +284,7 @@ BOOL ForceQuests()
 	return FALSE;
 }
 
-BOOL QuestStatus(int i)
+bool QuestStatus(int i)
 {
 	if (setlevel)
 		return FALSE;
@@ -297,7 +297,7 @@ BOOL QuestStatus(int i)
 	return TRUE;
 }
 
-void CheckQuestKill(int m, BOOL sendmsg)
+void CheckQuestKill(int m, bool sendmsg)
 {
 	int i, j;
 
@@ -806,7 +806,7 @@ void ResyncQuests()
 	}
 }
 
-static void PrintQLString(CelOutputBuffer out, int x, int y, BOOL cjustflag, const char *str, text_color col)
+static void PrintQLString(CelOutputBuffer out, int x, int y, bool cjustflag, const char *str, text_color col)
 {
 	int len, width, i, k, sx, sy;
 	BYTE c;

Source/quests.h

@@ -50,9 +50,9 @@ extern int ReturnLvl;
 
 void InitQuests();
 void CheckQuests();
-BOOL ForceQuests();
-BOOL QuestStatus(int i);
-void CheckQuestKill(int m, BOOL sendmsg);
+bool ForceQuests();
+bool QuestStatus(int i);
+void CheckQuestKill(int m, bool sendmsg);
 void DRLG_CheckQuests(int x, int y);
 void SetReturnLvlPos();
 void GetReturnLvlPos();

Source/scrollrt.cpp

@@ -53,7 +53,7 @@ DWORD sgdwCursHgtOld;
 bool dRendered[MAXDUNX][MAXDUNY];
 
 int frames;
-BOOL frameflag;
+bool frameflag;
 int frameend;
 int framerate;
 int framestart;
@@ -222,7 +222,7 @@ static void scrollrt_draw_cursor_item(CelOutputBuffer out)
  * @param sy Output buffer coordinate
  * @param pre Is the sprite in the background
  */
-void DrawMissilePrivate(CelOutputBuffer out, MissileStruct *m, int sx, int sy, BOOL pre)
+void DrawMissilePrivate(CelOutputBuffer out, MissileStruct *m, int sx, int sy, bool pre)
 {
 	if (m->_miPreFlag != pre || !m->_miDrawFlag)
 		return;
@@ -257,7 +257,7 @@ void DrawMissilePrivate(CelOutputBuffer out, MissileStruct *m, int sx, int sy, B
  * @param sy Output buffer coordinate
  * @param pre Is the sprite in the background
  */
-void DrawMissile(CelOutputBuffer out, int x, int y, int sx, int sy, BOOL pre)
+void DrawMissile(CelOutputBuffer out, int x, int y, int sx, int sy, bool pre)
 {
 	int i;
 	MissileStruct *m;
@@ -468,7 +468,7 @@ void DrawDeadPlayer(CelOutputBuffer out, int x, int y, int sx, int sy)
  * @param oy Output buffer coordinate
  * @param pre Is the sprite in the background
  */
-static void DrawObject(CelOutputBuffer out, int x, int y, int ox, int oy, BOOL pre)
+static void DrawObject(CelOutputBuffer out, int x, int y, int ox, int oy, bool pre)
 {
 	if (dObject[x][y] == 0 || light_table_index >= lightmax)
 		return;
@@ -581,7 +581,7 @@ static void drawFloor(CelOutputBuffer out, int x, int y, int sx, int sy)
  * @param sy Output buffer coordinate
  * @param pre Is the sprite in the background
  */
-static void DrawItem(CelOutputBuffer out, int x, int y, int sx, int sy, BOOL pre)
+static void DrawItem(CelOutputBuffer out, int x, int y, int sx, int sy, bool pre)
 {
 	char bItem = dItem[x][y];
 
@@ -1276,7 +1276,7 @@ void ClearScreenBuffer()
  */
 void ScrollView()
 {
-	BOOL scroll;
+	bool scroll;
 
 	if (pcurs >= CURSOR_FIRSTITEM)
 		return;
@@ -1414,7 +1414,7 @@ static void DoBlitScreen(Sint16 dwX, Sint16 dwY, Uint16 dwWdt, Uint16 dwHgt)
  * @param draw_sbar Render belt
  * @param draw_btn Render panel buttons
  */
-static void DrawMain(int dwHgt, BOOL draw_desc, BOOL draw_hp, BOOL draw_mana, BOOL draw_sbar, BOOL draw_btn)
+static void DrawMain(int dwHgt, bool draw_desc, bool draw_hp, bool draw_mana, bool draw_sbar, bool draw_btn)
 {
 	if (!gbActive) {
 		return;
@@ -1460,7 +1460,7 @@ static void DrawMain(int dwHgt, BOOL draw_desc, BOOL draw_hp, BOOL draw_mana, BO
  * @brief Redraw screen
  * @param draw_cursor
  */
-void scrollrt_draw_game_screen(BOOL draw_cursor)
+void scrollrt_draw_game_screen(bool draw_cursor)
 {
 	int hgt = 0;
 

Source/scrollrt.h

@@ -43,7 +43,7 @@ void ClearScreenBuffer();
 void ScrollView();
 #endif
 void EnableFrameCount();
-void scrollrt_draw_game_screen(BOOL draw_cursor);
+void scrollrt_draw_game_screen(bool draw_cursor);
 void DrawAndBlit();
 
 #ifdef __cplusplus

Source/sound.h

@@ -21,9 +21,9 @@ typedef struct TSnd {
 
 extern bool gbSndInited;
 
-void snd_update(BOOL bStopAll);
+void snd_update(bool bStopAll);
 void snd_stop_snd(TSnd *pSnd);
-BOOL snd_playing(TSnd *pSnd);
+bool snd_playing(TSnd *pSnd);
 void snd_play_snd(TSnd *pSnd, int lVolume, int lPan);
 TSnd *sound_file_load(const char *path, bool stream = false);
 void sound_file_cleanup(TSnd *sound_file);
@@ -31,7 +31,7 @@ void snd_init();
 void sound_cleanup();
 void music_stop();
 void music_start(int nTrack);
-void sound_disable_music(BOOL disable);
+void sound_disable_music(bool disable);
 int sound_get_or_set_music_volume(int volume);
 int sound_get_or_set_sound_volume(int volume);
 

Source/spells.cpp

@@ -158,9 +158,9 @@ void EnsureValidReadiedSpell(PlayerStruct &player)
 	}
 }
 
-BOOL CheckSpell(int id, int sn, char st, BOOL manaonly)
+bool CheckSpell(int id, int sn, char st, bool manaonly)
 {
-	BOOL result;
+	bool result;
 
 #ifdef _DEBUG
 	if (debug_mode_key_inverted_v)
@@ -209,7 +209,7 @@ static void PlacePlayer(int pnum)
 {
 	int nx, ny, max, min, x, y;
 	DWORD i;
-	BOOL done;
+	bool done;
 
 	if (plr[pnum].plrlevel == currlevel) {
 		for (i = 0; i < 8; i++) {

Source/spells.h

@@ -14,7 +14,7 @@ extern "C" {
 int GetManaAmount(int id, int sn);
 void UseMana(int id, int sn);
 Uint64 GetSpellBitmask(int spellId);
-BOOL CheckSpell(int id, int sn, char st, BOOL manaonly);
+bool CheckSpell(int id, int sn, char st, bool manaonly);
 void EnsureValidReadiedSpell(PlayerStruct &player);
 void CastSpell(int id, int spl, int sx, int sy, int dx, int dy, int spllvl);
 void DoResurrect(int pnum, int rid);

Source/stores.cpp

@@ -115,7 +115,7 @@ void OffsetSTextY(int y, int yo)
 	stext[y]._syoff = yo;
 }
 
-void AddSText(int x, int y, bool j, const char *str, text_color clr, BOOL sel)
+void AddSText(int x, int y, bool j, const char *str, text_color clr, bool sel)
 {
 	stext[y]._sx = x;
 	stext[y]._syoff = 0;
@@ -314,7 +314,7 @@ void S_ScrollSPBuy(int idx)
 		stextsel = stextdown;
 }
 
-BOOL S_StartSPBuy()
+bool S_StartSPBuy()
 {
 	int i;
 
@@ -349,7 +349,7 @@ BOOL S_StartSPBuy()
 	return TRUE;
 }
 
-BOOL SmithSellOk(int i)
+bool SmithSellOk(int i)
 {
 	ItemStruct *pI;
 
@@ -421,7 +421,7 @@ void S_ScrollSSell(int idx)
 void S_StartSSell()
 {
 	int i;
-	BOOL sellok;
+	bool sellok;
 
 	stextsize = true;
 	sellok = FALSE;
@@ -488,7 +488,7 @@ void S_StartSSell()
 	}
 }
 
-BOOL SmithRepairOk(int i)
+bool SmithRepairOk(int i)
 {
 	if (plr[myplr].InvList[i].isEmpty())
 		return FALSE;
@@ -504,7 +504,7 @@ BOOL SmithRepairOk(int i)
 
 void S_StartSRepair()
 {
-	BOOL repairok;
+	bool repairok;
 	int i;
 
 	stextsize = true;
@@ -648,9 +648,9 @@ void S_StartWBuy()
 		stextsmax = 0;
 }
 
-BOOL WitchSellOk(int i)
+bool WitchSellOk(int i)
 {
-	BOOL rv;
+	bool rv;
 	ItemStruct *pI;
 
 	rv = FALSE;
@@ -678,7 +678,7 @@ BOOL WitchSellOk(int i)
 void S_StartWSell()
 {
 	int i;
-	BOOL sellok;
+	bool sellok;
 
 	stextsize = true;
 	sellok = FALSE;
@@ -745,9 +745,9 @@ void S_StartWSell()
 	}
 }
 
-BOOL WitchRechargeOk(int i)
+bool WitchRechargeOk(int i)
 {
-	BOOL rv;
+	bool rv;
 
 	rv = FALSE;
 	if (plr[myplr].InvList[i]._itype == ITYPE_STAFF
@@ -774,7 +774,7 @@ void AddStoreHoldRecharge(ItemStruct itm, int i)
 void S_StartWRecharge()
 {
 	int i;
-	BOOL rechargeok;
+	bool rechargeok;
 
 	stextsize = true;
 	rechargeok = FALSE;
@@ -840,7 +840,7 @@ void S_StartNoRoom()
 
 void S_StartConfirm()
 {
-	BOOL idprint;
+	bool idprint;
 
 	StartStore(stextshold);
 	stextscrl = false;
@@ -1038,7 +1038,7 @@ void S_StartStory()
 	AddSLine(5);
 }
 
-BOOL IdItemOk(ItemStruct *i)
+bool IdItemOk(ItemStruct *i)
 {
 	if (i->isEmpty()) {
 		return FALSE;
@@ -1060,7 +1060,7 @@ void AddStoreHoldId(ItemStruct itm, int i)
 
 void S_StartSIdentify()
 {
-	BOOL idok;
+	bool idok;
 	int i;
 
 	idok = FALSE;
@@ -1379,7 +1379,7 @@ void S_SPBuyEnter()
 	}
 }
 
-BOOL StoreGoldFit(int idx)
+bool StoreGoldFit(int idx)
 {
 	int i, sz, cost, numsqrs;
 
@@ -1422,7 +1422,7 @@ BOOL StoreGoldFit(int idx)
  */
 void PlaceStoreGold(int v)
 {
-	BOOL done;
+	bool done;
 	int ii, xx, yy, i;
 
 	done = FALSE;
@@ -1613,7 +1613,7 @@ void WitchBuyItem()
 void S_WBuyEnter()
 {
 	int i, idx;
-	BOOL done;
+	bool done;
 
 	if (stextsel == 22) {
 		StartStore(STORE_WITCH);
@@ -1920,7 +1920,7 @@ void S_HealerEnter()
 void S_HBuyEnter()
 {
 	int i, idx;
-	BOOL done;
+	bool done;
 
 	if (stextsel == 22) {
 		StartStore(STORE_HEALER);

Source/themes.cpp

@@ -8,21 +8,21 @@
 namespace devilution {
 
 int numthemes;
-BOOL armorFlag;
-BOOL ThemeGoodIn[4];
-BOOL weaponFlag;
-BOOL treasureFlag;
-BOOL mFountainFlag;
-BOOL cauldronFlag;
-BOOL tFountainFlag;
+bool armorFlag;
+bool ThemeGoodIn[4];
+bool weaponFlag;
+bool treasureFlag;
+bool mFountainFlag;
+bool cauldronFlag;
+bool tFountainFlag;
 int zharlib;
 int themex;
 int themey;
 int themeVar1;
 ThemeStruct themes[MAXTHEMES];
-BOOL pFountainFlag;
-BOOL bFountainFlag;
-BOOL bCrossFlag;
+bool pFountainFlag;
+bool bFountainFlag;
+bool bCrossFlag;
 
 /** Specifies the set of special theme IDs from which one will be selected at random. */
 theme_id ThemeGood[4] = { THEME_GOATSHRINE, THEME_SHRINE, THEME_SKELROOM, THEME_LIBRARY };
@@ -55,7 +55,7 @@ int trm3y[] = {
 	1, 1, 1
 };
 
-BOOL TFit_Shrine(int i)
+bool TFit_Shrine(int i)
 {
 	int xp, yp, found;
 
@@ -100,11 +100,11 @@ BOOL TFit_Shrine(int i)
 	return TRUE;
 }
 
-BOOL TFit_Obj5(int t)
+bool TFit_Obj5(int t)
 {
 	int xp, yp;
 	int i, r, rs;
-	BOOL found;
+	bool found;
 
 	xp = 0;
 	yp = 0;
@@ -148,7 +148,7 @@ BOOL TFit_Obj5(int t)
 	return TRUE;
 }
 
-BOOL TFit_SkelRoom(int t)
+bool TFit_SkelRoom(int t)
 {
 	int i;
 
@@ -166,7 +166,7 @@ BOOL TFit_SkelRoom(int t)
 	return FALSE;
 }
 
-BOOL TFit_GoatShrine(int t)
+bool TFit_GoatShrine(int t)
 {
 	int i;
 
@@ -180,7 +180,7 @@ BOOL TFit_GoatShrine(int t)
 	return FALSE;
 }
 
-BOOL CheckThemeObj3(int xp, int yp, int t, int f)
+bool CheckThemeObj3(int xp, int yp, int t, int f)
 {
 	int i;
 
@@ -200,7 +200,7 @@ BOOL CheckThemeObj3(int xp, int yp, int t, int f)
 	return TRUE;
 }
 
-BOOL TFit_Obj3(int t)
+bool TFit_Obj3(int t)
 {
 	int xp, yp;
 	char objrnd[4] = { 4, 4, 3, 5 };
@@ -218,9 +218,9 @@ BOOL TFit_Obj3(int t)
 	return FALSE;
 }
 
-BOOL CheckThemeReqs(theme_id t)
+bool CheckThemeReqs(theme_id t)
 {
-	BOOL rv;
+	bool rv;
 
 	rv = TRUE;
 	switch (t) {
@@ -271,9 +271,9 @@ BOOL CheckThemeReqs(theme_id t)
 	return rv;
 }
 
-static BOOL SpecialThemeFit(int i, theme_id t)
+static bool SpecialThemeFit(int i, theme_id t)
 {
-	BOOL rv;
+	bool rv;
 
 	rv = CheckThemeReqs(t);
 	switch (t) {
@@ -353,7 +353,7 @@ static BOOL SpecialThemeFit(int i, theme_id t)
 	return rv;
 }
 
-BOOL CheckThemeRoom(int tv)
+bool CheckThemeRoom(int tv)
 {
 	int i, j, tarea;
 

Source/themes.h

@@ -17,8 +17,8 @@ typedef struct ThemeStruct {
 } ThemeStruct;
 
 extern int numthemes;
-extern BOOL armorFlag;
-extern BOOL weaponFlag;
+extern bool armorFlag;
+extern bool weaponFlag;
 extern int zharlib;
 extern ThemeStruct themes[MAXTHEMES];
 

Source/towners.cpp

@@ -7,7 +7,7 @@
 
 namespace devilution {
 
-BOOL storeflag;
+bool storeflag;
 int sgnCowMsg;
 int numtowners;
 DWORD sgdwCowClicks;

Source/trigs.cpp

@@ -7,8 +7,8 @@
 
 namespace devilution {
 
-BOOL townwarps[3];
-BOOL trigflag;
+bool townwarps[3];
+bool trigflag;
 int numtrigs;
 TriggerStruct trigs[MAXTRIGGERS];
 int TWarpFrom;
@@ -341,7 +341,7 @@ void InitVPTriggers()
 	trigs[0]._tmsg = WM_DIABRTNLVL;
 }
 
-BOOL ForceTownTrig()
+bool ForceTownTrig()
 {
 	int i, j, k, l;
 
@@ -409,7 +409,7 @@ BOOL ForceTownTrig()
 	return FALSE;
 }
 
-BOOL ForceL1Trig()
+bool ForceL1Trig()
 {
 	int i, j;
 	int dx, dy;
@@ -494,7 +494,7 @@ BOOL ForceL1Trig()
 	return FALSE;
 }
 
-BOOL ForceL2Trig()
+bool ForceL2Trig()
 {
 	int i, j, dx, dy;
 
@@ -550,7 +550,7 @@ BOOL ForceL2Trig()
 	return FALSE;
 }
 
-BOOL ForceL3Trig()
+bool ForceL3Trig()
 {
 	int i, j, dx, dy;
 
@@ -650,7 +650,7 @@ BOOL ForceL3Trig()
 	return FALSE;
 }
 
-BOOL ForceL4Trig()
+bool ForceL4Trig()
 {
 	int i, j, dx, dy;
 
@@ -733,7 +733,7 @@ void Freeupstairs()
 	}
 }
 
-BOOL ForceSKingTrig()
+bool ForceSKingTrig()
 {
 	int i;
 
@@ -750,7 +750,7 @@ BOOL ForceSKingTrig()
 	return FALSE;
 }
 
-BOOL ForceSChambTrig()
+bool ForceSChambTrig()
 {
 	int i;
 
@@ -767,7 +767,7 @@ BOOL ForceSChambTrig()
 	return FALSE;
 }
 
-BOOL ForcePWaterTrig()
+bool ForcePWaterTrig()
 {
 	int i;
 

Source/trigs.h

@@ -18,7 +18,7 @@ typedef struct TriggerStruct {
 	int _tlvl;
 } TriggerStruct;
 
-extern BOOL trigflag;
+extern bool trigflag;
 extern int numtrigs;
 extern TriggerStruct trigs[MAXTRIGGERS];
 extern int TWarpFrom;

SourceX/DiabloUI/credits.cpp

@@ -200,7 +200,7 @@ void CreditsRenderer::Render()
 	SDL_SetClipRect(DiabloUiSurface(), NULL);
 }
 
-BOOL TextDialog()
+bool TextDialog()
 {
 	CreditsRenderer credits_renderer;
 	bool endMenu = false;
@@ -234,7 +234,7 @@ BOOL TextDialog()
 
 } // namespace
 
-BOOL UiCreditsDialog()
+bool UiCreditsDialog()
 {
 	text = CREDITS_LINES;
 	textLines = CREDITS_LINES_SIZE;
@@ -245,7 +245,7 @@ BOOL UiCreditsDialog()
 	return TextDialog();
 }
 
-BOOL UiSupportDialog()
+bool UiSupportDialog()
 {
 	text = SUPPORT_LINES;
 	textLines = SUPPORT_LINES_SIZE;

SourceX/DiabloUI/diabloui.cpp

@@ -545,7 +545,7 @@ void UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, Uint32 type)
 	    pInfo->spawned);
 }
 
-BOOL UiValidPlayerName(const char *name)
+bool UiValidPlayerName(const char *name)
 {
 	if (!strlen(name))
 		return false;

SourceX/DiabloUI/diabloui.h

@@ -34,7 +34,7 @@ extern Art ArtHero;
 extern bool gbSpawned;
 
 extern void (*gfnSoundFunction)(const char *file);
-extern BOOL (*gfnHeroInfo)(BOOL (*fninfofunc)(_uiheroinfo *));
+extern bool (*gfnHeroInfo)(bool (*fninfofunc)(_uiheroinfo *));
 
 inline SDL_Surface *DiabloUiSurface()
 {

SourceX/DiabloUI/fonts.cpp

@@ -8,7 +8,7 @@ TTF_Font *font = NULL;
 BYTE *FontTables[4];
 Art ArtFonts[4][2];
 /** This is so we know ttf has been init when we get to the diablo_deinit() function */
-BOOL was_fonts_init = false;
+bool was_fonts_init = false;
 
 namespace {
 

SourceX/DiabloUI/mainmenu.cpp

@@ -86,7 +86,7 @@ void mainmenu_Free()
 	vecMenuItems.clear();
 }
 
-BOOL UiMainMenuDialog(const char *name, int *pdwResult, void (*fnSound)(const char *file), int attractTimeOut)
+bool UiMainMenuDialog(const char *name, int *pdwResult, void (*fnSound)(const char *file), int attractTimeOut)
 {
 	MainMenuResult = 0;
 	while (MainMenuResult == 0) {

SourceX/DiabloUI/progress.cpp

@@ -88,7 +88,7 @@ void progress_Render(BYTE progress)
 	}
 }
 
-BOOL UiProgressDialog(const char *msg, int enable, int (*fnfunc)(), int rate)
+bool UiProgressDialog(const char *msg, int enable, int (*fnfunc)(), int rate)
 {
 	progress_Load(msg);
 	SetFadeLevel(256);

SourceX/DiabloUI/selgame.cpp

@@ -122,7 +122,7 @@ void selgame_GameSelection_Focus(int value)
  * @param pInfo Hero info
  * @return always true
  */
-BOOL UpdateHeroLevel(_uiheroinfo *pInfo)
+bool UpdateHeroLevel(_uiheroinfo *pInfo)
 {
 	if (strcasecmp(pInfo->name, gszHero) == 0)
 		heroLevel = pInfo->level;

SourceX/DiabloUI/selhero.cpp

@@ -36,9 +36,9 @@ bool selhero_isMultiPlayer;
 bool selhero_navigateYesNo;
 bool selhero_deleteEnabled;
 
-BOOL(*gfnHeroInfo)
-(BOOL (*fninfofunc)(_uiheroinfo *));
-BOOL(*gfnHeroCreate)
+bool(*gfnHeroInfo)
+(bool (*fninfofunc)(_uiheroinfo *));
+bool(*gfnHeroCreate)
 (_uiheroinfo *);
 void (*gfnHeroStats)(unsigned int, _uidefaultstats *);
 
@@ -136,7 +136,7 @@ void selhero_ScrollIntoView(std::size_t index)
 	}
 }
 
-BOOL SelHero_GetHeroInfo(_uiheroinfo *pInfo)
+bool SelHero_GetHeroInfo(_uiheroinfo *pInfo)
 {
 	selhero_heros[selhero_SaveCount] = *pInfo;
 	selhero_SaveCount++;
@@ -488,10 +488,10 @@ void selhero_Load_Select(int value)
 }
 
 static void UiSelHeroDialog(
-    BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)),
-    BOOL (*fncreate)(_uiheroinfo *),
+    bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)),
+    bool (*fncreate)(_uiheroinfo *),
     void (*fnstats)(unsigned int, _uidefaultstats *),
-    BOOL (*fnremove)(_uiheroinfo *),
+    bool (*fnremove)(_uiheroinfo *),
     _selhero_selections *dlgresult,
     char (*name)[16])
 {
@@ -541,9 +541,9 @@ static void UiSelHeroDialog(
 }
 
 void UiSelHeroSingDialog(
-    BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)),
-    BOOL (*fncreate)(_uiheroinfo *),
-    BOOL (*fnremove)(_uiheroinfo *),
+    bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)),
+    bool (*fncreate)(_uiheroinfo *),
+    bool (*fnremove)(_uiheroinfo *),
     void (*fnstats)(unsigned int, _uidefaultstats *),
     _selhero_selections *dlgresult,
     char (*name)[16],
@@ -555,9 +555,9 @@ void UiSelHeroSingDialog(
 }
 
 void UiSelHeroMultDialog(
-    BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)),
-    BOOL (*fncreate)(_uiheroinfo *),
-    BOOL (*fnremove)(_uiheroinfo *),
+    bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)),
+    bool (*fncreate)(_uiheroinfo *),
+    bool (*fnremove)(_uiheroinfo *),
     void (*fnstats)(unsigned int, _uidefaultstats *),
     _selhero_selections *dlgresult,
     char (*name)[16])

SourceX/DiabloUI/title.cpp

@@ -71,7 +71,7 @@ void UiTitleDialog()
 	title_Free();
 }
 
-void UiSetSpawned(BOOL bSpawned)
+void UiSetSpawned(bool bSpawned)
 {
 	gbSpawned = bSpawned;
 }

SourceX/sound.cpp

@@ -75,7 +75,7 @@ static int CapVolume(int volume)
 	return volume - volume % 100;
 }
 
-BOOL snd_playing(TSnd *pSnd)
+bool snd_playing(TSnd *pSnd)
 {
 	if (pSnd == NULL || pSnd->DSB == NULL)
 		return false;
@@ -198,7 +198,7 @@ void music_stop()
 
 void music_start(int nTrack)
 {
-	BOOL success;
+	bool success;
 	const char *trackPath;
 
 	assert((DWORD)nTrack < NUM_MUSIC);
@@ -260,7 +260,7 @@ void music_start(int nTrack)
 	}
 }
 
-void sound_disable_music(BOOL disable)
+void sound_disable_music(bool disable)
 {
 	if (disable) {
 		music_stop();

SourceX/storm/storm.cpp

@@ -71,7 +71,7 @@ unsigned char AsciiToLowerTable_Path[256] = {
 	0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
 };
 
-BOOL SFileOpenFile(const char *filename, HANDLE *phFile)
+bool SFileOpenFile(const char *filename, HANDLE *phFile)
 {
 	bool result = false;
 
@@ -127,7 +127,7 @@ BOOL SFileOpenFile(const char *filename, HANDLE *phFile)
 	return result;
 }
 
-BOOL SBmpLoadImage(const char *pszFileName, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *dwHeight, DWORD *pdwBpp)
+bool SBmpLoadImage(const char *pszFileName, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *dwHeight, DWORD *pdwBpp)
 {
 	HANDLE hFile;
 	size_t size;
@@ -617,7 +617,7 @@ void SVidPlayBegin(const char *filename, int a2, int a3, int a4, int a5, int fla
 	SDL_FillRect(GetOutputSurface(), NULL, 0x000000);
 }
 
-BOOL SVidLoadNextFrame()
+bool SVidLoadNextFrame()
 {
 	SVidFrameEnd += SVidFrameLength;
 
@@ -647,7 +647,7 @@ unsigned char *SVidApplyVolume(const unsigned char *raw, unsigned long rawLen)
 	return (unsigned char *)scaled;
 }
 
-BOOL SVidPlayContinue(void)
+bool SVidPlayContinue(void)
 {
 	if (smk_palette_updated(SVidSMK)) {
 		SDL_Color colors[256];
@@ -807,7 +807,7 @@ void SErrSetLastError(DWORD dwErrCode)
 	nLastError = dwErrCode;
 }
 
-BOOL SFileSetBasePath(const char *path)
+bool SFileSetBasePath(const char *path)
 {
 	if (SBasePath == NULL)
 		SBasePath = new std::string;
@@ -815,7 +815,7 @@ BOOL SFileSetBasePath(const char *path)
 	return true;
 }
 
-BOOL SFileEnableDirectAccess(BOOL enable)
+bool SFileEnableDirectAccess(bool enable)
 {
 	directFileAccess = enable;
 	return true;

SourceX/storm/storm_net.cpp

@@ -20,7 +20,7 @@ static char gpszGamePassword[128] = {};
 static std::mutex storm_net_mutex;
 #endif
 
-BOOL SNetReceiveMessage(int *senderplayerid, char **data, int *databytes)
+bool SNetReceiveMessage(int *senderplayerid, char **data, int *databytes)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -32,7 +32,7 @@ BOOL SNetReceiveMessage(int *senderplayerid, char **data, int *databytes)
 	return true;
 }
 
-BOOL SNetSendMessage(int playerID, void *data, unsigned int databytes)
+bool SNetSendMessage(int playerID, void *data, unsigned int databytes)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -40,7 +40,7 @@ BOOL SNetSendMessage(int playerID, void *data, unsigned int databytes)
 	return dvlnet_inst->SNetSendMessage(playerID, data, databytes);
 }
 
-BOOL SNetReceiveTurns(int a1, int arraysize, char **arraydata, unsigned int *arraydatabytes,
+bool SNetReceiveTurns(int a1, int arraysize, char **arraydata, unsigned int *arraydatabytes,
     DWORD *arrayplayerstatus)
 {
 #ifndef NONET
@@ -57,7 +57,7 @@ BOOL SNetReceiveTurns(int a1, int arraysize, char **arraydata, unsigned int *arr
 	return true;
 }
 
-BOOL SNetSendTurn(char *data, unsigned int databytes)
+bool SNetSendTurn(char *data, unsigned int databytes)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -89,7 +89,7 @@ bool SNetRegisterEventHandler(event_type evtype, SEVTHANDLER func)
 	return dvlnet_inst->SNetRegisterEventHandler(evtype, func);
 }
 
-BOOL SNetDestroy()
+bool SNetDestroy()
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -97,7 +97,7 @@ BOOL SNetDestroy()
 	return true;
 }
 
-BOOL SNetDropPlayer(int playerid, DWORD flags)
+bool SNetDropPlayer(int playerid, DWORD flags)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -105,7 +105,7 @@ BOOL SNetDropPlayer(int playerid, DWORD flags)
 	return dvlnet_inst->SNetDropPlayer(playerid, flags);
 }
 
-BOOL SNetGetGameInfo(int type, void *dst, unsigned int length)
+bool SNetGetGameInfo(int type, void *dst, unsigned int length)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -122,7 +122,7 @@ BOOL SNetGetGameInfo(int type, void *dst, unsigned int length)
 	return true;
 }
 
-BOOL SNetLeaveGame(int type)
+bool SNetLeaveGame(int type)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -148,7 +148,7 @@ int SNetInitializeProvider(Uint32 provider, struct GameData *gameData)
 /**
  * @brief Called by engine for single, called by ui for multi
  */
-BOOL SNetCreateGame(const char *pszGameName, const char *pszGamePassword, const char *pszGameStatString,
+bool SNetCreateGame(const char *pszGameName, const char *pszGamePassword, const char *pszGameStatString,
     DWORD dwGameType, char *GameTemplateData, int GameTemplateSize, int playerCount,
     const char *creatorName, const char *a11, int *playerID)
 {
@@ -173,7 +173,7 @@ BOOL SNetCreateGame(const char *pszGameName, const char *pszGamePassword, const
 	return *playerID != -1;
 }
 
-BOOL SNetJoinGame(int id, char *pszGameName, char *pszGamePassword, char *playerName, char *userStats, int *playerID)
+bool SNetJoinGame(int id, char *pszGameName, char *pszGamePassword, char *playerName, char *userStats, int *playerID)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -189,7 +189,7 @@ BOOL SNetJoinGame(int id, char *pszGameName, char *pszGamePassword, char *player
 /**
  * @brief Is this the mirror image of SNetGetTurnsInTransit?
  */
-BOOL SNetGetOwnerTurnsWaiting(DWORD *turns)
+bool SNetGetOwnerTurnsWaiting(DWORD *turns)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -197,7 +197,7 @@ BOOL SNetGetOwnerTurnsWaiting(DWORD *turns)
 	return dvlnet_inst->SNetGetOwnerTurnsWaiting(turns);
 }
 
-BOOL SNetGetTurnsInTransit(DWORD *turns)
+bool SNetGetTurnsInTransit(DWORD *turns)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);
@@ -219,7 +219,7 @@ bool SNetSetBasePlayer(int)
 /**
  * @brief since we never signal STORM_ERROR_REQUIRES_UPGRADE the engine will not call this function
  */
-BOOL SNetPerformUpgrade(DWORD *upgradestatus)
+bool SNetPerformUpgrade(DWORD *upgradestatus)
 {
 #ifndef NONET
 	std::lock_guard<std::mutex> lg(storm_net_mutex);