diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-07-23 00:13:13 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-07-23 00:13:13 +0200 |
| commit | fc453ab623178f824bbb0b741ff17cc40beb6c62 (patch) | |
| tree | 794da67aa87362cb7682ab87e6e84d3f484322e3 /src/server/game/World | |
| parent | 48f38f6da17cd10010539c3124994310af5a1c62 (diff) | |
| parent | 47054e6bc1b58ea1a553c550bd302e74016a2467 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/World')
| -rwxr-xr-x | src/server/game/World/World.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/World/World.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 5778e9deef3..5b89abe3b24 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1696,7 +1696,6 @@ void World::SetInitialWorldSettings() ///- Initilize static helper structures AIRegistry::Initialize(); - Player::InitVisibleBits(); ///- Initialize MapManager sLog->outString("Starting Map System"); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 450183226fc..65377eacf4b 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -638,7 +638,7 @@ class World /// Get the maximum skill level a player can reach uint16 GetConfigMaxSkillValue() const { - uint8 lvl = getIntConfig(CONFIG_MAX_PLAYER_LEVEL); + uint8 lvl = uint8(getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); return lvl > 60 ? 300 + ((lvl - 60) * 75) / 10 : lvl*5; } |