From 5a0d9f97bc7a2598f5f7cddc163c37f20dcb95a1 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Wed, 22 Jul 2015 00:35:28 +0200 Subject: [PATCH] Fix merge --- src/server/game/Miscellaneous/Language.h | 11 ++--------- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 3 +-- src/server/worldserver/Main.cpp | 1 + 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index f824da78fa..c50d9007af 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -207,15 +207,8 @@ enum TrinityStrings LANG_LIQUID_STATUS = 175, LANG_INVALID_GAMEOBJECT_TYPE = 176, LANG_GAMEOBJECT_DAMAGED = 177, - - LANG_PHASING_SUCCESS = 178, - LANG_PHASING_FAILED = 179, - LANG_PHASING_LAST_PHASE = 180, - LANG_PHASING_LIST = 181, - LANG_PHASING_PHASEMASK = 182, - LANG_PHASING_REPORT_STATUS = 183, - LANG_PHASING_NO_DEFINITIONS = 184, // Phasing - // Room for more level 1 185-199 not used + LANG_GRID_POSITION = 178, + // Room for more level 1 179-199 not used // level 2 chat LANG_NO_SELECTION = 200, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 9b16ba5e77..e4c1a42eaf 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -644,8 +644,7 @@ void AuraEffect::CalculatePeriodic(Unit* caster, bool resetPeriodicTimer /*= tru if (m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) caster->ModSpellCastTime(m_spellInfo, m_amplitude); } - else if (m_spellInfo->AttributesEx5 & SPELL_ATTR5_HASTE_AFFECT_DURATION) - else if (caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) + else if (m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) m_amplitude = int32(m_amplitude * caster->GetFloatValue(UNIT_MOD_CAST_SPEED)); } } diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 21345b7a71..0b0a91d14a 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -44,6 +44,7 @@ #include "WorldSocket.h" #include "WorldSocketMgr.h" #include "BattlenetServerManager.h" +#include "DatabaseLoader.h" #include #include #include