From 405445d56416b8ed05cd995c497eb66e6c69e8d9 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Nov 2017 00:58:28 +0100 Subject: [PATCH] rename files --- .../2017_11_26_01_world_from_335_was_2017_11_26_00_world.sql} | 0 src/server/game/Entities/GameObject/GameObject.cpp | 2 +- src/server/game/Loot/LootMgr.cpp | 2 +- src/server/game/Spells/Spell.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename sql/updates/world/{3.3.5/2017_11_26_00_world.sql => 4.3.4/2017_11_26_01_world_from_335_was_2017_11_26_00_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/2017_11_26_00_world.sql b/sql/updates/world/4.3.4/2017_11_26_01_world_from_335_was_2017_11_26_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2017_11_26_00_world.sql rename to sql/updates/world/4.3.4/2017_11_26_01_world_from_335_was_2017_11_26_00_world.sql diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 274d2a60ce..6bf67e5202 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -807,7 +807,7 @@ void GameObject::getFishLootJunk(Loot* fishloot, Player* loot_owner) } } -void GameObject::getArchaeologyLoot(Loot* loot, Player* loot_owner) +void GameObject::getArchaeologyLoot(Loot* loot, Player* /*loot_owner*/) { loot->AddCurrency(sArchaeologyMgr->GetFindCurrency(GetEntry()), 4, 9); } diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 5c3dd40f03..c83c3ddf9f 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -449,7 +449,7 @@ void Loot::AddCurrency(uint32 entry, uint32 min, uint32 max) unlootedCurrency++; } -LootCurrency* Loot::LootCurrencyInSlot(uint32 lootSlot, Player* player) +LootCurrency* Loot::LootCurrencyInSlot(uint32 lootSlot, Player* /*player*/) { if (currencies[lootSlot].looted) return NULL; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 1dd968d7ed..81726c54dc 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4005,7 +4005,7 @@ void Spell::SendSpellStart() if (m_spellInfo->RuneCostID && m_spellInfo->PowerType == POWER_RUNE) castFlags |= CAST_FLAG_NO_GCD; // not needed, but Blizzard sends it - if (m_casttime && m_spellInfo->HasEffect(SPELL_EFFECT_HEAL) || m_spellInfo->HasEffect(SPELL_EFFECT_HEAL_PCT) || + if ((m_casttime && m_spellInfo->HasEffect(SPELL_EFFECT_HEAL)) || m_spellInfo->HasEffect(SPELL_EFFECT_HEAL_PCT) || m_spellInfo->HasAura(SPELL_AURA_PERIODIC_HEAL)) castFlags |= CAST_FLAG_HEAL_PREDICTION;