Changeset 6 for trunk/src/game/Player.h

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/Player.h (modified) (3 diffs)

trunk/src/game/Player.h

@@ -671 +671 @@
 {
     ItemPosCount(uint16 _pos, uint8 _count) : pos(_pos), count(_count) {}
-    bool isContainedIn(std::vector<ItemPosCount>&);
+    bool isContainedIn(std::vector<ItemPosCount> const& vec) const;
     uint16 pos;
     uint8 count;
@@ -1742 +1742 @@
         uint32 GetShieldBlockValue() const;                 // overwrite Unit version (virtual)
         bool CanParry() const { return m_canParry; }
-        void SetCanParry(bool value) { m_canParry = value; }
+        void SetCanParry(bool value);
+        bool CanBlock() const { return m_canBlock; }
+        void SetCanBlock(bool value);
         bool CanDualWield() const { return m_canDualWield; }
         void SetCanDualWield(bool value) { m_canDualWield = value; }
@@ -2202 +2204 @@
         uint32 m_ArmorProficiency;
         bool m_canParry;
+        bool m_canBlock;
         bool m_canDualWield;
         uint8 m_swingErrorMsg;