Changeset 18 for trunk/src/game/Player.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/Player.cpp (modified) (8 diffs)

trunk/src/game/Player.cpp

@@ -5795 +5795 @@
         return;
 
-    ReputationOnKillEntry const* Rep = objmgr.GetReputationOnKilEntry(pVictim->GetEntry());
+    ReputationOnKillEntry const* Rep = objmgr.GetReputationOnKilEntry(((Creature*)pVictim)->GetCreatureInfo()->Entry);
 
     if(!Rep)
@@ -16381 +16381 @@
     }
 
-    // load vendor items if not yet
-    pCreature->LoadGoods();
-
-    CreatureItem* crItem = pCreature->FindItem(item);
-    if(!crItem)
+    VendorItemData const* vItems = pCreature->GetVendorItems();
+    if(!vItems || vItems->Empty())
     {
         SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
@@ -16391 +16388 @@
     }
 
-    if( crItem->maxcount != 0 && crItem->count < count )
-    {
-        SendBuyError( BUY_ERR_ITEM_ALREADY_SOLD, pCreature, item, 0);
+    VendorItem const* crItem = vItems->FindItem(item);
+    if(!crItem)
+    {
+        SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
         return false;
+    }
+
+    // check current item amount if it limited
+    if( crItem->maxcount != 0 )
+    {
+        if(pCreature->GetVendorItemCurrentCount(crItem) < pProto->BuyCount * count )
+        {
+            SendBuyError( BUY_ERR_ITEM_ALREADY_SOLD, pCreature, item, 0);
+            return false;
+        }
     }
 
@@ -16509 +16517 @@
         if(Item *it = StoreNewItem( dest, item, true ))
         {
-            if( crItem->maxcount != 0 )
-                crItem->count -= pProto->BuyCount * count;
+            uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count);
 
             WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4));
             data << pCreature->GetGUID();
-            data << (uint32)crItem->id;                     // entry
-            data << (uint32)crItem->count;
+            data << (uint32)crItem->item;
+            data << (uint32)(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
             data << (uint32)count;
             GetSession()->SendPacket(&data);
 
-            SendNewItem(it, count, true, false, false);
+            SendNewItem(it, pProto->BuyCount*count, true, false, false);
         }
     }
@@ -16549 +16556 @@
         if(Item *it = EquipNewItem( dest, item, pProto->BuyCount * count, true ))
         {
-            if( crItem->maxcount != 0 )
-                crItem->count -= pProto->BuyCount * count;
+            uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count);
 
             WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4));
             data << pCreature->GetGUID();
-            data << (uint32)crItem->id;                     // entry
-            data << (uint32)crItem->count;
+            data << (uint32)crItem->item;
+            data << (uint32)(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
             data << (uint32)count;
             GetSession()->SendPacket(&data);
 
-            SendNewItem(it, count, true, false, false);
+            SendNewItem(it, pProto->BuyCount*count, true, false, false);
 
             AutoUnequipOffhandIfNeed();
@@ -16570 +16576 @@
     }
 
-    return crItem->maxcount!=0?true:false;
+    return crItem->maxcount!=0;
 }
 
@@ -17175 +17181 @@
     // set fly flag if in fly form or taxi flight to prevent visually drop at ground in showup moment
     if(HasAuraType(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED) || isInFlight())
-        SetUnitMovementFlags(GetUnitMovementFlags() | MOVEMENTFLAG_FLYING2);
+        AddUnitMovementFlag(MOVEMENTFLAG_FLYING2);
 }
 
@@ -18168 +18174 @@
     return false;
 }
+
+bool Player::isAllowUseBattleGroundObject()
+{
+    return ( //InBattleGround() &&                            // in battleground - not need, check in other cases
+             !IsMounted() &&                                  // not mounted
+             !HasStealthAura() &&                             // not stealthed
+             !HasInvisibilityAura() &&                        // not invisible
+             !HasAura(SPELL_RECENTLY_DROPPED_FLAG, 0) &&      // can't pickup
+             isAlive()                                        // live player
+           );
+}