Browse Source

Make _pBlockFlag into a boolean.

_pBlockFlag is only ever used in boolean contexts.
pull/197/head
Robin Eklind 7 years ago
parent
commit
3f4a539bf7
  1. 6
      Source/items.cpp
  2. 2
      structs.h

6
Source/items.cpp

@ -515,7 +515,7 @@ void CalcPlrItemVals(int p, BOOL Loadgfx)
plr[p]._pInfraFlag = 0;
}
plr[p]._pBlockFlag = 0;
plr[p]._pBlockFlag = FALSE;
plr[p]._pwtype = WT_MELEE;
g = 0;
@ -552,11 +552,11 @@ void CalcPlrItemVals(int p, BOOL Loadgfx)
}
if (plr[p].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_SHIELD && plr[p].InvBody[INVLOC_HAND_LEFT]._iStatFlag) {
plr[p]._pBlockFlag = 1;
plr[p]._pBlockFlag = TRUE;
g++;
}
if (plr[p].InvBody[INVLOC_HAND_RIGHT]._itype == ITYPE_SHIELD && plr[p].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) {
plr[p]._pBlockFlag = 1;
plr[p]._pBlockFlag = TRUE;
g++;
}

2
structs.h

@ -224,7 +224,7 @@ typedef struct PlayerStruct {
int _pSplHotKey[4];
char _pSplTHotKey[4];
int _pwtype;
unsigned char _pBlockFlag;
BOOLEAN _pBlockFlag;
unsigned char _pInvincible;
char _pLightRad;
unsigned char _pLvlChanging;

Loading…
Cancel
Save