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

♻️ Convert 'attribute_id' to a scoped enumeration

pull/1507/head
Juliano Leal Goncalves 5 years ago committed by Anders Jenbo
parent
f0a6561b09
commit
f54cc5aa95
7 changed files with 126 additions and 82 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. 70
      Source/control.cpp
  2. 41
      Source/enum_traits.h
  3. 20
      Source/items.cpp
  4. 10
      Source/objects.cpp
  5. 48
      Source/player.cpp
  6. 5
      Source/player.h
  7. 14
      SourceX/miniwin/misc_msg.cpp

70
Source/control.cpp
Unescape View File

@ -1505,25 +1505,25 @@ void DrawChr(CelOutputBuffer out)
col = COL_WHITE;
sprintf(chrstr, "%i", plr[myplr]._pBaseStr);
if (plr[myplr].GetMaximumAttributeValue(ATTRIB_STR) == plr[myplr]._pBaseStr)
if (plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR) == plr[myplr]._pBaseStr)
col = COL_GOLD;
ADD_PlrStringXY(out, 95, 155, 126, chrstr, col);
col = COL_WHITE;
sprintf(chrstr, "%i", plr[myplr]._pBaseMag);
if (plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG) == plr[myplr]._pBaseMag)
if (plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG) == plr[myplr]._pBaseMag)
col = COL_GOLD;
ADD_PlrStringXY(out, 95, 183, 126, chrstr, col);
col = COL_WHITE;
sprintf(chrstr, "%i", plr[myplr]._pBaseDex);
if (plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX) == plr[myplr]._pBaseDex)
if (plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX) == plr[myplr]._pBaseDex)
col = COL_GOLD;
ADD_PlrStringXY(out, 95, 211, 126, chrstr, col);
col = COL_WHITE;
sprintf(chrstr, "%i", plr[myplr]._pBaseVit);
if (plr[myplr].GetMaximumAttributeValue(ATTRIB_VIT) == plr[myplr]._pBaseVit)
if (plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT) == plr[myplr]._pBaseVit)
col = COL_GOLD;
ADD_PlrStringXY(out, 95, 239, 126, chrstr, col);
@ -1567,14 +1567,14 @@ void DrawChr(CelOutputBuffer out)
if (plr[myplr]._pStatPts > 0) {
sprintf(chrstr, "%i", plr[myplr]._pStatPts);
ADD_PlrStringXY(out, 95, 266, 126, chrstr, COL_RED);
if (plr[myplr]._pBaseStr < plr[myplr].GetMaximumAttributeValue(ATTRIB_STR))
CelDrawTo(out, 137, 159, pChrButtons, chrbtn[ATTRIB_STR] + 2, 41);
if (plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG))
CelDrawTo(out, 137, 187, pChrButtons, chrbtn[ATTRIB_MAG] + 4, 41);
if (plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX))
CelDrawTo(out, 137, 216, pChrButtons, chrbtn[ATTRIB_DEX] + 6, 41);
if (plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(ATTRIB_VIT))
CelDrawTo(out, 137, 244, pChrButtons, chrbtn[ATTRIB_VIT] + 8, 41);
if (plr[myplr]._pBaseStr < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR))
CelDrawTo(out, 137, 159, pChrButtons, chrbtn[static_cast<size_t>(attribute_id::ATTRIB_STR)] + 2, 41);
if (plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG))
CelDrawTo(out, 137, 187, pChrButtons, chrbtn[static_cast<size_t>(attribute_id::ATTRIB_MAG)] + 4, 41);
if (plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX))
CelDrawTo(out, 137, 216, pChrButtons, chrbtn[static_cast<size_t>(attribute_id::ATTRIB_DEX)] + 6, 41);
if (plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT))
CelDrawTo(out, 137, 244, pChrButtons, chrbtn[static_cast<size_t>(attribute_id::ATTRIB_VIT)] + 8, 41);
}
if (plr[myplr]._pMaxHP > plr[myplr]._pMaxHPBase)
@ -1630,35 +1630,35 @@ void CheckChrBtns()
if (!chrbtnactive && plr[myplr]._pStatPts) {
HeroClass pc = plr[myplr]._pClass;
for (int i = ATTRIB_STR; i <= ATTRIB_VIT; i++) {
int max = plr[myplr].GetMaximumAttributeValue((attribute_id)i);
for (auto i : enum_values<attribute_id>()) {
int max = plr[myplr].GetMaximumAttributeValue(i);
switch (i) {
case ATTRIB_STR:
case attribute_id::ATTRIB_STR:
if (plr[myplr]._pBaseStr >= max)
continue;
break;
case ATTRIB_MAG:
case attribute_id::ATTRIB_MAG:
if (plr[myplr]._pBaseMag >= max)
continue;
break;
case ATTRIB_DEX:
case attribute_id::ATTRIB_DEX:
if (plr[myplr]._pBaseDex >= max)
continue;
break;
case ATTRIB_VIT:
case attribute_id::ATTRIB_VIT:
if (plr[myplr]._pBaseVit >= max)
continue;
break;
default:
continue;
}
x = ChrBtnsRect[i].x + ChrBtnsRect[i].w;
y = ChrBtnsRect[i].y + ChrBtnsRect[i].h;
if (MouseX >= ChrBtnsRect[i].x
x = ChrBtnsRect[static_cast<size_t>(i)].x + ChrBtnsRect[static_cast<size_t>(i)].w;
y = ChrBtnsRect[static_cast<size_t>(i)].y + ChrBtnsRect[static_cast<size_t>(i)].h;
if (MouseX >= ChrBtnsRect[static_cast<size_t>(i)].x
&& MouseX <= x
&& MouseY >= ChrBtnsRect[i].y
&& MouseY >= ChrBtnsRect[static_cast<size_t>(i)].y
&& MouseY <= y) {
chrbtn[i] = true;
chrbtn[static_cast<size_t>(i)] = true;
chrbtnactive = true;
}
}
@ -1675,33 +1675,33 @@ int CapStatPointsToAdd(int remainingStatPoints, const PlayerStruct &player, attr
void ReleaseChrBtns(bool addAllStatPoints)
{
chrbtnactive = false;
for (int i = ATTRIB_STR; i <= ATTRIB_VIT; ++i) {
if (!chrbtn[i])
for (auto i : enum_values<attribute_id>()) {
if (!chrbtn[static_cast<size_t>(i)])
continue;
chrbtn[i] = false;
if (MouseX >= ChrBtnsRect[i].x
&& MouseX <= ChrBtnsRect[i].x + ChrBtnsRect[i].w
&& MouseY >= ChrBtnsRect[i].y
&& MouseY <= ChrBtnsRect[i].y + ChrBtnsRect[i].h) {
chrbtn[static_cast<size_t>(i)] = false;
if (MouseX >= ChrBtnsRect[static_cast<size_t>(i)].x
&& MouseX <= ChrBtnsRect[static_cast<size_t>(i)].x + ChrBtnsRect[static_cast<size_t>(i)].w
&& MouseY >= ChrBtnsRect[static_cast<size_t>(i)].y
&& MouseY <= ChrBtnsRect[static_cast<size_t>(i)].y + ChrBtnsRect[static_cast<size_t>(i)].h) {
PlayerStruct &player = plr[myplr];
int statPointsToAdd = 1;
if (addAllStatPoints)
statPointsToAdd = CapStatPointsToAdd(player._pStatPts, player, (attribute_id)i);
statPointsToAdd = CapStatPointsToAdd(player._pStatPts, player, i);
switch (i) {
case ATTRIB_STR:
case attribute_id::ATTRIB_STR:
NetSendCmdParam1(true, CMD_ADDSTR, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;
case ATTRIB_MAG:
case attribute_id::ATTRIB_MAG:
NetSendCmdParam1(true, CMD_ADDMAG, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;
case ATTRIB_DEX:
case attribute_id::ATTRIB_DEX:
NetSendCmdParam1(true, CMD_ADDDEX, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;
case ATTRIB_VIT:
case attribute_id::ATTRIB_VIT:
NetSendCmdParam1(true, CMD_ADDVIT, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;

41
Source/enum_traits.h
Unescape View File

@ -14,4 +14,45 @@ struct enum_size {
constexpr static const std::size_t value = static_cast<std::size_t>(T::LAST) + 1;
};
template <typename T>
class enum_values {
public:
class Iterator {
typename std::underlying_type<T>::type m_value;
public:
Iterator(typename std::underlying_type<T>::type value)
: m_value(value)
{
}
const T operator*() const
{
return static_cast<T>(m_value);
}
void operator++()
{
m_value++;
}
bool operator!=(Iterator rhs) const
{
return m_value != rhs.m_value;
}
};
};
template <typename T>
typename enum_values<T>::Iterator begin(enum_values<T>)
{
return typename enum_values<T>::Iterator(static_cast<typename std::underlying_type<T>::type>(T::FIRST));
}
template <typename T>
typename enum_values<T>::Iterator end(enum_values<T>)
{
return typename enum_values<T>::Iterator(static_cast<typename std::underlying_type<T>::type>(T::LAST) + 1);
}
}

20
Source/items.cpp
Unescape View File

@ -4622,9 +4622,9 @@ static void SpawnOnePremium(int i, int plvl, int myplr)
bool keepgoing = false;
ItemStruct holditem = items[0];
int strength = std::max(plr[myplr].GetMaximumAttributeValue(ATTRIB_STR), plr[myplr]._pStrength);
int dexterity = std::max(plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX), plr[myplr]._pDexterity);
int magic = std::max(plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG), plr[myplr]._pMagic);
int strength = std::max(plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR), plr[myplr]._pStrength);
int dexterity = std::max(plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX), plr[myplr]._pDexterity);
int magic = std::max(plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG), plr[myplr]._pMagic);
strength *= 1.2;
dexterity *= 1.2;
magic *= 1.2;
@ -4950,9 +4950,9 @@ void SpawnBoy(int lvl)
int count = 0;
HeroClass pc = plr[myplr]._pClass;
int strength = std::max(plr[myplr].GetMaximumAttributeValue(ATTRIB_STR), plr[myplr]._pStrength);
int dexterity = std::max(plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX), plr[myplr]._pDexterity);
int magic = std::max(plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG), plr[myplr]._pMagic);
int strength = std::max(plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR), plr[myplr]._pStrength);
int dexterity = std::max(plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX), plr[myplr]._pDexterity);
int magic = std::max(plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG), plr[myplr]._pMagic);
strength *= 1.2;
dexterity *= 1.2;
magic *= 1.2;
@ -5071,13 +5071,13 @@ bool HealerItemOk(int i)
if (!gbIsMultiplayer) {
if (AllItemsList[i].iMiscId == IMISC_ELIXSTR)
return !gbIsHellfire || plr[myplr]._pBaseStr < plr[myplr].GetMaximumAttributeValue(ATTRIB_STR);
return !gbIsHellfire || plr[myplr]._pBaseStr < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR);
if (AllItemsList[i].iMiscId == IMISC_ELIXMAG)
return !gbIsHellfire || plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG);
return !gbIsHellfire || plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG);
if (AllItemsList[i].iMiscId == IMISC_ELIXDEX)
return !gbIsHellfire || plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX);
return !gbIsHellfire || plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX);
if (AllItemsList[i].iMiscId == IMISC_ELIXVIT)
return !gbIsHellfire || plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(ATTRIB_VIT);
return !gbIsHellfire || plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT);
}
if (AllItemsList[i].iMiscId == IMISC_REJUV)

10
Source/objects.cpp
Unescape View File

@ -3408,17 +3408,17 @@ bool OperateShrineMysterious(int pnum)
ModifyPlrDex(pnum, -1);
ModifyPlrVit(pnum, -1);
switch (random_(0, 4)) {
case ATTRIB_STR:
switch (static_cast<attribute_id>(random_(0, 4))) {
case attribute_id::ATTRIB_STR:
ModifyPlrStr(pnum, 6);
break;
case ATTRIB_MAG:
case attribute_id::ATTRIB_MAG:
ModifyPlrMag(pnum, 6);
break;
case ATTRIB_DEX:
case attribute_id::ATTRIB_DEX:
ModifyPlrDex(pnum, 6);
break;
case ATTRIB_VIT:
case attribute_id::ATTRIB_VIT:
ModifyPlrVit(pnum, 6);
break;
}

48
Source/player.cpp
Unescape View File

@ -197,7 +197,7 @@ Sint32 PlayerStruct::GetBaseAttributeValue(attribute_id attribute) const
Sint32 PlayerStruct::GetMaximumAttributeValue(attribute_id attribute) const
{
static const int MaxStats[enum_size<HeroClass>::value][4] = {
static const int MaxStats[enum_size<HeroClass>::value][enum_size<attribute_id>::value] = {
// clang-format off
{ 250, 50, 60, 100 },
{ 55, 70, 250, 80 },
@ -208,7 +208,7 @@ Sint32 PlayerStruct::GetMaximumAttributeValue(attribute_id attribute) const
// clang-format on
};
return MaxStats[static_cast<std::size_t>(_pClass)][attribute];
return MaxStats[static_cast<std::size_t>(_pClass)][static_cast<std::size_t>(attribute)];
}
void SetPlayerGPtrs(BYTE *pData, BYTE **pAnim)
@ -802,13 +802,13 @@ void CreatePlayer(int pnum, HeroClass c)
int CalcStatDiff(int pnum)
{
return plr[pnum].GetMaximumAttributeValue(ATTRIB_STR)
return plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_STR)
- plr[pnum]._pBaseStr
+ plr[pnum].GetMaximumAttributeValue(ATTRIB_MAG)
+ plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG)
- plr[pnum]._pBaseMag
+ plr[pnum].GetMaximumAttributeValue(ATTRIB_DEX)
+ plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX)
- plr[pnum]._pBaseDex
+ plr[pnum].GetMaximumAttributeValue(ATTRIB_VIT)
+ plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT)
- plr[pnum]._pBaseVit;
}
@ -3493,17 +3493,17 @@ void ValidatePlayer()
if (gt != plr[myplr]._pGold)
plr[myplr]._pGold = gt;
if (plr[myplr]._pBaseStr > plr[myplr].GetMaximumAttributeValue(ATTRIB_STR)) {
plr[myplr]._pBaseStr = plr[myplr].GetMaximumAttributeValue(ATTRIB_STR);
if (plr[myplr]._pBaseStr > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR)) {
plr[myplr]._pBaseStr = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR);
}
if (plr[myplr]._pBaseMag > plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG)) {
plr[myplr]._pBaseMag = plr[myplr].GetMaximumAttributeValue(ATTRIB_MAG);
if (plr[myplr]._pBaseMag > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG)) {
plr[myplr]._pBaseMag = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG);
}
if (plr[myplr]._pBaseDex > plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX)) {
plr[myplr]._pBaseDex = plr[myplr].GetMaximumAttributeValue(ATTRIB_DEX);
if (plr[myplr]._pBaseDex > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX)) {
plr[myplr]._pBaseDex = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX);
}
if (plr[myplr]._pBaseVit > plr[myplr].GetMaximumAttributeValue(ATTRIB_VIT)) {
plr[myplr]._pBaseVit = plr[myplr].GetMaximumAttributeValue(ATTRIB_VIT);
if (plr[myplr]._pBaseVit > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT)) {
plr[myplr]._pBaseVit = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT);
}
Uint64 msk = 0;
@ -4052,31 +4052,31 @@ void CheckStats(int p)
app_fatal("CheckStats: illegal player %d", p);
}
for (int i = ATTRIB_STR; i <= ATTRIB_VIT; i++) {
int maxStatPoint = plr[p].GetMaximumAttributeValue((attribute_id)i);
for (auto i : enum_values<attribute_id>()) {
int maxStatPoint = plr[p].GetMaximumAttributeValue(i);
switch (i) {
case ATTRIB_STR:
case attribute_id::ATTRIB_STR:
if (plr[p]._pBaseStr > maxStatPoint) {
plr[p]._pBaseStr = maxStatPoint;
} else if (plr[p]._pBaseStr < 0) {
plr[p]._pBaseStr = 0;
}
break;
case ATTRIB_MAG:
case attribute_id::ATTRIB_MAG:
if (plr[p]._pBaseMag > maxStatPoint) {
plr[p]._pBaseMag = maxStatPoint;
} else if (plr[p]._pBaseMag < 0) {
plr[p]._pBaseMag = 0;
}
break;
case ATTRIB_DEX:
case attribute_id::ATTRIB_DEX:
if (plr[p]._pBaseDex > maxStatPoint) {
plr[p]._pBaseDex = maxStatPoint;
} else if (plr[p]._pBaseDex < 0) {
plr[p]._pBaseDex = 0;
}
break;
case ATTRIB_VIT:
case attribute_id::ATTRIB_VIT:
if (plr[p]._pBaseVit > maxStatPoint) {
plr[p]._pBaseVit = maxStatPoint;
} else if (plr[p]._pBaseVit < 0) {
@ -4093,7 +4093,7 @@ void ModifyPlrStr(int p, int l)
app_fatal("ModifyPlrStr: illegal player %d", p);
}
int max = plr[p].GetMaximumAttributeValue(ATTRIB_STR);
int max = plr[p].GetMaximumAttributeValue(attribute_id::ATTRIB_STR);
if (plr[p]._pBaseStr + l > max) {
l = max - plr[p]._pBaseStr;
}
@ -4120,7 +4120,7 @@ void ModifyPlrMag(int p, int l)
app_fatal("ModifyPlrMag: illegal player %d", p);
}
int max = plr[p].GetMaximumAttributeValue(ATTRIB_MAG);
int max = plr[p].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG);
if (plr[p]._pBaseMag + l > max) {
l = max - plr[p]._pBaseMag;
}
@ -4155,7 +4155,7 @@ void ModifyPlrDex(int p, int l)
app_fatal("ModifyPlrDex: illegal player %d", p);
}
int max = plr[p].GetMaximumAttributeValue(ATTRIB_DEX);
int max = plr[p].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX);
if (plr[p]._pBaseDex + l > max) {
l = max - plr[p]._pBaseDex;
}
@ -4179,7 +4179,7 @@ void ModifyPlrVit(int p, int l)
app_fatal("ModifyPlrVit: illegal player %d", p);
}
int max = plr[p].GetMaximumAttributeValue(ATTRIB_VIT);
int max = plr[p].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT);
if (plr[p]._pBaseVit + l > max) {
l = max - plr[p]._pBaseVit;
}

5
Source/player.h
Unescape View File

@ -41,11 +41,14 @@ enum class HeroClass : uint8_t {
LAST = Barbarian
};
enum attribute_id : uint8_t {
enum class attribute_id : uint8_t {
ATTRIB_STR,
ATTRIB_MAG,
ATTRIB_DEX,
ATTRIB_VIT,
FIRST = ATTRIB_STR,
LAST = ATTRIB_VIT
};
// Logical equipment locations

14
SourceX/miniwin/misc_msg.cpp
Unescape View File

@ -48,27 +48,27 @@ void FocusOnCharInfo()
// Find the first incrementable stat.
int stat = -1;
for (int i = ATTRIB_VIT; i >= ATTRIB_STR; i--) {
int max = plr[myplr].GetMaximumAttributeValue((attribute_id)i);
for (auto i : enum_values<attribute_id>()) {
int max = plr[myplr].GetMaximumAttributeValue(i);
switch (i) {
case ATTRIB_STR:
case attribute_id::ATTRIB_STR:
if (plr[myplr]._pBaseStr >= max)
continue;
break;
case ATTRIB_MAG:
case attribute_id::ATTRIB_MAG:
if (plr[myplr]._pBaseMag >= max)
continue;
break;
case ATTRIB_DEX:
case attribute_id::ATTRIB_DEX:
if (plr[myplr]._pBaseDex >= max)
continue;
break;
case ATTRIB_VIT:
case attribute_id::ATTRIB_VIT:
if (plr[myplr]._pBaseVit >= max)
continue;
break;
}
stat = i;
stat = static_cast<int>(i);
}
if (stat == -1)
return;

Write Preview
Loading…
Cancel
Save