From af4fcff19a986990d58c50c62bc498690c8293b8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 7 Jun 2017 22:39:31 +0300
Subject: Fix some wrong parameter names in headers.

---
 src/being/actorsprite.h               |  2 +-
 src/being/being.h                     | 12 ++++++------
 src/being/localplayer.h               |  2 +-
 src/guild.h                           |  2 +-
 src/party.h                           |  2 +-
 src/resources/sprite/animatedsprite.h |  3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index f6f1156d5..75df5342e 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -205,7 +205,7 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
          * These are NOT the same as the status effect indices.
          */
         void setStatusEffectBlock(const int offset,
-                                  const uint16_t flags);
+                                  const uint16_t newEffects);
 
         /**
          * Notify self that a status effect has flipped.
diff --git a/src/being/being.h b/src/being/being.h
index 55ebd386e..52ea8b9ec 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -191,13 +191,13 @@ class Being notfinal : public ActorSprite,
          * Puts a damage bubble above this being.
          *
          * @param attacker the attacking being
-         * @param damage the amount of damage recieved (0 means miss)
+         * @param amount the amount of damage recieved (0 means miss)
          * @param type the attack type
          * @param attackId the attack id
          * @param level the skill level
          */
         void takeDamage(Being *restrict const attacker,
-                        const int damage,
+                        const int amount,
                         const AttackTypeT type,
                         const int attackId = 1,
                         const int level = 1) restrict2;
@@ -467,7 +467,7 @@ class Being notfinal : public ActorSprite,
          * Sets the current action.
          */
         virtual void setAction(const BeingActionT &restrict action,
-                               const int attackType) restrict2;
+                               const int attackId) restrict2;
 
         /**
          * Get the being's action currently performed.
@@ -532,7 +532,7 @@ class Being notfinal : public ActorSprite,
         /**
          * Shoots a missile particle from this being, to target being
          */
-        void fireMissile(Being *restrict const target,
+        void fireMissile(Being *restrict const victim,
                          const std::string &restrict particle) const restrict2;
 
         /**
@@ -643,7 +643,7 @@ class Being notfinal : public ActorSprite,
 
         std::string getAttackAction() const restrict2 A_WARN_UNUSED;
 
-        std::string getAttackAction(const Attack *restrict const attack) const
+        std::string getAttackAction(const Attack *restrict const attack1) const
                                     restrict2 A_WARN_UNUSED;
 
         /**
@@ -740,7 +740,7 @@ class Being notfinal : public ActorSprite,
         void setPvpRank(const unsigned int rank) restrict2 noexcept2
         { mPvpRank = rank; }
 
-        void setHP(const int n) restrict2;
+        void setHP(const int hp) restrict2;
 
         void setMaxHP(const int hp) restrict2;
 
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index fa21f491a..e123fa6a6 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -252,7 +252,7 @@ class LocalPlayer final : public Being,
         void navigateClean();
 
         void imitateEmote(const Being *const being,
-                          const unsigned char emote) const;
+                          const unsigned char action) const;
 
         void imitateAction(const Being *const being,
                            const BeingActionT &action);
diff --git a/src/guild.h b/src/guild.h
index 0d3cfc097..2bec6497c 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -153,7 +153,7 @@ class Guild final : public AvatarListModel
         int getNumberOfElements() override final A_WARN_UNUSED
         { return CAST_S32(mMembers.size()); }
 
-        Avatar *getAvatarAt(const int i) override final A_WARN_UNUSED;
+        Avatar *getAvatarAt(const int index) override final A_WARN_UNUSED;
 
         /**
          * Get whether user can invite users to this guild.
diff --git a/src/party.h b/src/party.h
index ebe902967..7b46339bf 100644
--- a/src/party.h
+++ b/src/party.h
@@ -129,7 +129,7 @@ class Party final : public AvatarListModel
         int getNumberOfElements() override final A_WARN_UNUSED
         { return CAST_S32(mMembers.size()); }
 
-        Avatar *getAvatarAt(const int i) override final;
+        Avatar *getAvatarAt(const int index) override final A_WARN_UNUSED;
 
         /**
          * Get whether user can invite users to this party.
diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h
index 83c3273c5..259b6fe84 100644
--- a/src/resources/sprite/animatedsprite.h
+++ b/src/resources/sprite/animatedsprite.h
@@ -65,7 +65,8 @@ class AnimatedSprite final : public Sprite
 
         bool reset() restrict2 override final;
 
-        bool play(const std::string &restrict action) restrict2 override final;
+        bool play(const std::string &restrict spriteAction)
+                  restrict2 override final;
 
         bool update(const int time) restrict2 override final;
 
-- 
cgit v1.2.3-60-g2f50