[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

--HG--
branch : trunk
rename : 6731-680 => 6743-685

1 files changed, 1 insertions, 1 deletions

diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 5bb3aafde72..f5d35009307 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -742,7 +742,7 @@ class ObjectMgr
         }

         void AddVendorItem(uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost);

         bool RemoveVendorItem(uint32 entry,uint32 item);

-        bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL ) const;

+        bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL ) const;

     protected:

         uint32 m_auctionid;

         uint32 m_mailid;