diff options
author | Shocker <none@none> | 2010-09-02 15:25:02 +0300 |
---|---|---|
committer | Shocker <none@none> | 2010-09-02 15:25:02 +0300 |
commit | 8331da627d28d4e830c55d70b14c9c05e78fe2d6 (patch) | |
tree | b4c44e6c67da4150c822851bd2bdfcad8366a2f3 | |
parent | c8dfbdac35c9f74c7ec72f7a8d42d838b8c691a8 (diff) |
Some old typo fixes, closes issues #3747, #2756, #2607, thanks 2010phenix/jean-michele.nefen/toshik.777
--HG--
branch : trunk
4 files changed, 9 insertions, 9 deletions
diff --git a/sql/updates/3.3.3a_old/8371_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8371_world_spell_bonus_data.sql index 5b72884b34c..6d3fcbdd41f 100644 --- a/sql/updates/3.3.3a_old/8371_world_spell_bonus_data.sql +++ b/sql/updates/3.3.3a_old/8371_world_spell_bonus_data.sql @@ -1,4 +1,4 @@ -DELETE FROM `spell_bonus_data` WHERE `entry` IN (56131,56160,52725,55533); +DELETE FROM `spell_bonus_data` WHERE `entry` IN (56131,56160,52752,55533); INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES (56131, 0, 0, 0, 0, 'Priest - Glyph of Dispel Magic'), (56160, 0, 0, 0, 0, 'Priest - Glyph of Power Word: Shield'), diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 6fc4ede2277..d5df0e0ff51 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -125,9 +125,9 @@ bool BattlegroundQueue::SelectionPool::AddGroup(GroupQueueInfo *ginfo, uint32 de /*********************************************************/ // add group or player (grp == NULL) to bg queue with the given leader and bg specifications -GroupQueueInfo * BattlegroundQueue::AddGroup(Player *leader, Group* grp, BattlegroundTypeId BgTypeId, PvPDifficultyEntry const* backetEntry, uint8 ArenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 arenateamid) +GroupQueueInfo * BattlegroundQueue::AddGroup(Player *leader, Group* grp, BattlegroundTypeId BgTypeId, PvPDifficultyEntry const* bracketEntry, uint8 ArenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 arenateamid) { - BattlegroundBracketId bracketId = backetEntry->GetBracketId(); + BattlegroundBracketId bracketId = bracketEntry->GetBracketId(); // create new ginfo GroupQueueInfo* ginfo = new GroupQueueInfo; @@ -201,8 +201,8 @@ GroupQueueInfo * BattlegroundQueue::AddGroup(Player *leader, Group* grp, Battleg uint32 MinPlayers = bg->GetMinPlayersPerTeam(); uint32 qHorde = 0; uint32 qAlliance = 0; - uint32 q_min_level = backetEntry->minLevel; - uint32 q_max_level = backetEntry->maxLevel; + uint32 q_min_level = bracketEntry->minLevel; + uint32 q_max_level = bracketEntry->maxLevel; GroupsQueueType::const_iterator itr; for (itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr) if (!(*itr)->IsInvitedToBGInstanceGUID) diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 8c623df3504..83d7f1971c1 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -77,7 +77,7 @@ class BattlegroundQueue bool CheckPremadeMatch(BattlegroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam); bool CheckNormalMatch(Battleground* bg_template, BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers); bool CheckSkirmishForSameFaction(BattlegroundBracketId bracket_id, uint32 minPlayersPerTeam); - GroupQueueInfo * AddGroup(Player* leader, Group* group, BattlegroundTypeId bgTypeId, PvPDifficultyEntry const* backetEntry, uint8 ArenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 ArenaTeamId = 0); + GroupQueueInfo * AddGroup(Player* leader, Group* group, BattlegroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, uint8 ArenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 ArenaTeamId = 0); void RemovePlayer(const uint64& guid, bool decreaseInvitedCount); bool IsPlayerInvited(const uint64& pl_guid, const uint32 bgInstanceGuid, const uint32 removeTime); bool GetPlayerGroupInfoData(const uint64& guid, GroupQueueInfo* ginfo); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 0a55f3c8cc1..1a8edbce36b 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1721,9 +1721,9 @@ AutoBroadcast.Timer = 60000 # 1 (enable) # # Battleground.QueueAnnouncer.PlayerOnly -# Enable queue announcer posting to chat -# Default: 0 (disable) -# 1 (enable) +# Queue announcer type +# Default: 0 (system message - all players can see it) +# 1 (private - only the queued player can see it) # # Battleground.InvitationType # Set Battleground invitation type |