diff options
| author | Kinzcool <kinzzcool@hotmail.com> | 2015-01-17 14:37:42 -0500 |
|---|---|---|
| committer | Kinzcool <kinzzcool@hotmail.com> | 2015-01-17 14:37:42 -0500 |
| commit | dfa0f2a2538ab004244acdd0446d73060b4d6a88 (patch) | |
| tree | f16731266c25585e80fcde3108af13f60f8bfd24 /src | |
| parent | caa2be3ae9d74fb89c201f9c36b59539af17b7a3 (diff) | |
Core/Misc: Made GetExpansionForLevel return current expansion for all creatures higher than the last one
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index d0d5fbeb9b8..066d5e20934 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -911,8 +911,8 @@ uint32 GetExpansionForLevel(uint32 level) return EXPANSION_CATACLYSM; else if (level < 90) return EXPANSION_MISTS_OF_PANDARIA; - else if (level < 100) - return EXPANSION_WARLORDS_OF_DRAENOR; + else + return CURRENT_EXPANSION; } bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 2b6e6f6ce4a..403cf731602 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -982,7 +982,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) { const_cast<CreatureTemplate*>(cInfo)->minlevel = (MAX_LEVEL + cInfo->minlevel); const_cast<CreatureTemplate*>(cInfo)->maxlevel = (MAX_LEVEL + cInfo->maxlevel); - const_cast<CreatureTemplate*>(cInfo)->expansion = EXPANSION_WARLORDS_OF_DRAENOR; + const_cast<CreatureTemplate*>(cInfo)->expansion = CURRENT_EXPANSION; } if (cInfo->minlevel < 1 || cInfo->minlevel > STRONG_MAX_LEVEL) @@ -3311,8 +3311,8 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_level = fields[0].GetUInt16(); - uint32 current_xp = uint32(fields[1].GetFloat()); + uint32 current_level = fields[0].GetUInt8(); + uint32 current_xp = fields[1].GetUInt32(); if (current_level >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index d20fb320592..ff8dd1115d9 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -85,6 +85,8 @@ enum Expansions MAX_EXPANSIONS = 6 }; +#define CURRENT_EXPANSION EXPANSION_WARLORDS_OF_DRAENOR; + enum Gender { GENDER_UNKNOWN = -1, |