From 28e6d6870a8136c8298a6abc1bfd1360d1be3641 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 20 Sep 2017 00:27:21 -0400 Subject: [PATCH] Implement SPELL_ATTR0_ON_NEXT_SWING_2 Misc. Fixes --- Framework/Constants/GuildConst.cs | 2 +- Framework/Util/MathFunctions.cs | 2 +- Game/Spells/Spell.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Framework/Constants/GuildConst.cs b/Framework/Constants/GuildConst.cs index 0f77b2df7..09f2c63fe 100644 --- a/Framework/Constants/GuildConst.cs +++ b/Framework/Constants/GuildConst.cs @@ -24,7 +24,7 @@ namespace Framework.Constants public const int BankMoneyLogsTab = 100; public const uint WithdrawMoneyUnlimited = 0xFFFFFFFF; - public const uint WithdrawSlotUnlimited = 0xFFFFFFFF; + public const int WithdrawSlotUnlimited = -1; public const uint EventLogGuidUndefined = 0xFFFFFFFF; public const uint ChallengesTypes = 6; diff --git a/Framework/Util/MathFunctions.cs b/Framework/Util/MathFunctions.cs index f45afda71..498e4ac40 100644 --- a/Framework/Util/MathFunctions.cs +++ b/Framework/Util/MathFunctions.cs @@ -173,7 +173,7 @@ public static class MathFunctions public static int RoundToInterval(ref int num, dynamic floor, dynamic ceil) { - return num = Math.Min(Math.Max(num, floor), ceil); + return num = (int)Math.Min(Math.Max(num, floor), ceil); } public static uint RoundToInterval(ref uint num, dynamic floor, dynamic ceil) { diff --git a/Game/Spells/Spell.cs b/Game/Spells/Spell.cs index bbe7bec57..e8459eb18 100644 --- a/Game/Spells/Spell.cs +++ b/Game/Spells/Spell.cs @@ -6395,7 +6395,7 @@ namespace Game.Spells bool IsNextMeleeSwingSpell() { - return m_spellInfo.HasAttribute(SpellAttr0.OnNextSwing); + return m_spellInfo.HasAttribute(SpellAttr0.OnNextSwing | SpellAttr0.OnNextSwing2); } bool IsAutoActionResetSpell()