From 0c13e48ce61954a2ea673d8f7a536136d8e2a6ad Mon Sep 17 00:00:00 2001 From: Eric Robinson Date: Fri, 26 Jul 2024 23:57:14 -0400 Subject: [PATCH] Rename Player struct variables: _pVitality --- Source/items.cpp | 4 ++-- Source/loadsave.cpp | 4 ++-- Source/pack.cpp | 8 ++++---- Source/panels/charpanel.cpp | 2 +- Source/pfile.cpp | 2 +- Source/player.cpp | 10 +++++----- Source/player.h | 2 +- test/fixtures/memory_map/player.txt | 2 +- test/pack_test.cpp | 2 +- test/player_test.cpp | 2 +- test/writehero_test.cpp | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index ac61ba57e9f..509b8a9b597 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -2597,7 +2597,7 @@ void CalcPlrPrimaryStats(Player &player, int strength, int &magic, int dexterity player._pStrength = std::max(0, strength + player._pBaseStr); player._pMagic = std::max(0, magic + player._pBaseMag); player._pDexterity = std::max(0, dexterity + player._pBaseDex); - player._pVitality = std::max(0, vitality + player._pBaseVit); + player.vitality = std::max(0, vitality + player._pBaseVit); } void CalcPlrLightRadius(Player &player, int lrad) @@ -2654,7 +2654,7 @@ void CalcPlrDamageMod(Player &player) else if (rightHandItem._itype == ItemType::Shield) player._pIAC -= rightHandItem._iAC / 2; } else if (!player.isHoldingItem(ItemType::Staff) && !player.isHoldingItem(ItemType::Bow)) { - player._pDamageMod += playerLevel * player._pVitality / 100; + player._pDamageMod += playerLevel * player.vitality / 100; } player._pIAC += playerLevel / 4; return; diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index 0c0dd1533ad..0f5f0a22714 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -438,7 +438,7 @@ void LoadPlayer(LoadHelper &file, Player &player) player._pBaseMag = file.NextLE(); player._pDexterity = file.NextLE(); player._pBaseDex = file.NextLE(); - player._pVitality = file.NextLE(); + player.vitality = file.NextLE(); player._pBaseVit = file.NextLE(); player._pStatPts = file.NextLE(); player._pDamageMod = file.NextLE(); @@ -1261,7 +1261,7 @@ void SavePlayer(SaveHelper &file, const Player &player) file.WriteLE(player._pBaseMag); file.WriteLE(player._pDexterity); file.WriteLE(player._pBaseDex); - file.WriteLE(player._pVitality); + file.WriteLE(player.vitality); file.WriteLE(player._pBaseVit); file.WriteLE(player._pStatPts); file.WriteLE(player._pDamageMod); diff --git a/Source/pack.cpp b/Source/pack.cpp index d1c0f37c2c6..e91443934c2 100644 --- a/Source/pack.cpp +++ b/Source/pack.cpp @@ -359,7 +359,7 @@ void PackNetPlayer(PlayerNetPack &packed, const Player &player) packed.pStrength = SDL_SwapLE32(player._pStrength); packed.pMagic = SDL_SwapLE32(player._pMagic); packed.pDexterity = SDL_SwapLE32(player._pDexterity); - packed.pVitality = SDL_SwapLE32(player._pVitality); + packed.pVitality = SDL_SwapLE32(player.vitality); packed.pHitPoints = SDL_SwapLE32(player._pHitPoints); packed.pMaxHP = SDL_SwapLE32(player._pMaxHP); packed.pMana = SDL_SwapLE32(player._pMana); @@ -472,7 +472,7 @@ void UnPackPlayer(const PlayerPack &packed, Player &player) player._pBaseDex = std::min(packed.pBaseDex, player.GetMaximumAttributeValue(CharacterAttribute::Dexterity)); player._pDexterity = player._pBaseDex; player._pBaseVit = std::min(packed.pBaseVit, player.GetMaximumAttributeValue(CharacterAttribute::Vitality)); - player._pVitality = player._pBaseVit; + player.vitality = player._pBaseVit; player._pStatPts = packed.pStatPts; player._pExperience = SDL_SwapLE32(packed.pExperience); @@ -607,7 +607,7 @@ bool UnPackNetPlayer(const PlayerNetPack &packed, Player &player) player._pBaseDex = packed.pBaseDex; player._pDexterity = player._pBaseDex; player._pBaseVit = packed.pBaseVit; - player._pVitality = player._pBaseVit; + player.vitality = player._pBaseVit; player._pStatPts = packed.pStatPts; player._pExperience = SDL_SwapLE32(packed.pExperience); @@ -678,7 +678,7 @@ bool UnPackNetPlayer(const PlayerNetPack &packed, Player &player) ValidateFields(player._pStrength, SDL_SwapLE32(packed.pStrength), player._pStrength == SDL_SwapLE32(packed.pStrength)); ValidateFields(player._pMagic, SDL_SwapLE32(packed.pMagic), player._pMagic == SDL_SwapLE32(packed.pMagic)); ValidateFields(player._pDexterity, SDL_SwapLE32(packed.pDexterity), player._pDexterity == SDL_SwapLE32(packed.pDexterity)); - ValidateFields(player._pVitality, SDL_SwapLE32(packed.pVitality), player._pVitality == SDL_SwapLE32(packed.pVitality)); + ValidateFields(player.vitality, SDL_SwapLE32(packed.pVitality), player.vitality == SDL_SwapLE32(packed.pVitality)); ValidateFields(player._pHitPoints, SDL_SwapLE32(packed.pHitPoints), player._pHitPoints == SDL_SwapLE32(packed.pHitPoints)); ValidateFields(player._pMaxHP, SDL_SwapLE32(packed.pMaxHP), player._pMaxHP == SDL_SwapLE32(packed.pMaxHP)); ValidateFields(player._pMana, SDL_SwapLE32(packed.pMana), player._pMana == SDL_SwapLE32(packed.pMana)); diff --git a/Source/panels/charpanel.cpp b/Source/panels/charpanel.cpp index 10c3e513963..626423332fd 100644 --- a/Source/panels/charpanel.cpp +++ b/Source/panels/charpanel.cpp @@ -157,7 +157,7 @@ PanelEntry panelEntries[] = { []() { return StyledText { GetCurrentStatColor(CharacterAttribute::Dexterity), StrCat(InspectPlayer->_pDexterity) }; } }, { N_("Vitality"), { LeftColumnLabelX, 219 }, 45, LeftColumnLabelWidth, []() { return StyledText { GetBaseStatColor(CharacterAttribute::Vitality), StrCat(InspectPlayer->_pBaseVit) }; } }, { "", { 135, 219 }, 45, 0, - []() { return StyledText { GetCurrentStatColor(CharacterAttribute::Vitality), StrCat(InspectPlayer->_pVitality) }; } }, + []() { return StyledText { GetCurrentStatColor(CharacterAttribute::Vitality), StrCat(InspectPlayer->vitality) }; } }, { N_("Points to distribute"), { LeftColumnLabelX, 248 }, 45, LeftColumnLabelWidth, []() { InspectPlayer->_pStatPts = std::min(CalcStatDiff(*InspectPlayer), InspectPlayer->_pStatPts); diff --git a/Source/pfile.cpp b/Source/pfile.cpp index f2baa6c75ce..df5b7757217 100644 --- a/Source/pfile.cpp +++ b/Source/pfile.cpp @@ -187,7 +187,7 @@ void Game2UiPlayer(const Player &player, _uiheroinfo *heroinfo, bool bHasSaveFil heroinfo->strength = player._pStrength; heroinfo->magic = player._pMagic; heroinfo->dexterity = player._pDexterity; - heroinfo->vitality = player._pVitality; + heroinfo->vitality = player.vitality; heroinfo->hassaved = bHasSaveFile; heroinfo->herorank = player.pDiabloKillLevel; heroinfo->spawned = gbIsSpawn; diff --git a/Source/player.cpp b/Source/player.cpp index 7f21af54eff..a4de7688e25 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -1485,8 +1485,8 @@ void CheckCheatStats(Player &player) player._pMagic = 750; } - if (player._pVitality > 750) { - player._pVitality = 750; + if (player.vitality > 750) { + player.vitality = 750; } if (player._pHitPoints > 128000) { @@ -1653,7 +1653,7 @@ int Player::GetCurrentAttributeValue(CharacterAttribute attribute) const case CharacterAttribute::Strength: return this->_pStrength; case CharacterAttribute::Vitality: - return this->_pVitality; + return this->vitality; default: app_fatal("Unsupported attribute"); } @@ -2284,7 +2284,7 @@ void CreatePlayer(Player &player, HeroClass c) player._pDexterity = player._pBaseDex; player._pBaseVit = attr.baseVit; - player._pVitality = player._pBaseVit; + player.vitality = player._pBaseVit; player._pHitPoints = player.calculateBaseLife(); player._pMaxHP = player._pHitPoints; @@ -3332,7 +3332,7 @@ void ModifyPlrVit(Player &player, int l) { l = std::clamp(l, 0 - player._pBaseVit, player.GetMaximumAttributeValue(CharacterAttribute::Vitality) - player._pBaseVit); - player._pVitality += l; + player.vitality += l; player._pBaseVit += l; int ms = l; diff --git a/Source/player.h b/Source/player.h index a6c392c5413..02a066d7dc1 100644 --- a/Source/player.h +++ b/Source/player.h @@ -232,7 +232,7 @@ struct Player { int _pBaseMag; int _pDexterity; int _pBaseDex; - int _pVitality; + int vitality; // _pVitality int _pBaseVit; int _pStatPts; int _pDamageMod; diff --git a/test/fixtures/memory_map/player.txt b/test/fixtures/memory_map/player.txt index 3707e38f8f1..ff961253355 100644 --- a/test/fixtures/memory_map/player.txt +++ b/test/fixtures/memory_map/player.txt @@ -70,7 +70,7 @@ R 32 _pMagic R 32 _pBaseMag R 32 _pDexterity R 32 _pBaseDex -R 32 _pVitality +R 32 vitality R 32 _pBaseVit R 32 _pStatPts R 32 _pDamageMod diff --git a/test/pack_test.cpp b/test/pack_test.cpp index 79d78e8d23b..d9d087a80ae 100644 --- a/test/pack_test.cpp +++ b/test/pack_test.cpp @@ -1075,7 +1075,7 @@ TEST_F(NetPackTest, UnPackNetPlayer_invalid_dexterity) TEST_F(NetPackTest, UnPackNetPlayer_invalid_vitality) { - MyPlayer->_pVitality++; + MyPlayer->vitality++; ASSERT_FALSE(TestNetPackValidation()); } diff --git a/test/player_test.cpp b/test/player_test.cpp index 40dec523fac..c86b8d0fdd6 100644 --- a/test/player_test.cpp +++ b/test/player_test.cpp @@ -114,7 +114,7 @@ static void AssertPlayer(Player &player) ASSERT_EQ(player._pBaseDex, 30); ASSERT_EQ(player._pDexterity, 30); ASSERT_EQ(player._pBaseVit, 20); - ASSERT_EQ(player._pVitality, 20); + ASSERT_EQ(player.vitality, 20); ASSERT_EQ(player.getCharacterLevel(), 1); ASSERT_EQ(player._pStatPts, 0); ASSERT_EQ(player._pExperience, 0); diff --git a/test/writehero_test.cpp b/test/writehero_test.cpp index adef0be6db6..2335fc96f9d 100644 --- a/test/writehero_test.cpp +++ b/test/writehero_test.cpp @@ -280,7 +280,7 @@ void AssertPlayer(Player &player) ASSERT_EQ(player._pBaseDex, 250); ASSERT_EQ(player._pDexterity, 281); ASSERT_EQ(player._pBaseVit, 80); - ASSERT_EQ(player._pVitality, 90); + ASSERT_EQ(player.vitality, 90); ASSERT_EQ(player.getCharacterLevel(), 50); ASSERT_EQ(player._pStatPts, 0); ASSERT_EQ(player._pExperience, 1583495809);