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

Apply itype enum

pull/93/head
Anders Jenbo 7 years ago
parent
27eabaefdb
commit
9890fbf89e
3 changed files with 60 additions and 60 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. 22
      Source/items.cpp
  2. 20
      Source/objects.cpp
  3. 78
      Source/stores.cpp

22
Source/items.cpp
Unescape View File

@ -707,7 +707,7 @@ void InitItems()
numitems = 0;
for (i = 0; i < MAXITEMS; i++) {
item[i]._itype = 0;
item[i]._itype = ITYPE_MISC;
item[i]._ix = 0;
item[i]._iy = 0;
item[i]._isin = 0;
@ -1154,7 +1154,7 @@ void CalcPlrItemMin(int pnum)
pi = p->SpdList;
for (i = MAXBELTITEMS; i != 0; i--) {
if (pi->_itype != -1) {
if (pi->_itype != ITYPE_NONE) {
pi->_iStatFlag = ItemMinStats(p, pi);
}
pi++;
@ -3159,7 +3159,7 @@ void RepairItem(ItemStruct *i, int lvl)
}
}
}
i->_itype = -1;
i->_itype = ITYPE_NONE;
}
}
@ -4028,7 +4028,7 @@ void SortSmith()
BOOL sorted;
j = 0;
while (smithitem[j + 1]._itype != -1) {
while (smithitem[j + 1]._itype != ITYPE_NONE) {
j++;
}
@ -4065,7 +4065,7 @@ void SpawnSmith(int lvl)
smithitem[i]._iStatFlag = StoreStatOk(&smithitem[i]);
}
for (i = iCnt; i < 20; i++)
smithitem[i]._itype = -1;
smithitem[i]._itype = ITYPE_NONE;
SortSmith();
}
@ -4144,7 +4144,7 @@ void SpawnPremium(int lvl)
if (numpremium < 6) {
for (i = 0; i < 6; i++) {
if (premiumitem[i]._itype == -1)
if (premiumitem[i]._itype == ITYPE_NONE)
SpawnOnePremium(i, premiumlevel + premiumlvladd[i]);
}
numpremium = 6;
@ -4211,7 +4211,7 @@ void SortWitch()
BOOL sorted;
j = 3;
while (witchitem[j + 1]._itype != -1) {
while (witchitem[j + 1]._itype != ITYPE_NONE) {
j++;
}
@ -4291,7 +4291,7 @@ void SpawnWitch(int lvl)
}
for (i = iCnt; i < 20; i++)
witchitem[i]._itype = -1;
witchitem[i]._itype = ITYPE_NONE;
SortWitch();
}
@ -4317,7 +4317,7 @@ void SpawnBoy(int lvl)
{
int itype;
if (boylevel<lvl>> 1 || boyitem._itype == -1) {
if (boylevel<lvl>> 1 || boyitem._itype == ITYPE_NONE) {
do {
item[0]._iSeed = GetRndSeed();
SetRndSeed(item[0]._iSeed);
@ -4402,7 +4402,7 @@ void SortHealer()
BOOL sorted;
j = 2;
while (healitem[j + 1]._itype != -1) {
while (healitem[j + 1]._itype != ITYPE_NONE) {
j++;
}
@ -4457,7 +4457,7 @@ void SpawnHealer(int lvl)
healitem[i]._iStatFlag = StoreStatOk(&healitem[i]);
}
for (i = nsi; i < 20; i++) {
healitem[i]._itype = -1;
healitem[i]._itype = ITYPE_NONE;
}
SortHealer();
}

20
Source/objects.cpp
Unescape View File

@ -3247,12 +3247,12 @@ void OperateShrine(int pnum, int i, int sType)
if (deltaload || pnum != myplr)
return;
for (j = 0; j < 7; j++) {
if (plr[pnum].InvBody[j]._itype != -1)
if (plr[pnum].InvBody[j]._itype != ITYPE_NONE)
v12++;
}
if (v12 > 0) {
for (j = 0; j < 7; j++) {
if (plr[pnum].InvBody[j]._itype != -1
if (plr[pnum].InvBody[j]._itype != ITYPE_NONE
&& plr[pnum].InvBody[j]._iMaxDur != 255
&& plr[pnum].InvBody[j]._iMaxDur) {
plr[pnum].InvBody[j]._iDurability += 10;
@ -3263,7 +3263,7 @@ void OperateShrine(int pnum, int i, int sType)
}
v12 = 0;
for (j = 0; j < 7; j++) {
if (plr[pnum].InvBody[j]._itype != -1
if (plr[pnum].InvBody[j]._itype != ITYPE_NONE
&& plr[pnum].InvBody[j]._iMaxDur != 255
&& plr[pnum].InvBody[j]._iMaxDur)
v12++;
@ -3271,7 +3271,7 @@ void OperateShrine(int pnum, int i, int sType)
if (v12 > 0) { // check
do {
v21 = random(0, 7);
} while (plr[pnum].InvBody[v21]._itype == -1 || plr[pnum].InvBody[v21]._iMaxDur == 255 || !plr[pnum].InvBody[v21]._iMaxDur);
} while (plr[pnum].InvBody[v21]._itype == ITYPE_NONE || plr[pnum].InvBody[v21]._iMaxDur == 255 || !plr[pnum].InvBody[v21]._iMaxDur);
plr[pnum].InvBody[v21]._iDurability -= 20;
plr[pnum].InvBody[v21]._iMaxDur -= 20;
@ -3287,11 +3287,11 @@ void OperateShrine(int pnum, int i, int sType)
if (deltaload)
return;
if (pnum == myplr) {
if (plr[pnum].InvBody[INVLOC_HEAD]._itype != -1)
if (plr[pnum].InvBody[INVLOC_HEAD]._itype != ITYPE_NONE)
plr[pnum].InvBody[INVLOC_HEAD]._iAC += 2;
if (plr[pnum].InvBody[INVLOC_CHEST]._itype != -1)
if (plr[pnum].InvBody[INVLOC_CHEST]._itype != ITYPE_NONE)
plr[pnum].InvBody[INVLOC_CHEST]._iAC += 2;
if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype != -1) {
if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_NONE) {
if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_SHIELD) {
plr[pnum].InvBody[INVLOC_HAND_LEFT]._iAC += 2;
} else {
@ -3300,7 +3300,7 @@ void OperateShrine(int pnum, int i, int sType)
plr[pnum].InvBody[INVLOC_HAND_LEFT]._iMaxDam = plr[pnum].InvBody[INVLOC_HAND_LEFT]._iMinDam;
}
}
if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype != -1) {
if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype != ITYPE_NONE) {
if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype == ITYPE_SHIELD) {
plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iAC += 2;
} else {
@ -3327,9 +3327,9 @@ void OperateShrine(int pnum, int i, int sType)
if (deltaload)
return;
if (pnum == myplr) {
if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype != -1 && plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_SHIELD)
if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_NONE && plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_SHIELD)
plr[pnum].InvBody[INVLOC_HAND_LEFT]._iMaxDam++;
if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype != -1 && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype != ITYPE_SHIELD)
if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype != ITYPE_NONE && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype != ITYPE_SHIELD)
plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iMaxDam++;
for (j = 0; j < plr[pnum]._pNumInv; j++) {
if (plr[pnum].InvList[j]._itype > 0 && (plr[pnum].InvList[j]._itype <= ITYPE_MACE || plr[pnum].InvList[j]._itype == ITYPE_STAFF))

78
Source/stores.cpp
Unescape View File

@ -88,9 +88,9 @@ void InitStores()
premiumlevel = 1;
for (i = 0; i < 6; i++)
premiumitem[i]._itype = -1;
premiumitem[i]._itype = ITYPE_NONE;
boyitem._itype = -1;
boyitem._itype = ITYPE_NONE;
boylevel = 0;
}
@ -576,7 +576,7 @@ void S_StartSBuy()
AddSText(0, 22, 1, "Back", COL_WHITE, 0);
OffsetSTextY(22, 6);
storenumh = 0;
for (i = 0; smithitem[i]._itype != -1; i++)
for (i = 0; smithitem[i]._itype != ITYPE_NONE; i++)
storenumh++;
stextsmax = storenumh - 4;
if (stextsmax < 0)
@ -605,7 +605,7 @@ void S_ScrollSPBuy(int idx)
if (v3) {
v5 = &premiumitem[0]._itype;
do {
if (*v5 != -1)
if (*v5 != ITYPE_NONE)
--v3;
++v4;
v5 += 92;
@ -644,7 +644,7 @@ BOOL S_StartSPBuy()
storenumh = 0;
for (i = 0; i < 6; i++) {
if (premiumitem[i]._itype != -1)
if (premiumitem[i]._itype != ITYPE_NONE)
storenumh++;
}
if (!storenumh) {
@ -750,7 +750,7 @@ void S_StartSSell()
storenumh = 0;
for (i = 0; i < 48; i++)
storehold[i]._itype = -1;
storehold[i]._itype = ITYPE_NONE;
for (i = 0; i < plr[myplr]._pNumInv; i++) {
if (SmithSellOk(i)) {
@ -962,12 +962,12 @@ void S_StartWBuy()
OffsetSTextY(22, 6);
v1 = 0;
storenumh = 0;
if (witchitem[0]._itype != -1) {
if (witchitem[0]._itype != ITYPE_NONE) {
v2 = &witchitem[0]._itype;
do {
v2 += 92;
++v1;
} while (*v2 != -1);
} while (*v2 != ITYPE_NONE);
storenumh = v1;
}
stextsmax = v1 - 4;
@ -1011,7 +1011,7 @@ void S_StartWSell()
storenumh = 0;
for (i = 0; i < 48; i++)
storehold[i]._itype = -1;
storehold[i]._itype = ITYPE_NONE;
for (i = 0; i < plr[myplr]._pNumInv; i++) {
if (WitchSellOk(i)) {
@ -1030,7 +1030,7 @@ void S_StartWSell()
}
for (i = 0; i < MAXBELTITEMS; i++) {
if (plr[myplr].SpdList[i]._itype != -1 && WitchSellOk(-(i + 1))) {
if (plr[myplr].SpdList[i]._itype != ITYPE_NONE && WitchSellOk(-(i + 1))) {
sellok = TRUE;
storehold[storenumh] = plr[myplr].SpdList[i];
@ -1230,18 +1230,18 @@ void S_StartBoy()
{
stextsize = 0;
stextscrl = FALSE;
AddSText(0, 2, 1u, "Wirt the Peg-legged boy", COL_GOLD, 0);
AddSText(0, 2, 1, "Wirt the Peg-legged boy", COL_GOLD, 0);
AddSLine(5);
if (boyitem._itype != -1) {
AddSText(0, 8, 1u, "Talk to Wirt", COL_BLUE, 1);
AddSText(0, 12, 1u, "I have something for sale,", COL_GOLD, 0);
AddSText(0, 14, 1u, "but it will cost 50 gold", COL_GOLD, 0);
AddSText(0, 16, 1u, "just to take a look. ", COL_GOLD, 0);
AddSText(0, 18, 1u, "What have you got?", COL_WHITE, 1);
AddSText(0, 20, 1u, "Say goodbye", COL_WHITE, 1);
if (boyitem._itype != ITYPE_NONE) {
AddSText(0, 8, 1, "Talk to Wirt", COL_BLUE, 1);
AddSText(0, 12, 1, "I have something for sale,", COL_GOLD, 0);
AddSText(0, 14, 1, "but it will cost 50 gold", COL_GOLD, 0);
AddSText(0, 16, 1, "just to take a look. ", COL_GOLD, 0);
AddSText(0, 18, 1, "What have you got?", COL_WHITE, 1);
AddSText(0, 20, 1, "Say goodbye", COL_WHITE, 1);
} else {
AddSText(0, 12, 1u, "Talk to Wirt", COL_BLUE, 1);
AddSText(0, 18, 1u, "Say goodbye", COL_WHITE, 1);
AddSText(0, 12, 1, "Talk to Wirt", COL_BLUE, 1);
AddSText(0, 18, 1, "Say goodbye", COL_WHITE, 1);
}
}
// 6A09E0: using guessed type char stextsize;
@ -1328,15 +1328,15 @@ void S_StartHBuy()
stextscrl = TRUE;
stextsval = 0;
sprintf(tempstr, "I have these items for sale : Your gold : %i", plr[myplr]._pGold);
AddSText(0, 1, 1u, tempstr, COL_GOLD, 0);
AddSText(0, 1, 1, tempstr, COL_GOLD, 0);
AddSLine(3);
AddSLine(21);
S_ScrollHBuy(stextsval);
AddSText(0, 22, 1u, "Back", COL_WHITE, 0);
AddSText(0, 22, 1, "Back", COL_WHITE, 0);
OffsetSTextY(22, 6);
storenumh = 0;
for (i = 0; healitem[i]._itype != -1; i++) {
for (i = 0; healitem[i]._itype != ITYPE_NONE; i++) {
storenumh++;
}
stextsmax = storenumh - 4;
@ -1358,7 +1358,7 @@ void S_StartStory()
BOOL IdItemOk(ItemStruct *i)
{
if (i->_itype == -1) {
if (i->_itype == ITYPE_NONE) {
return FALSE;
}
if (i->_iMagical == ITEM_QUALITY_NORMAL) {
@ -1388,7 +1388,7 @@ void S_StartSIdentify()
storenumh = 0;
for (i = 0; i < 48; i++)
storehold[i]._itype = -1;
storehold[i]._itype = ITYPE_NONE;
if (IdItemOk(&plr[myplr].InvBody[INVLOC_HEAD])) {
idok = TRUE;
@ -2146,12 +2146,12 @@ void SmithBuyItem()
StoreAutoPlace();
idx = stextvhold + ((stextlhold - stextup) >> 2);
if (idx == 19) {
smithitem[19]._itype = -1;
smithitem[19]._itype = ITYPE_NONE;
} else {
for (; smithitem[idx + 1]._itype != -1; idx++) {
for (; smithitem[idx + 1]._itype != ITYPE_NONE; idx++) {
smithitem[idx] = smithitem[idx + 1];
}
smithitem[idx]._itype = -1;
smithitem[idx]._itype = ITYPE_NONE;
}
CalcPlrInv(myplr, 1);
}
@ -2207,7 +2207,7 @@ void SmithBuyPItem()
i = 0;
if (!v2) {
do {
if (premiumitem[i]._itype != -1) {
if (premiumitem[i]._itype != ITYPE_NONE) {
--v3;
xx = i;
}
@ -2215,7 +2215,7 @@ void SmithBuyPItem()
} while (v3 >= 0);
}
premiumitem[xx]._itype = -1;
premiumitem[xx]._itype = ITYPE_NONE;
--numpremium;
SpawnPremium(plr[myplr]._pLevel);
}
@ -2238,7 +2238,7 @@ void S_SPBuyEnter()
xx = stextsval + ((stextsel - stextup) >> 2);
idx = 0;
for (i = 0; xx >= 0; i++) {
if (premiumitem[i]._itype != -1) {
if (premiumitem[i]._itype != ITYPE_NONE) {
xx--;
idx = i;
}
@ -2479,12 +2479,12 @@ void WitchBuyItem()
if (idx >= 3) {
if (idx == 19) {
witchitem[19]._itype = -1;
witchitem[19]._itype = ITYPE_NONE;
} else {
for (; witchitem[idx + 1]._itype != -1; idx++) {
for (; witchitem[idx + 1]._itype != ITYPE_NONE; idx++) {
witchitem[idx] = witchitem[idx + 1];
}
witchitem[idx]._itype = -1;
witchitem[idx]._itype = ITYPE_NONE;
}
}
@ -2624,9 +2624,9 @@ void BoyBuyItem()
{
TakePlrsMoney(plr[myplr].HoldItem._iIvalue);
StoreAutoPlace();
boyitem._itype = -1;
boyitem._itype = ITYPE_NONE;
stextshold = 12;
CalcPlrInv(myplr, 1u);
CalcPlrInv(myplr, 1);
}
void HealerBuyItem()
@ -2664,12 +2664,12 @@ void HealerBuyItem()
if (ok) {
idx = stextvhold + ((stextlhold - stextup) >> 2);
if (idx == 19) {
healitem[19]._itype = -1;
healitem[19]._itype = ITYPE_NONE;
} else {
for (; healitem[idx + 1]._itype != -1; idx++) {
for (; healitem[idx + 1]._itype != ITYPE_NONE; idx++) {
healitem[idx] = healitem[idx + 1];
}
healitem[idx]._itype = -1;
healitem[idx]._itype = ITYPE_NONE;
}
CalcPlrInv(myplr, TRUE);
}

Write Preview
Loading…
Cancel
Save