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

trunk/src/game/Level2.cpp

@@ -1238 +1238 @@
         return false;
 
-    Creature* vendor = getSelectedCreature();
-    if (!vendor || !vendor->isVendor())
-    {
-        SendSysMessage(LANG_COMMAND_VENDORSELECTION);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
     char* pitem  = extractKeyFromLink((char*)args,"Hitem");
     if (!pitem)
@@ -1253 +1245 @@
         return false;
     }
+
     uint32 itemId = atol(pitem);
 
@@ -1268 +1261 @@
     uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
 
-    ItemPrototype const *pProto = objmgr.GetItemPrototype(itemId);
-    if(!pProto)
-    {
-        PSendSysMessage(LANG_ITEM_NOT_FOUND, itemId);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    if(extendedcost && !sItemExtendedCostStore.LookupEntry(extendedcost))
-    {
-        PSendSysMessage(LANG_BAD_VALUE, extendedcost);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    // load vendor items if not yet
-    vendor->LoadGoods();
-
-    if(vendor->FindItem(itemId))
-    {
-        PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST,itemId);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    if (vendor->GetItemCount() >= MAX_VENDOR_ITEMS)
-    {
-        SendSysMessage(LANG_COMMAND_ADDVENDORITEMITEMS);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    // add to DB and to current ingame vendor
-    WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')",vendor->GetEntry(), itemId, maxcount,incrtime,extendedcost);
-    vendor->AddItem(itemId,maxcount,incrtime,extendedcost);
+    Creature* vendor = getSelectedCreature();
+
+    uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;
+
+    if(!objmgr.IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,m_session->GetPlayer()))
+    {
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    objmgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
+
+    ItemPrototype const* pProto = objmgr.GetItemPrototype(itemId);
+
     PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost);
     return true;
@@ -1330 +1302 @@
     uint32 itemId = atol(pitem);
 
-    ItemPrototype const *pProto = objmgr.GetItemPrototype(itemId);
-    if(!pProto)
-    {
-        PSendSysMessage(LANG_ITEM_NOT_FOUND, itemId);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    // load vendor items if not yet
-    vendor->LoadGoods();
-
-    if (!vendor->RemoveItem(itemId))
+
+    if(!objmgr.RemoveVendorItem(vendor->GetEntry(),itemId))
     {
         PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId);
@@ -1348 +1310 @@
     }
 
-    WorldDatabase.PExecuteLog("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'",vendor->GetEntry(), itemId);
+    ItemPrototype const* pProto = objmgr.GetItemPrototype(itemId);
+
     PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,pProto->Name1);
     return true;