mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

♻️ Change BOOLEAN to bool 

fixup BOOLEAN
pull/1267/head
Anders Jenbo 5 years ago
parent
9c850a1ab0
commit
4ee84aea1a
26 changed files with 72 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      3rdParty/Storm/Source/storm.h
  2. 4
      Source/control.cpp
  3. 2
      Source/diablo.cpp
  4. 2
      Source/diablo.h
  5. 6
      Source/doom.cpp
  6. 6
      Source/drlg_l3.cpp
  7. 2
      Source/dthread.cpp
  8. 14
      Source/gendung.cpp
  9. 14
      Source/gendung.h
  10. 4
      Source/gmenu.cpp
  11. 4
      Source/items.cpp
  12. 12
      Source/missiles.cpp
  13. 4
      Source/missiles.h
  14. 6
      Source/monster.cpp
  15. 4
      Source/monster.h
  16. 2
      Source/msg.cpp
  17. 14
      Source/multi.cpp
  18. 6
      Source/multi.h
  19. 6
      Source/nthread.cpp
  20. 8
      Source/objects.cpp
  21. 2
      Source/palette.cpp
  22. 2
      Source/scrollrt.cpp
  23. 2
      Source/scrollrt.h
  24. 8
      Source/sound.h
  25. 6
      SourceX/sound.cpp
  26. 2
      SourceX/storm/storm_net.cpp

2
3rdParty/Storm/Source/storm.h vendored
Unescape View File

@ -314,7 +314,7 @@ BOOL SVidPlayContinue(void);
BOOL SNetGetOwnerTurnsWaiting(DWORD *);
bool SNetUnregisterEventHandler(event_type, SEVTHANDLER);
bool SNetRegisterEventHandler(event_type, SEVTHANDLER);
BOOLEAN SNetSetBasePlayer(int);
bool SNetSetBasePlayer(int);
int SNetInitializeProvider(Uint32 provider, struct GameData *gameData);
int SNetGetProviderCaps(struct _SNETCAPS *);
BOOL SFileEnableDirectAccess(BOOL enable);

4
Source/control.cpp
Unescape View File

@ -46,7 +46,7 @@ int sgbPlrTalkTbl;
BYTE *pGBoxBuff;
BYTE *pSBkBtnCel;
char tempstr[256];
BOOLEAN whisper[MAX_PLRS];
bool whisper[MAX_PLRS];
int sbooktab;
spell_type pSplType;
int initialDropGoldIndex;
@ -1102,7 +1102,7 @@ void CheckPanelInfo()
void CheckBtnUp()
{
int i;
BOOLEAN gamemenuOff;
bool gamemenuOff;
gamemenuOff = TRUE;
drawbtnflag = TRUE;

2
Source/diablo.cpp
Unescape View File

@ -29,7 +29,7 @@ BOOL zoomflag;
/** Enable updating of player character, set to false once Diablo dies */
BOOL gbProcessPlayers;
bool gbLoadGame;
BOOLEAN cineflag;
bool cineflag;
int force_redraw;
BOOL light4flag;
int setseed;

2
Source/diablo.h
Unescape View File

@ -38,7 +38,7 @@ extern BOOL gbRunGameResult;
extern BOOL zoomflag;
extern BOOL gbProcessPlayers;
extern bool gbLoadGame;
extern BOOLEAN cineflag;
extern bool cineflag;
extern int force_redraw;
/* These are defined in fonts.h */
extern BOOL was_fonts_init;

6
Source/doom.cpp
Unescape View File

@ -50,16 +50,16 @@ void doom_cleanup()
}
}
static BOOLEAN doom_alloc_cel()
static bool doom_alloc_cel()
{
doom_cleanup();
pDoomCel = DiabloAllocPtr(0x39000);
return pDoomCel ? TRUE : FALSE;
}
static BOOLEAN doom_load_graphics()
static bool doom_load_graphics()
{
BOOLEAN ret;
bool ret;
ret = FALSE;
strcpy(tempstr, "Items\\Map\\MapZtown.CEL");

6
Source/drlg_l3.cpp
Unescape View File

@ -15,7 +15,7 @@ namespace {
/** This will be true if a lava pool has been generated for the level */
Uint8 lavapool;
int lockoutcnt;
BOOLEAN lockout[DMAXX][DMAXY];
bool lockout[DMAXX][DMAXY];
/**
* A lookup table for the 16 possible patterns of a 2x2 area,
@ -1745,11 +1745,11 @@ static void DRLG_L3PlaceRndSet(const BYTE *miniset, int rndper)
}
}
BOOLEAN drlg_l3_hive_rnd_piece(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;
BOOLEAN placed;
bool placed;
placed = FALSE;
sw = miniset[0];

2
Source/dthread.cpp
Unescape View File

@ -11,7 +11,7 @@ namespace devilution {
static CCritSect sgMemCrit;
SDL_threadID glpDThreadId;
TMegaPkt *sgpInfoHead; /* may not be right struct */
BOOLEAN dthread_running;
bool dthread_running;
event_emul *sghWorkToDoEvent;
/* rdata */

14
Source/gendung.cpp
Unescape View File

@ -37,20 +37,20 @@ char block_lvid[MAXTILES + 1];
/**
* List of light blocking dPieces
*/
BOOLEAN nBlockTable[MAXTILES + 1];
bool nBlockTable[MAXTILES + 1];
/**
* List of path blocking dPieces
*/
BOOLEAN nSolidTable[MAXTILES + 1];
bool nSolidTable[MAXTILES + 1];
/**
* List of transparent dPieces
*/
BOOLEAN nTransTable[MAXTILES + 1];
bool nTransTable[MAXTILES + 1];
/**
* List of missile blocking dPieces
*/
BOOLEAN nMissileTable[MAXTILES + 1];
BOOLEAN nTrapTable[MAXTILES + 1];
bool nMissileTable[MAXTILES + 1];
bool nTrapTable[MAXTILES + 1];
/** Specifies the minimum X-coordinate of the map. */
int dminx;
/** Specifies the minimum Y-coordinate of the map. */
@ -64,7 +64,7 @@ int gnDifficulty;
dungeon_type leveltype;
/** Specifies the active dungeon level of the current game. */
BYTE currlevel;
BOOLEAN setlevel;
bool setlevel;
/** Specifies the active quest level of the current game. */
BYTE setlvlnum;
/** Level type of the active quest level */
@ -85,7 +85,7 @@ int LvlViewY;
int MicroTileLen;
char TransVal;
/** Specifies the active transparency indices. */
BOOLEAN TransList[256];
bool TransList[256];
/** Contains the piece IDs of each tile on the map. */
int dPiece[MAXDUNX][MAXDUNY];
/** Specifies the dungeon piece information for a given coordinate and block number. */

14
Source/gendung.h
Unescape View File

@ -66,11 +66,11 @@ extern BYTE *pMegaTiles;
extern BYTE *pLevelPieces;
extern BYTE *pDungeonCels;
extern char block_lvid[MAXTILES + 1];
extern BOOLEAN nBlockTable[MAXTILES + 1];
extern BOOLEAN nSolidTable[MAXTILES + 1];
extern BOOLEAN nTransTable[MAXTILES + 1];
extern BOOLEAN nMissileTable[MAXTILES + 1];
extern BOOLEAN nTrapTable[MAXTILES + 1];
extern bool nBlockTable[MAXTILES + 1];
extern bool nSolidTable[MAXTILES + 1];
extern bool nTransTable[MAXTILES + 1];
extern bool nMissileTable[MAXTILES + 1];
extern bool nTrapTable[MAXTILES + 1];
extern int dminx;
extern int dminy;
extern int dmaxx;
@ -78,7 +78,7 @@ extern int dmaxy;
extern int gnDifficulty;
extern dungeon_type leveltype;
extern BYTE currlevel;
extern BOOLEAN setlevel;
extern bool setlevel;
extern BYTE setlvlnum;
extern dungeon_type setlvltype;
extern int ViewX;
@ -92,7 +92,7 @@ extern int LvlViewX;
extern int LvlViewY;
extern int MicroTileLen;
extern char TransVal;
extern BOOLEAN TransList[256];
extern bool TransList[256];
extern int dPiece[MAXDUNX][MAXDUNY];
extern MICROS dpiece_defs_map_2[MAXDUNX][MAXDUNY];
extern char dTransVal[MAXDUNX][MAXDUNY];

4
Source/gmenu.cpp
Unescape View File

@ -11,7 +11,7 @@
namespace devilution {
BYTE *optbar_cel;
BOOLEAN mouseNavigation;
bool mouseNavigation;
BYTE *PentSpin_cel;
TMenuItem *sgpCurrItem;
BYTE *BigTGold_cel;
@ -309,7 +309,7 @@ BOOL gmenu_presskeys(int vkey)
return TRUE;
}
static BOOLEAN gmenu_get_mouse_slider(int *plOffset)
static bool gmenu_get_mouse_slider(int *plOffset)
{
*plOffset = 282;
if (MouseX < 282 + PANEL_LEFT) {

4
Source/items.cpp
Unescape View File

@ -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, BOOLEAN allowspells)
void GetItemBonus(int i, int idata, int minlvl, int maxlvl, BOOL onlygood, bool allowspells)
{
if (minlvl > 25)
minlvl = 25;
@ -2635,7 +2635,7 @@ int RndTypeItems(int itype, int imid, int lvl)
int CheckUnique(int i, int lvl, int uper, BOOL recreate)
{
int j, idata, numu;
BOOLEAN uok[128];
bool uok[128];
if (random_(28, 100) > uper)
return UITYPE_INVALID;

12
Source/missiles.cpp
Unescape View File

@ -528,7 +528,7 @@ void MoveMissilePos(int i)
}
}
BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, BOOLEAN shift)
BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift)
{
int hit, hper, dam, mor;
BOOL resist, ret;
@ -609,7 +609,7 @@ BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, BOOLEAN shif
}
}
BOOL MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, BOOLEAN 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;
@ -735,7 +735,7 @@ BOOL MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, BOOLE
return FALSE;
}
BOOL PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, BOOLEAN shift, int earflag, BOOLEAN *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, BOOLEA
return FALSE;
}
BOOL Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, BOOLEAN shift, BOOLEAN *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,10 +1027,10 @@ 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, BOOLEAN nodel)
void CheckMissileCol(int i, int mindam, int maxdam, BOOL shift, int mx, int my, bool nodel)
{
int oi;
BOOLEAN blocked;
bool blocked;
int dir, mAnimFAmt;
if (i >= MAXMISSILES || i < 0)

4
Source/missiles.h
Unescape View File

@ -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, BOOLEAN shift);
BOOL PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, BOOLEAN shift, int earflag, BOOLEAN *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);

6
Source/monster.cpp
Unescape View File

@ -19,7 +19,7 @@ int MissileFileFlag;
int monstkills[MAXMONSTERS];
int monstactive[MAXMONSTERS];
int nummonsters;
BOOLEAN sgbSaveSoundOn;
bool sgbSaveSoundOn;
MonsterStruct monster[MAXMONSTERS];
int totalmonsters;
CMonster Monsters[MAX_LVLMTYPES];
@ -5373,10 +5373,10 @@ BOOL PosOkMonst(int i, int x, int y)
return ret;
}
BOOLEAN monster_posok(int i, int x, int y)
bool monster_posok(int i, int x, int y)
{
int mi, j;
BOOLEAN ret, fire, lightning;
bool ret, fire, lightning;
ret = TRUE;
mi = dMissile[x][y];

4
Source/monster.h
Unescape View File

@ -190,7 +190,7 @@ struct MonsterStruct { // note: missing field _mAFNum
extern int monstkills[MAXMONSTERS];
extern int monstactive[MAXMONSTERS];
extern int nummonsters;
extern BOOLEAN sgbSaveSoundOn;
extern bool sgbSaveSoundOn;
extern MonsterStruct monster[MAXMONSTERS];
extern CMonster Monsters[MAX_LVLMTYPES];
extern int nummtypes;
@ -277,7 +277,7 @@ void PrintMonstHistory(int mt);
void PrintUniqueHistory();
void MissToMonst(int i, int x, int y);
BOOL PosOkMonst(int i, int x, int y);
BOOLEAN monster_posok(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);

2
Source/msg.cpp
Unescape View File

@ -21,7 +21,7 @@ static BYTE sgbRecvCmd;
static LocalLevel sgLocals[NUMLEVELS];
static DJunk sgJunk;
static TMegaPkt *sgpMegaPkt;
static BOOLEAN sgbDeltaChanged;
static bool sgbDeltaChanged;
static BYTE sgbDeltaChunks;
BOOL deltaload;
BYTE gbBufferMsgs;

14
Source/multi.cpp
Unescape View File

@ -11,20 +11,20 @@
namespace devilution {
BOOLEAN gbSomebodyWonGameKludge;
bool gbSomebodyWonGameKludge;
TBuffer sgHiPriBuf;
char szPlayerDescript[128];
WORD sgwPackPlrOffsetTbl[MAX_PLRS];
PkPlayerStruct netplr[MAX_PLRS];
BOOLEAN sgbPlayerTurnBitTbl[MAX_PLRS];
BOOLEAN sgbPlayerLeftGameTbl[MAX_PLRS];
bool sgbPlayerTurnBitTbl[MAX_PLRS];
bool sgbPlayerLeftGameTbl[MAX_PLRS];
DWORD sgbSentThisCycle;
BOOL gbShouldValidatePackage;
BYTE gbActivePlayers;
BOOLEAN gbGameDestroyed;
BOOLEAN sgbSendDeltaTbl[MAX_PLRS];
bool gbGameDestroyed;
bool sgbSendDeltaTbl[MAX_PLRS];
GameData sgGameInitInfo;
BOOLEAN gbSelectProvider;
bool gbSelectProvider;
int sglTimeoutStart;
int sgdwPlayerLeftReasonTbl[MAX_PLRS];
TBuffer sgLoPriBuf;
@ -34,7 +34,7 @@ DWORD sgdwGameLoops;
* represents a single player game and 4 represents a multi player game.
*/
bool gbIsMultiplayer;
BOOLEAN sgbTimeout;
bool sgbTimeout;
char szPlayerName[128];
BYTE gbDeltaSender;
BOOL sgbNetInited;

6
Source/multi.h
Unescape View File

@ -28,12 +28,12 @@ typedef struct GameData {
Uint8 bFriendlyFire;
} GameData;
extern BOOLEAN gbSomebodyWonGameKludge;
extern bool gbSomebodyWonGameKludge;
extern char szPlayerDescript[128];
extern WORD sgwPackPlrOffsetTbl[MAX_PLRS];
extern BYTE gbActivePlayers;
extern BOOLEAN gbGameDestroyed;
extern BOOLEAN gbSelectProvider;
extern bool gbGameDestroyed;
extern bool gbSelectProvider;
extern bool gbIsMultiplayer;
extern char szPlayerName[128];
extern BYTE gbDeltaSender;

6
Source/nthread.cpp
Unescape View File

@ -12,15 +12,15 @@ BYTE sgbNetUpdateRate;
DWORD gdwMsgLenTbl[MAX_PLRS];
static CCritSect sgMemCrit;
DWORD gdwDeltaBytesSec;
BOOLEAN nthread_should_run;
bool nthread_should_run;
DWORD gdwTurnsInTransit;
uintptr_t glpMsgTbl[MAX_PLRS];
SDL_threadID glpNThreadId;
char sgbSyncCountdown;
int turn_upper_bit;
BOOLEAN sgbTicsOutOfSync;
bool sgbTicsOutOfSync;
char sgbPacketCountdown;
BOOLEAN sgbThreadIsRunning;
bool sgbThreadIsRunning;
DWORD gdwLargestMsgSize;
DWORD gdwNormalMsgSize;
int last_tick;

8
Source/objects.cpp
Unescape View File

@ -255,7 +255,7 @@ _speech_id StoryText[3][3] = {
void InitObjectGFX()
{
BOOLEAN fileload[56];
bool fileload[56];
char filestr[32];
int i, j;
@ -2032,7 +2032,7 @@ void Obj_FlameTrap(int i)
if (dMonster[x][y] > 0)
MonsterTrapHit(dMonster[x][y] - 1, mindam / 2, maxdam / 2, 0, MIS_FIREWALLC, FALSE);
if (dPlayer[x][y] > 0) {
BOOLEAN unused;
bool unused;
PlayerMHit(dPlayer[x][y] - 1, -1, 0, mindam, maxdam, MIS_FIREWALLC, FALSE, 0, &unused);
}
@ -2046,7 +2046,7 @@ void Obj_FlameTrap(int i)
void Obj_Trap(int i)
{
int oti, dir;
BOOLEAN otrig;
bool otrig;
int sx, sy, dx, dy, x, y;
otrig = FALSE;
@ -4847,7 +4847,7 @@ void BreakBarrel(int pnum, int i, int dam, BOOL forcebreak, BOOL sendmsg)
for (xp = object[i]._ox - 1; xp <= object[i]._ox + 1; xp++) {
if (dMonster[xp][yp] > 0)
MonsterTrapHit(dMonster[xp][yp] - 1, 1, 4, 0, MIS_FIREBOLT, FALSE);
BOOLEAN unused;
bool unused;
if (dPlayer[xp][yp] > 0)
PlayerMHit(dPlayer[xp][yp] - 1, -1, 0, 8, 16, MIS_FIREBOLT, FALSE, 0, &unused);
if (dObject[xp][yp] > 0) {

2
Source/palette.cpp
Unescape View File

@ -18,7 +18,7 @@ Uint8 paletteTransparencyLookup[256][256]; //Lookup table for transparency
/* data */
/** Specifies whether the palette has max brightness. */
BOOLEAN sgbFadedIn = TRUE;
bool sgbFadedIn = TRUE;
void palette_update()
{

2
Source/scrollrt.cpp
Unescape View File

@ -28,7 +28,7 @@ DWORD sgdwCursHgt;
DWORD level_cel_block;
DWORD sgdwCursXOld;
DWORD sgdwCursYOld;
BOOLEAN AutoMapShowItems;
bool AutoMapShowItems;
/**
* Specifies the type of arches to render.
*/

2
Source/scrollrt.h
Unescape View File

@ -21,7 +21,7 @@ extern char arch_draw_type;
extern int cel_transparency_active;
extern int cel_foliage_active;
extern int level_piece_id;
extern BOOLEAN AutoMapShowItems;
extern bool AutoMapShowItems;
void ClearCursor();
void ShiftGrid(int *x, int *y, int horizontal, int vertical);

8
Source/sound.h
Unescape View File

@ -19,7 +19,7 @@ typedef struct TSnd {
Uint32 start_tc;
} TSnd;
extern BOOLEAN gbSndInited;
extern bool gbSndInited;
void snd_update(BOOL bStopAll);
void snd_stop_snd(TSnd *pSnd);
@ -37,9 +37,9 @@ int sound_get_or_set_sound_volume(int volume);
/* data */
extern BOOLEAN gbMusicOn;
extern BOOLEAN gbSoundOn;
extern BOOLEAN gbDupSounds;
extern bool gbMusicOn;
extern bool gbSoundOn;
extern bool gbDupSounds;
#ifdef __cplusplus
}

6
SourceX/sound.cpp
Unescape View File

@ -13,7 +13,7 @@
namespace devilution {
BOOLEAN gbSndInited;
bool gbSndInited;
/** Specifies whether background music is enabled. */
HANDLE sghMusic;
@ -37,9 +37,9 @@ void FreeMusicBuffer()
/* data */
BOOLEAN gbMusicOn = true;
bool gbMusicOn = true;
/** Specifies whether sound effects are enabled. */
BOOLEAN gbSoundOn = true;
bool gbSoundOn = true;
/** Specifies the active background music track id. */
int sgnMusicTrack = NUM_MUSIC;
/** Maps from track ID to track name in spawn. */

2
SourceX/storm/storm_net.cpp
Unescape View File

@ -208,7 +208,7 @@ BOOL SNetGetTurnsInTransit(DWORD *turns)
/**
* @brief engine calls this only once with argument 1
*/
BOOLEAN SNetSetBasePlayer(int)
bool SNetSetBasePlayer(int)
{
#ifndef NONET
std::lock_guard<std::mutex> lg(storm_net_mutex);

Write Preview
Loading…
Cancel
Save