*Merge.

--HG-- branch : trunk
2009-03-06 18:09:01 -06:00
parent 13fc3dcd7e b49732c04d
commit 7915fd768a
33 changed files with 533 additions and 261 deletions
@@ -864,6 +864,20 @@ struct InstancePlayerBind
    InstancePlayerBind() : save(NULL), perm(false) {}
 };

+struct AccessRequirement
+{
+    uint8  levelMin;
+    uint8  levelMax;
+    uint32 item;
+    uint32 item2;
+    uint32 heroicKey;
+    uint32 heroicKey2;
+    uint32 quest;
+    std::string questFailedText;
+	uint32 heroicQuest;
+    std::string heroicQuestFailedText;
+ };
+
 class TRINITY_DLL_SPEC PlayerTaxi
 {
    public:
@@ -2127,6 +2141,7 @@ class TRINITY_DLL_SPEC Player : public Unit
        void SendRaidInfo();
        void SendSavedInstances();
        static void ConvertInstancesToGroup(Player *player, Group *group = NULL, uint64 player_guid = 0);
+        bool Satisfy(AccessRequirement const*, uint32 target_map, bool report = false);

        /*********************************************************/
        /***                   GROUP SYSTEM                    ***/