From c5d2bc544fda9c0732ce485c407dccf78401debd Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 24 Oct 2016 16:59:27 +0200 Subject: [PATCH] And another compile fix try --- src/server/game/Globals/ObjectMgr.cpp | 4 ++-- src/server/game/Handlers/ItemHandler.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 496ecf496af..b11c0a44174 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2428,7 +2428,7 @@ void FillItemDamageFields(float* minDamage, float* maxDamage, float* dps, uint32 store = &sItemDamageAmmoStore; break; case INVTYPE_2HWEAPON: - if (flags2 & ITEM_FLAGS_EXTRA_CASTER_WEAPON) + if (flags2 & ITEM_FLAG2_CASTER_WEAPON) store = &sItemDamageTwoHandCasterStore; else store = &sItemDamageTwoHandStore; @@ -2456,7 +2456,7 @@ void FillItemDamageFields(float* minDamage, float* maxDamage, float* dps, uint32 case INVTYPE_WEAPON: case INVTYPE_WEAPONMAINHAND: case INVTYPE_WEAPONOFFHAND: - if (flags2 & ITEM_FLAGS_EXTRA_CASTER_WEAPON) + if (flags2 & ITEM_FLAG2_CASTER_WEAPON) store = &sItemDamageOneHandCasterStore; else store = &sItemDamageOneHandStore; diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 4e1d730b370..2c5e67bd892 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -625,7 +625,7 @@ void WorldSession::SendListInventory(ObjectGuid vendorGuid) // Only display items in vendor lists for the team the player is on if ((itemTemplate->Flags2 & ITEM_FLAG2_FACTION_HORDE && _player->GetTeam() == ALLIANCE) || - (itemTemplate->Flags2 & ITEM_FLAGS_EXTRA_ALLIANCE_ONLY && _player->GetTeam() == HORDE)) + (itemTemplate->Flags2 & ITEM_FLAG2_FACTION_ALLIANCE && _player->GetTeam() == HORDE)) continue; // Items sold out are not displayed in list