From 983d2d6769e6bb075bc809cea361bf378ca93c60 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Wed, 17 Jul 2019 12:24:07 +0200 Subject: [PATCH] Make _pLvlChanging into a boolean. _pLvlChanging is only ever used in boolean contexts. --- Source/msg.cpp | 2 +- Source/multi.cpp | 2 +- Source/player.cpp | 4 ++-- structs.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/msg.cpp b/Source/msg.cpp index cad78aba0..3a729303e 100644 --- a/Source/msg.cpp +++ b/Source/msg.cpp @@ -2337,7 +2337,7 @@ DWORD On_PLAYER_JOINLEVEL(TCmd *pCmd, int pnum) if (gbBufferMsgs == 1) msg_send_packet(pnum, p, sizeof(*p)); else { - plr[pnum]._pLvlChanging = 0; + plr[pnum]._pLvlChanging = FALSE; if (plr[pnum]._pName[0] && !plr[pnum].plractive) { plr[pnum].plractive = TRUE; gbActivePlayers++; diff --git a/Source/multi.cpp b/Source/multi.cpp index 3033ce1be..466ccd57f 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -791,7 +791,7 @@ void SetupLocalCoords() plr[myplr]._ptargx = x; plr[myplr]._ptargy = y; plr[myplr].plrlevel = currlevel; - plr[myplr]._pLvlChanging = 1; + plr[myplr]._pLvlChanging = TRUE; plr[myplr].pLvlLoad = 0; plr[myplr]._pmode = PM_NEWLVL; plr[myplr].destAction = ACTION_NONE; diff --git a/Source/player.cpp b/Source/player.cpp index a6fe55e66..fe82b7cc5 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -635,7 +635,7 @@ void CreatePlayer(int pnum, char c) plr[pnum]._pSLvlVisited[i] = 0; } - plr[pnum]._pLvlChanging = 0; + plr[pnum]._pLvlChanging = FALSE; plr[pnum].pTownWarps = 0; plr[pnum].pLvlLoad = 0; plr[pnum].pBattleNet = 0; @@ -1962,7 +1962,7 @@ void InitLevelChange(int pnum) ClrPlrPath(pnum); plr[pnum].destAction = ACTION_NONE; - plr[pnum]._pLvlChanging = 1; + plr[pnum]._pLvlChanging = TRUE; if (pnum == myplr) { plr[pnum].pLvlLoad = 10; diff --git a/structs.h b/structs.h index 68a23ba98..d8a9dc3d9 100644 --- a/structs.h +++ b/structs.h @@ -227,7 +227,7 @@ typedef struct PlayerStruct { BOOLEAN _pBlockFlag; BOOLEAN _pInvincible; char _pLightRad; - unsigned char _pLvlChanging; + BOOLEAN _pLvlChanging; char _pName[PLR_NAME_LEN]; // plr_class enum value. // TODO: this could very well be `enum plr_class _pClass`