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

🎨 Rename 'attribute_id' enum to 'CharacterAttribute' 

Members were renamed as well for readability.
pull/1507/head
Juliano Leal Goncalves 5 years ago committed by Anders Jenbo
parent
f54cc5aa95
commit
cc5f2a8f49
6 changed files with 80 additions and 80 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. 46
      Source/control.cpp
  2. 20
      Source/items.cpp
  3. 10
      Source/objects.cpp
  4. 56
      Source/player.cpp
  5. 18
      Source/player.h
  6. 10
      SourceX/miniwin/misc_msg.cpp

46
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(attribute_id::ATTRIB_STR) == plr[myplr]._pBaseStr)
if (plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength) == 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(attribute_id::ATTRIB_MAG) == plr[myplr]._pBaseMag)
if (plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic) == 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(attribute_id::ATTRIB_DEX) == plr[myplr]._pBaseDex)
if (plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity) == 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(attribute_id::ATTRIB_VIT) == plr[myplr]._pBaseVit)
if (plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Vitality) == 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(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]._pBaseStr < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength))
CelDrawTo(out, 137, 159, pChrButtons, chrbtn[static_cast<size_t>(CharacterAttribute::Strength)] + 2, 41);
if (plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic))
CelDrawTo(out, 137, 187, pChrButtons, chrbtn[static_cast<size_t>(CharacterAttribute::Magic)] + 4, 41);
if (plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity))
CelDrawTo(out, 137, 216, pChrButtons, chrbtn[static_cast<size_t>(CharacterAttribute::Dexterity)] + 6, 41);
if (plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Vitality))
CelDrawTo(out, 137, 244, pChrButtons, chrbtn[static_cast<size_t>(CharacterAttribute::Vitality)] + 8, 41);
}
if (plr[myplr]._pMaxHP > plr[myplr]._pMaxHPBase)
@ -1630,22 +1630,22 @@ void CheckChrBtns()
if (!chrbtnactive && plr[myplr]._pStatPts) {
HeroClass pc = plr[myplr]._pClass;
for (auto i : enum_values<attribute_id>()) {
for (auto i : enum_values<CharacterAttribute>()) {
int max = plr[myplr].GetMaximumAttributeValue(i);
switch (i) {
case attribute_id::ATTRIB_STR:
case CharacterAttribute::Strength:
if (plr[myplr]._pBaseStr >= max)
continue;
break;
case attribute_id::ATTRIB_MAG:
case CharacterAttribute::Magic:
if (plr[myplr]._pBaseMag >= max)
continue;
break;
case attribute_id::ATTRIB_DEX:
case CharacterAttribute::Dexterity:
if (plr[myplr]._pBaseDex >= max)
continue;
break;
case attribute_id::ATTRIB_VIT:
case CharacterAttribute::Vitality:
if (plr[myplr]._pBaseVit >= max)
continue;
break;
@ -1665,7 +1665,7 @@ void CheckChrBtns()
}
}
int CapStatPointsToAdd(int remainingStatPoints, const PlayerStruct &player, attribute_id attribute)
int CapStatPointsToAdd(int remainingStatPoints, const PlayerStruct &player, CharacterAttribute attribute)
{
int pointsToReachCap = player.GetMaximumAttributeValue(attribute) - player.GetBaseAttributeValue(attribute);
@ -1675,7 +1675,7 @@ int CapStatPointsToAdd(int remainingStatPoints, const PlayerStruct &player, attr
void ReleaseChrBtns(bool addAllStatPoints)
{
chrbtnactive = false;
for (auto i : enum_values<attribute_id>()) {
for (auto i : enum_values<CharacterAttribute>()) {
if (!chrbtn[static_cast<size_t>(i)])
continue;
@ -1689,19 +1689,19 @@ void ReleaseChrBtns(bool addAllStatPoints)
if (addAllStatPoints)
statPointsToAdd = CapStatPointsToAdd(player._pStatPts, player, i);
switch (i) {
case attribute_id::ATTRIB_STR:
case CharacterAttribute::Strength:
NetSendCmdParam1(true, CMD_ADDSTR, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;
case attribute_id::ATTRIB_MAG:
case CharacterAttribute::Magic:
NetSendCmdParam1(true, CMD_ADDMAG, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;
case attribute_id::ATTRIB_DEX:
case CharacterAttribute::Dexterity:
NetSendCmdParam1(true, CMD_ADDDEX, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;
case attribute_id::ATTRIB_VIT:
case CharacterAttribute::Vitality:
NetSendCmdParam1(true, CMD_ADDVIT, statPointsToAdd);
player._pStatPts -= statPointsToAdd;
break;

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(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);
int strength = std::max(plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength), plr[myplr]._pStrength);
int dexterity = std::max(plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity), plr[myplr]._pDexterity);
int magic = std::max(plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic), 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(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);
int strength = std::max(plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength), plr[myplr]._pStrength);
int dexterity = std::max(plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity), plr[myplr]._pDexterity);
int magic = std::max(plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic), 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(attribute_id::ATTRIB_STR);
return !gbIsHellfire || plr[myplr]._pBaseStr < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength);
if (AllItemsList[i].iMiscId == IMISC_ELIXMAG)
return !gbIsHellfire || plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG);
return !gbIsHellfire || plr[myplr]._pBaseMag < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic);
if (AllItemsList[i].iMiscId == IMISC_ELIXDEX)
return !gbIsHellfire || plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX);
return !gbIsHellfire || plr[myplr]._pBaseDex < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity);
if (AllItemsList[i].iMiscId == IMISC_ELIXVIT)
return !gbIsHellfire || plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT);
return !gbIsHellfire || plr[myplr]._pBaseVit < plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Vitality);
}
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 (static_cast<attribute_id>(random_(0, 4))) {
case attribute_id::ATTRIB_STR:
switch (static_cast<CharacterAttribute>(random_(0, 4))) {
case CharacterAttribute::Strength:
ModifyPlrStr(pnum, 6);
break;
case attribute_id::ATTRIB_MAG:
case CharacterAttribute::Magic:
ModifyPlrMag(pnum, 6);
break;
case attribute_id::ATTRIB_DEX:
case CharacterAttribute::Dexterity:
ModifyPlrDex(pnum, 6);
break;
case attribute_id::ATTRIB_VIT:
case CharacterAttribute::Vitality:
ModifyPlrVit(pnum, 6);
break;
}

56
Source/player.cpp
Unescape View File

@ -179,25 +179,25 @@ const char *const ClassPathTbl[] = {
"Warrior",
};
Sint32 PlayerStruct::GetBaseAttributeValue(attribute_id attribute) const
Sint32 PlayerStruct::GetBaseAttributeValue(CharacterAttribute attribute) const
{
switch (attribute) {
case attribute_id::ATTRIB_DEX:
case CharacterAttribute::Dexterity:
return this->_pBaseDex;
case attribute_id::ATTRIB_MAG:
case CharacterAttribute::Magic:
return this->_pBaseMag;
case attribute_id::ATTRIB_STR:
case CharacterAttribute::Strength:
return this->_pBaseStr;
case attribute_id::ATTRIB_VIT:
case CharacterAttribute::Vitality:
return this->_pBaseVit;
default:
app_fatal("Unsupported attribute");
}
}
Sint32 PlayerStruct::GetMaximumAttributeValue(attribute_id attribute) const
Sint32 PlayerStruct::GetMaximumAttributeValue(CharacterAttribute attribute) const
{
static const int MaxStats[enum_size<HeroClass>::value][enum_size<attribute_id>::value] = {
static const int MaxStats[enum_size<HeroClass>::value][enum_size<CharacterAttribute>::value] = {
// clang-format off
{ 250, 50, 60, 100 },
{ 55, 70, 250, 80 },
@ -802,13 +802,13 @@ void CreatePlayer(int pnum, HeroClass c)
int CalcStatDiff(int pnum)
{
return plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_STR)
return plr[pnum].GetMaximumAttributeValue(CharacterAttribute::Strength)
- plr[pnum]._pBaseStr
+ plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG)
+ plr[pnum].GetMaximumAttributeValue(CharacterAttribute::Magic)
- plr[pnum]._pBaseMag
+ plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX)
+ plr[pnum].GetMaximumAttributeValue(CharacterAttribute::Dexterity)
- plr[pnum]._pBaseDex
+ plr[pnum].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT)
+ plr[pnum].GetMaximumAttributeValue(CharacterAttribute::Vitality)
- 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(attribute_id::ATTRIB_STR)) {
plr[myplr]._pBaseStr = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_STR);
if (plr[myplr]._pBaseStr > plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength)) {
plr[myplr]._pBaseStr = plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Strength);
}
if (plr[myplr]._pBaseMag > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG)) {
plr[myplr]._pBaseMag = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_MAG);
if (plr[myplr]._pBaseMag > plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic)) {
plr[myplr]._pBaseMag = plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Magic);
}
if (plr[myplr]._pBaseDex > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX)) {
plr[myplr]._pBaseDex = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_DEX);
if (plr[myplr]._pBaseDex > plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity)) {
plr[myplr]._pBaseDex = plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Dexterity);
}
if (plr[myplr]._pBaseVit > plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT)) {
plr[myplr]._pBaseVit = plr[myplr].GetMaximumAttributeValue(attribute_id::ATTRIB_VIT);
if (plr[myplr]._pBaseVit > plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Vitality)) {
plr[myplr]._pBaseVit = plr[myplr].GetMaximumAttributeValue(CharacterAttribute::Vitality);
}
Uint64 msk = 0;
@ -4052,31 +4052,31 @@ void CheckStats(int p)
app_fatal("CheckStats: illegal player %d", p);
}
for (auto i : enum_values<attribute_id>()) {
for (auto i : enum_values<CharacterAttribute>()) {
int maxStatPoint = plr[p].GetMaximumAttributeValue(i);
switch (i) {
case attribute_id::ATTRIB_STR:
case CharacterAttribute::Strength:
if (plr[p]._pBaseStr > maxStatPoint) {
plr[p]._pBaseStr = maxStatPoint;
} else if (plr[p]._pBaseStr < 0) {
plr[p]._pBaseStr = 0;
}
break;
case attribute_id::ATTRIB_MAG:
case CharacterAttribute::Magic:
if (plr[p]._pBaseMag > maxStatPoint) {
plr[p]._pBaseMag = maxStatPoint;
} else if (plr[p]._pBaseMag < 0) {
plr[p]._pBaseMag = 0;
}
break;
case attribute_id::ATTRIB_DEX:
case CharacterAttribute::Dexterity:
if (plr[p]._pBaseDex > maxStatPoint) {
plr[p]._pBaseDex = maxStatPoint;
} else if (plr[p]._pBaseDex < 0) {
plr[p]._pBaseDex = 0;
}
break;
case attribute_id::ATTRIB_VIT:
case CharacterAttribute::Vitality:
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(attribute_id::ATTRIB_STR);
int max = plr[p].GetMaximumAttributeValue(CharacterAttribute::Strength);
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(attribute_id::ATTRIB_MAG);
int max = plr[p].GetMaximumAttributeValue(CharacterAttribute::Magic);
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(attribute_id::ATTRIB_DEX);
int max = plr[p].GetMaximumAttributeValue(CharacterAttribute::Dexterity);
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(attribute_id::ATTRIB_VIT);
int max = plr[p].GetMaximumAttributeValue(CharacterAttribute::Vitality);
if (plr[p]._pBaseVit + l > max) {
l = max - plr[p]._pBaseVit;
}

18
Source/player.h
Unescape View File

@ -41,14 +41,14 @@ enum class HeroClass : uint8_t {
LAST = Barbarian
};
enum class attribute_id : uint8_t {
ATTRIB_STR,
ATTRIB_MAG,
ATTRIB_DEX,
ATTRIB_VIT,
enum class CharacterAttribute : uint8_t {
Strength,
Magic,
Dexterity,
Vitality,
FIRST = ATTRIB_STR,
LAST = ATTRIB_VIT
FIRST = Strength,
LAST = Vitality
};
// Logical equipment locations
@ -318,14 +318,14 @@ struct PlayerStruct {
* @param attribute The attribute to retrieve the base value for
* @return The base value for the requested attribute.
*/
Sint32 GetBaseAttributeValue(attribute_id attribute) const;
Sint32 GetBaseAttributeValue(CharacterAttribute attribute) const;
/**
* @brief Gets the maximum value of the player's specified attribute.
* @param attribute The attribute to retrieve the maximum value for
* @return The maximum value for the requested attribute.
*/
Sint32 GetMaximumAttributeValue(attribute_id attribute) const;
Sint32 GetMaximumAttributeValue(CharacterAttribute attribute) const;
};
extern int myplr;

10
SourceX/miniwin/misc_msg.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save