diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index b9bf3806ef..48f7c8d21a 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -22,7 +22,7 @@ #include "SpellMgr.h" #include "TransportMgr.h" #include "DBCfmt.h" -#include "ItemPrototype.h" +#include "ItemTemplate.h" #include "Timer.h" #include "ObjectDefines.h" diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp index 361bc8f4ee..213894c2cf 100644 --- a/src/server/game/Entities/Item/ItemTemplate.cpp +++ b/src/server/game/Entities/Item/ItemTemplate.cpp @@ -37,33 +37,6 @@ bool ItemTemplate::CanChangeEquipStateInCombat() const return false; } - -float ItemTemplate::getDPS() const -{ - if (!Delay) - return 0.f; - - float temp = 0.f; - for (uint8 i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i) - temp += Damage[i].DamageMin + Damage[i].DamageMax; - - return temp * 500.f / Delay; -} - -int32 ItemTemplate::getFeralBonus(int32 extraDPS /*= 0*/) const -{ - // 0x02A5F3 - is mask for Melee weapon from ItemSubClassMask.dbc - if (Class == ITEM_CLASS_WEAPON && (1 << SubClass) & 0x02A5F3) - { - int32 bonus = int32((extraDPS + getDPS()) * 14.0f) - 767; - if (bonus < 0) - return 0; - return bonus; - } - - return 0; -} - float ItemTemplate::GetItemLevelIncludingQuality() const { float itemLevel(ItemLevel); diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp index 99ca05130d..a27e8395cb 100644 --- a/src/server/shared/Realm/RealmList.cpp +++ b/src/server/shared/Realm/RealmList.cpp @@ -82,7 +82,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error) PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_REALMLIST); PreparedQueryResult result = LoginDatabase.Query(stmt); - std::map existingRealms; + std::map existingRealms; for (auto const& p : _realms) existingRealms[p.first] = p.second.Name;