mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9451] Added new config option for arena queue announcer.

Browse source 
Option Arena.QueueAnnouncer.Enable removed so if it used
need update mangosd.conf to new options use.

(based on insider42/mangos commit 211506f)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Insider 2010-02-25 15:55:48 +03:00 • committed by VladimirMangos
parent 7f6f199911
commit 19b14c5d58
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/BattleGroundMgr.cpp
View file

@ -178,7 +178,7 @@ GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, Group* grp, BattleG
uint32 lastOnlineTime = getMSTime(); uint32 lastOnlineTime = getMSTime();
//announce world (this don't need mutex) //announce world (this don't need mutex)
if (isRated && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_ENABLE)) if (isRated && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN))
{ {
sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN, ginfo->ArenaType, ginfo->ArenaType, ginfo->ArenaTeamRating); sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN, ginfo->ArenaType, ginfo->ArenaType, ginfo->ArenaTeamRating);
} }
@ -372,7 +372,7 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou
m_QueuedPlayers.erase(itr); m_QueuedPlayers.erase(itr);
// announce to world if arena team left queue for rated match, show only once // announce to world if arena team left queue for rated match, show only once
if (group->ArenaType && group->IsRated && group->Players.empty() && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_ENABLE)) if (group->ArenaType && group->IsRated && group->Players.empty() && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT))
sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT, group->ArenaType, group->ArenaType, group->ArenaTeamRating); sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT, group->ArenaType, group->ArenaType, group->ArenaTeamRating);
//if player leaves queue and he is invited to rated arena match, then he have to loose //if player leaves queue and he is invited to rated arena match, then he have to loose

3
src/game/World.cpp
View file

@ -719,7 +719,8 @@ void World::LoadConfigSettings(bool reload)
setConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER, "Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILISECONDS); setConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER, "Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILISECONDS);
setConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS, "Arena.AutoDistributePoints", false); setConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS, "Arena.AutoDistributePoints", false);
setConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS, "Arena.AutoDistributeInterval", 7); setConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS, "Arena.AutoDistributeInterval", 7);
setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_ENABLE, "Arena.QueueAnnouncer.Enable", false); setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN, "Arena.QueueAnnouncer.Join", false);
setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT, "Arena.QueueAnnouncer.Exit", false);
setConfig(CONFIG_UINT32_ARENA_SEASON_ID, "Arena.ArenaSeason.ID", 1); setConfig(CONFIG_UINT32_ARENA_SEASON_ID, "Arena.ArenaSeason.ID", 1);
setConfig(CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS, "Arena.ArenaSeason.InProgress", true); setConfig(CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS, "Arena.ArenaSeason.InProgress", true);

3
src/game/World.h
View file

@ -299,7 +299,8 @@ enum eConfigBoolValues
CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE, CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE,
CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY, CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY,
CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS, CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS,
CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_ENABLE, CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN,
CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT,
CONFIG_BOOL_VALUE_COUNT CONFIG_BOOL_VALUE_COUNT
}; };

12
src/mangosd/mangosd.conf.dist.in
View file

@ -1297,8 +1297,13 @@ BattleGround.PremadeGroupWaitForMatch = 1800000
# If automatic distribution is enabled in days # If automatic distribution is enabled in days
# Default: 7 (weekly) # Default: 7 (weekly)
# #
# Arena.QueueAnnouncer.Enable # Arena.QueueJoinAnnouncer.Enable
# Enable bg queue announcer posting to chat # Enable arena queue announcer posting to chat at join
# Default: 0 (disable)
# 1 (enable)
#
# Arena.QueueExitAnnouncer.Enable
# Enable arena queue announcer posting to chat at exit
# Default: 0 (disable) # Default: 0 (disable)
# 1 (enable) # 1 (enable)
# #
@ -1317,7 +1322,8 @@ Arena.MaxRatingDifference = 150
Arena.RatingDiscardTimer = 600000 Arena.RatingDiscardTimer = 600000
Arena.AutoDistributePoints = 0 Arena.AutoDistributePoints = 0
Arena.AutoDistributeInterval = 7 Arena.AutoDistributeInterval = 7
Arena.QueueAnnouncer.Enable = 0 Arena.QueueJoinAnnouncer.Enable = 0
Arena.QueueExitAnnouncer.Enable = 0
Arena.ArenaSeason.ID = 1 Arena.ArenaSeason.ID = 1
Arena.ArenaSeason.InProgress = 1 Arena.ArenaSeason.InProgress = 1

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9450" #define REVISION_NR "9451"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__