diff options
| author | Shocker <none@none> | 2010-09-21 04:10:01 +0300 |
|---|---|---|
| committer | Shocker <none@none> | 2010-09-21 04:10:01 +0300 |
| commit | eaadad5dfd7c50963c65731c02d0fdf012d5e880 (patch) | |
| tree | 6c980047cd9ce6e11eda8e19ff5da8680fd071a4 /src | |
| parent | 5ffaf0d84bb5e2f73f60321c1754d879f5297f0f (diff) | |
Core/Arenas:
* Fix handling of Arena.ArenaStartPersonalRating
* Correct some typos for some arena configs in default world configuration file
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeam.cpp | 23 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 4 |
2 files changed, 4 insertions, 23 deletions
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 8064d7a4289..c1d0590eedf 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -54,15 +54,7 @@ ArenaTeam::ArenaTeam() m_stats.games_week = 0; m_stats.games_season = 0; m_stats.rank = 0; - /* warning: comparison of unsigned expression >= 0 is always true - if (sWorld.getIntConfig(CONFIG_ARENA_START_RATING) >= 0) - m_stats.rating = sWorld.getIntConfig(CONFIG_ARENA_START_RATING); - else if (sWorld.getIntConfig(CONFIG_ARENA_SEASON_ID) >= 6) - m_stats.rating = 0; - else - m_stats.rating = 1500; - */ - m_stats.rating = sWorld.getIntConfig(CONFIG_ARENA_START_RATING); + m_stats.rating = sWorld.getIntConfig(CONFIG_ARENA_START_RATING); m_stats.wins_week = 0; m_stats.wins_season = 0; } @@ -148,18 +140,7 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid) } plMMRating = sWorld.getIntConfig(CONFIG_ARENA_START_MATCHMAKER_RATING); - plPRating = 0; - - if (sWorld.getIntConfig(CONFIG_ARENA_START_PERSONAL_RATING) > 0) - plPRating = sWorld.getIntConfig(CONFIG_ARENA_START_PERSONAL_RATING); - else - { - if (sWorld.getIntConfig(CONFIG_ARENA_SEASON_ID) < 6) - plPRating = 1500; - else - if (GetRating() >= 1000) - plPRating = 1000; - } + plPRating = sWorld.getIntConfig(CONFIG_ARENA_START_PERSONAL_RATING); QueryResult result = CharacterDatabase.PQuery("SELECT matchmaker_rating FROM character_arena_stats WHERE guid='%u' AND slot='%u'", GUID_LOPART(PlayerGuid), GetSlot()); if (result) diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 5ca53cdf61e..51be81430f6 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1840,11 +1840,11 @@ Battleground.Random.ResetHour = 6 # Start arena team command rating # Default: 0 # -# Arena.StartPersonalRating +# Arena.ArenaStartPersonalRating # Start personal rating on entry in team # Default: 0 # -# Arena.StartMatchmakerRating +# Arena.ArenaStartMatchmakerRating # Start matchmaker rating for players # Default: 1500 # |