Minor improvements

Arcidev · Oct 5, 2024 · f99d055 · f99d055
1 parent 8af2d48
commit f99d055
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Server/Server/Player.cpp b/Server/Server/Player.cpp
@@ -10,6 +10,17 @@
 #include "Spells/Spell.h"
 #include "Spells/SpellAuraEffect.h"
 
+static uint8_t calculateReducedDamage(uint8_t damage, uint8_t defense)
+{
+    float reduction = (defense * (float)SystemStats::DEFENSE_PERCENT_PER_POINT);
+    if (!reduction)
+        return damage;
+
+    reduction /= 100.f;
+    reduction += 1.f;
+    return (uint8_t)(damage / reduction);
+}
+
 Player::Player(Game* game, ConnectedUser* user)
     : m_isPrepared(false), m_replenishmentMoveCount(0), m_id(user->GetId()), m_currentCardIndex(0), m_game(game), m_user(user) { }
 
@@ -637,18 +648,7 @@ void Player::endTurn()
     GetGame()->ActivateSecondPlayer();
 }
 
-uint8_t Player::calculateReducedDamage(uint8_t damage, uint8_t defense)
-{
-    float reduction = (defense * (float)SystemStats::DEFENSE_PERCENT_PER_POINT);
-    if (!reduction)
-        return damage;
-
-    reduction /= 100.f;
-    reduction += 1.f;
-    return (uint8_t)(damage / reduction);
-}
-
-bool Player::SwapCards(PlayableCard* card, PlayableCard* other)
+bool Player::SwapCards(PlayableCard* card, PlayableCard* other) const
 {
     static auto getCardIndex = [](std::vector<PlayableCard*> const& all, PlayableCard const* toFind)
     {

diff --git a/Server/Server/Player.h b/Server/Server/Player.h
@@ -33,7 +33,6 @@ class Player
         void destroyCard(uint64_t cardGuid);
         void replenishMana();
         void endTurn();
-        uint8_t calculateReducedDamage(uint8_t damage, uint8_t defense);
 
     public:
         Player(Game* game, ConnectedUser* user);
@@ -59,7 +58,7 @@ class Player
         void Prepare();
         void DealPeriodicDamage(PlayableCard* card, uint32_t damage, bool applyDefense);
         void Drain(PlayableCard* card, uint8_t drainedHealth, uint8_t restoredHealth, uint8_t drainedMana, uint8_t restoredMana, bool applyDefense);
-        bool SwapCards(PlayableCard* card, PlayableCard* other);
+        bool SwapCards(PlayableCard* card, PlayableCard* other) const;
 
         void ClearCards();
         void CreateCard(Card const* cardTemplate);