Skip to content

Commit

Permalink
Merge pull request diasurgical#1315 from mewpull/cleanup5
Browse files Browse the repository at this point in the history
Use boolean values where applicable.
  • Loading branch information
mewmew authored Jul 19, 2019
2 parents 7451415 + 7441f29 commit 626587f
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 43 deletions.
80 changes: 40 additions & 40 deletions Source/items.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,41 +71,41 @@ char *ItemDropStrs[35] = {
"FLazStaf"
};
BYTE ItemAnimLs[35] = {
15u,
13u,
16u,
13u,
10u,
13u,
13u,
13u,
13u,
10u,
13u,
13u,
13u,
13u,
13u,
13u,
13u,
13u,
13u,
1u,
16u,
16u,
16u,
16u,
16u,
16u,
16u,
16u,
13u,
12u,
12u,
13u,
13u,
13u,
8u
15,
13,
16,
13,
10,
13,
13,
13,
13,
10,
13,
13,
13,
13,
13,
13,
13,
13,
13,
1,
16,
16,
16,
16,
16,
16,
16,
16,
13,
12,
12,
13,
13,
13,
8
};
int ItemDropSnds[35] = {
IS_FHARM,
Expand Down Expand Up @@ -238,10 +238,10 @@ void AddInitItems()
GetItemAttrs(i, IDI_HEAL, currlevel);
else
GetItemAttrs(i, IDI_MANA, currlevel);
item[i]._iCreateInfo = currlevel - 32768;
item[i]._iCreateInfo = currlevel - 0x8000;
SetupItem(i);
item[i]._iAnimFrame = item[i]._iAnimLen;
item[i]._iAnimFlag = 0;
item[i]._iAnimFlag = FALSE;
item[i]._iSelFlag = 1;
DeltaAddItem(i);
numitems++;
Expand All @@ -264,7 +264,7 @@ void InitItems()
item[i]._isin = 0;
item[i]._iSelFlag = 0;
item[i]._iIdentified = FALSE;
item[i]._iPostDraw = 0;
item[i]._iPostDraw = FALSE;
}

for (i = 0; i < MAXITEMS; i++) {
Expand Down Expand Up @@ -315,7 +315,7 @@ void CalcPlrItemVals(int p, BOOL Loadgfx)
signed int mr = 0; // magic resistance

int dmod = 0; // bonus damage mod?
int ghit = 0; // (reduced) chance to get hit
int ghit = 0; // increased damage from enemies

signed int lrad = 10; // light radius

Expand Down Expand Up @@ -2355,7 +2355,7 @@ void SpawnRock()
GetItemAttrs(i, IDI_ROCK, currlevel);
SetupItem(i);
item[i]._iSelFlag = 2;
item[i]._iPostDraw = 1;
item[i]._iPostDraw = TRUE;
item[i]._iAnimFrame = 11;
numitems++;
}
Expand Down
6 changes: 3 additions & 3 deletions Source/objects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3392,15 +3392,15 @@ void OperateShrine(int pnum, int i, int sType)
return;
for (j = 0; j < 7; j++) {
if (plr[pnum].InvBody[j]._iMagical && !plr[pnum].InvBody[j]._iIdentified)
plr[pnum].InvBody[j]._iIdentified = 1;
plr[pnum].InvBody[j]._iIdentified = TRUE;
}
for (j = 0; j < plr[pnum]._pNumInv; j++) {
if (plr[pnum].InvList[j]._iMagical && !plr[pnum].InvList[j]._iIdentified)
plr[pnum].InvList[j]._iIdentified = 1;
plr[pnum].InvList[j]._iIdentified = TRUE;
}
for (j = 0; j < 8; j++) {
if (plr[pnum].SpdList[j]._iMagical && !plr[pnum].SpdList[j]._iIdentified)
plr[pnum].SpdList[j]._iIdentified = 1; // belt items can't be magical?
plr[pnum].SpdList[j]._iIdentified = TRUE; // belt items can't be magical?
}
InitDiabloMsg(EMSG_SHRINE_GLIMMERING);
break;
Expand Down

0 comments on commit 626587f

Please sign in to comment.