Changeset 18 for trunk/src/game/ItemHandler.cpp

Timestamp:

11/19/08 13:23:29 (17 years ago)

Author:

yumileroy

Message:

[svn] * Little fix in RandomMovementGenerator?
* Updated to 6731 and 680

Original author: Neo2003
Date: 2008-10-06 04:48:59-05:00

Files:

• trunk/src/game/ItemHandler.cpp (modified) (2 diffs)

trunk/src/game/ItemHandler.cpp

@@ -681 +681 @@
     // Stop the npc if moving
     pCreature->StopMoving();
-    // load vendor items if not yet
-    pCreature->LoadGoods();
-
-    uint8 numitems = pCreature->GetItemCount();
+
+    VendorItemData const* vItems = pCreature->GetVendorItems();
+    if(!vItems)
+    {
+        _player->SendSellError( SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
+        return;
+    }
+
+    uint8 numitems = vItems->GetItemCount();
     uint8 count = 0;
-    uint32 ptime = time(NULL);
-    uint32 diff;
 
     WorldPacket data( SMSG_LIST_INVENTORY, (8+1+numitems*8*4) );
@@ -695 +698 @@
     float discountMod = _player->GetReputationPriceDiscount(pCreature);
 
-    ItemPrototype const *pProto;
     for(int i = 0; i < numitems; i++ )
     {
-        CreatureItem* crItem = pCreature->GetItem(i);
-        if( crItem )
-        {
-            pProto = objmgr.GetItemPrototype(crItem->id);
-            if( pProto )
+        if(VendorItem const* crItem = vItems->GetItem(i))
+        {
+            if(ItemPrototype const *pProto = objmgr.GetItemPrototype(crItem->item))
             {
                 if((pProto->AllowableClass & _player->getClassMask()) == 0 && pProto->Bonding == BIND_WHEN_PICKED_UP && !_player->isGameMaster())
                     continue;
+
                 ++count;
-                if( crItem->incrtime != 0 && (crItem->lastincr + crItem->incrtime <= ptime) )
-                {
-                    diff = uint32((ptime - crItem->lastincr)/crItem->incrtime);
-                    if( (crItem->count + diff * pProto->BuyCount) <= crItem->maxcount )
-                        crItem->count += diff * pProto->BuyCount;
-                    else
-                        crItem->count = crItem->maxcount;
-                    crItem->lastincr = ptime;
-                }
+
+                // reputation discount
+                uint32 price = uint32(floor(pProto->BuyPrice * discountMod));
+
                 data << uint32(count);
-                data << uint32(crItem->id);
+                data << uint32(crItem->item);
                 data << uint32(pProto->DisplayInfoID);
-                data << uint32(crItem->maxcount <= 0 ? 0xFFFFFFFF : crItem->count);
-
-                uint32 price = pProto->BuyPrice;
-
-                // reputation discount
-                price = uint32(floor(pProto->BuyPrice * discountMod));
-
+                data << uint32(crItem->maxcount <= 0 ? 0xFFFFFFFF : pCreature->GetVendorItemCurrentCount(crItem));
                 data << uint32(price);
                 data << uint32(pProto->MaxDurability);