diff options
| author | Rat <gmstreetrat@gmail.com> | 2011-11-26 20:38:25 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2011-11-26 20:38:25 +0100 |
| commit | ca03e79ce787702f97f3b3e3a09e39646bedc28f (patch) | |
| tree | f4df95bb5bf59823f002fd3e456f569936677283 /src/server/game/Globals/ObjectMgr.h | |
| parent | 8cf3fde3291e8fdadef564232c2981d670a1e274 (diff) | |
| parent | bc37c75dfde1882b208be13731f9ffdc54938d62 (diff) | |
Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.x
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 88c593a009d..e6ac7036d48 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -865,6 +865,8 @@ class ObjectMgr void LoadGameobjects(); void LoadGameobjectRespawnTimes(); void LoadItemTemplates(); + void LoadItemTemplateAddon(); + void LoadItemScriptNames(); void LoadItemLocales(); void LoadItemSetNames(); void LoadItemSetNameLocales(); @@ -1285,7 +1287,6 @@ class ObjectMgr PlayerClassInfo playerClassInfo[MAX_CLASSES]; void BuildPlayerLevelInfo(uint8 race, uint8 class_, uint8 level, PlayerLevelInfo* plinfo) const; - PlayerInfo playerInfo[MAX_RACES][MAX_CLASSES]; typedef std::vector<uint32> PlayerXPperLevel; // [level] |