diff options
| author | Spp <spp@jorge.gr> | 2012-10-04 13:33:04 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-04 13:33:04 +0200 |
| commit | f570383fbadf12c02d2a3f323eadf5ca2417c3bd (patch) | |
| tree | c28f940c3f77171a5b542189f8704c912001de51 /src/server/game/Handlers/ItemHandler.cpp | |
| parent | 94c8c7ec4e3a1cf625bee0bab77f8814253ddf0d (diff) | |
| parent | e1bee86ee6f5c3ab7b1da6d1b54c98c2851f11ec (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
Diffstat (limited to 'src/server/game/Handlers/ItemHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ItemHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 9f6e66cfc6b..69d9d24db8c 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -777,7 +777,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid) int32 price = vendorItem->IsGoldRequired(itemTemplate) ? uint32(floor(itemTemplate->BuyPrice * discountMod)) : 0; if (int32 priceMod = _player->GetTotalAuraModifier(SPELL_AURA_MOD_VENDOR_ITEMS_PRICES)) - price -= CalculatePctN(price, priceMod); + price -= CalculatePct(price, priceMod); itemsData << uint32(count++ + 1); // client expects counting to start at 1 itemsData << uint32(itemTemplate->MaxDurability); |