Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

And another compile fix try

Browse Source
This commit is contained in:
Aokromes
2016-10-24 16:59:27 +02:00
parent 4ad4326c53
commit c5d2bc544f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -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;

2
src/server/game/Handlers/ItemHandler.cpp
View File

@@ -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