diff options
| author | megamage <none@none> | 2009-01-03 21:03:10 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-03 21:03:10 -0600 |
| commit | 3c1691497d189836adcc0e5fd702665a602cb266 (patch) | |
| tree | 1f6a47bd5d52e2b499543e1a6f9381120f38b568 /src/game/ObjectMgr.h | |
| parent | 1172114a3ee4c78b07e756bfe224295c21f3d456 (diff) | |
| parent | 59f85167ab387a8e8b69aaf1d65f9b6994de9ca0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.h')
| -rw-r--r-- | src/game/ObjectMgr.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 4a35f98b679..cca03ae39a3 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -321,7 +321,9 @@ class ObjectMgr typedef std::vector<std::string> ScriptNameMap; - Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);} + UNORDERED_MAP<uint32, uint32> TransportEventMap; + + Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);} Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); } static GameObjectInfo const *GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry<GameObjectInfo>(id); } @@ -533,6 +535,8 @@ class ObjectMgr void LoadEventScripts(); void LoadSpellScripts(); void LoadWaypointScripts(); + + void LoadTransportEvents(); bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value); bool LoadTrinityStrings() { return LoadTrinityStrings(WorldDatabase,"trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); } @@ -588,7 +592,7 @@ class ObjectMgr void LoadNpcTextId(); void LoadVendors(); void LoadTrainerSpell(); - + std::string GeneratePetName(uint32 entry); uint32 GetBaseXP(uint32 level); |