aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorazazel <none@none>2010-08-05 22:08:07 +0600
committerazazel <none@none>2010-08-05 22:08:07 +0600
commit885fc368fdef08dbe3687c0b4c21a6ac09906fed (patch)
treee3cf3ad44f89d442280acddc0d2685b6b02aaafb /src/server/scripts
parenta042b972ed3361393fe3e7ce4e177073021bcfc9 (diff)
* Implement item limit category (based on changes by VladimirMangos)
* Additional check for HandleAutoBankItemOpcode (thanks to VladimitMangos) * Properly show empty vendor list for empty item list (author: a1ien) * More stricted checks for store operations (thanks to VladimirMangos) * Prevent autostoring of not empty bags (thanks to L1ghtGu4rd) Changes need testing. Please post bugs on our tracker. --HG-- branch : trunk
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Outland/zangarmarsh.cpp7
-rw-r--r--src/server/scripts/World/item_scripts.cpp9
2 files changed, 9 insertions, 7 deletions
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
index db50e255118..9909b81fbec 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -225,13 +225,14 @@ bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature* pCreature, uint32
if (!pPlayer->HasItemCount(24573,1))
{
ItemPosCountVec dest;
- uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24573, 1, false);
+ uint32 itemId = 24573;
+ uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, 1, false);
if (msg == EQUIP_ERR_OK)
{
- pPlayer->StoreNewItem(dest, 24573, true);
+ pPlayer->StoreNewItem(dest, itemId, true);
}
else
- pPlayer->SendEquipError(msg,NULL,NULL);
+ pPlayer->SendEquipError(msg, NULL, NULL, itemId);
}
pPlayer->SEND_GOSSIP_MENU(9231, pCreature->GetGUID());
break;
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 013888f909d..1c70d9b2d3d 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -96,13 +96,14 @@ bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* /*pItem*/, SpellCas
else
{
ItemPosCountVec dest;
- uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 23614, 1);
+ uint32 itemId = 23614;
+ uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, 1);
if (msg == EQUIP_ERR_OK)
{
- if (Item* item = pPlayer->StoreNewItem(dest,23614,true))
- pPlayer->SendNewItem(item,1,false,true);
+ if (Item* item = pPlayer->StoreNewItem(dest, itemId, true))
+ pPlayer->SendNewItem(item, 1, false, true);
} else
- pPlayer->SendEquipError(msg,NULL,NULL);
+ pPlayer->SendEquipError(msg, NULL, NULL, itemId);
}
}
//}