diff options
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeam.cpp | 36 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeam.h | 2 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 16 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptLoader.cpp | 2 |
4 files changed, 55 insertions, 1 deletions
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index af76ff71223..a84e7ec30db 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -269,6 +269,19 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult result) return true; } +bool ArenaTeam::SetName(std::string const& name) +{ + if (TeamName == name || name.empty() || name.length() > 24 || sObjectMgr->IsReservedName(name) || !ObjectMgr::IsValidCharterName(name)) + return false; + + TeamName = name; + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ARENA_TEAM_NAME); + stmt->setString(0, TeamName); + stmt->setUInt32(1, GetId()); + CharacterDatabase.Execute(stmt); + return true; +} + void ArenaTeam::SetCaptain(uint64 guid) { // Disable remove/promote buttons @@ -360,6 +373,29 @@ void ArenaTeam::Disband(WorldSession* session) sArenaTeamMgr->RemoveArenaTeam(TeamId); } +void ArenaTeam::Disband() +{ + // Remove all members from arena team + while (!Members.empty()) + DelMember(Members.front().Guid, false); + + // Update database + SQLTransaction trans = CharacterDatabase.BeginTransaction(); + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ARENA_TEAM); + stmt->setUInt32(0, TeamId); + trans->Append(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ARENA_TEAM_MEMBERS); + stmt->setUInt32(0, TeamId); + trans->Append(stmt); + + CharacterDatabase.CommitTransaction(trans); + + // Remove arena team from ObjectMgr + sArenaTeamMgr->RemoveArenaTeam(TeamId); +} + void ArenaTeam::Roster(WorldSession* session) { Player* player = NULL; diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 7a1d9fa131c..0d37351583d 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -121,6 +121,7 @@ class ArenaTeam bool Create(uint64 captainGuid, uint8 type, std::string const& teamName, uint32 backgroundColor, uint8 emblemStyle, uint32 emblemColor, uint8 borderStyle, uint32 borderColor); void Disband(WorldSession* session); + void Disband(); typedef std::list<ArenaTeamMember> MemberList; @@ -136,6 +137,7 @@ class ArenaTeam uint32 GetAverageMMR(Group* group) const; void SetCaptain(uint64 guid); + bool SetName(std::string const& name); bool AddMember(uint64 PlayerGuid); // Shouldn't be uint64 ed, because than can reference guid from members on Disband diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 3bb663f2978..15673ffd0c5 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -828,7 +828,21 @@ enum TrinityStrings LANG_CHARACTER_GENDER_MALE = 855, LANG_CHARACTER_GENDER_FEMALE = 856, - // Room for in-game strings 857-999 not used + LANG_ARENA_ERROR_NOT_FOUND = 857, + LANG_ARENA_ERROR_NAME_EXISTS = 858, + LANG_ARENA_ERROR_SIZE = 859, + LANG_ARENA_ERROR_COMBAT = 860, + LANG_AREAN_ERROR_NAME_NOT_FOUND = 861, + LANG_ARENA_ERROR_NOT_MEMBER = 862, + LANG_ARENA_ERROR_CAPTAIN = 863, + LANG_ARENA_CREATE = 864, + LANG_ARENA_DISBAND = 865, + LANG_ARENA_RENAME = 866, + LANG_ARENA_CAPTAIN = 867, + LANG_ARENA_INFO_HEADER = 868, + LANG_ARENA_INFO_MEMBERS = 869, + LANG_ARENA_LOOKUP = 870, + // Room for in-game strings 870-999 not used // Level 4 (CLI only commands) LANG_COMMAND_EXIT = 1000, diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 5f5024729ca..e65c5884319 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -46,6 +46,7 @@ void AddSC_SmartSCripts(); //Commands void AddSC_account_commandscript(); void AddSC_achievement_commandscript(); +void AddSC_arena_commandscript(); void AddSC_ban_commandscript(); void AddSC_bf_commandscript(); void AddSC_cast_commandscript(); @@ -680,6 +681,7 @@ void AddCommandScripts() { AddSC_account_commandscript(); AddSC_achievement_commandscript(); + AddSC_arena_commandscript(); AddSC_ban_commandscript(); AddSC_bf_commandscript(); AddSC_cast_commandscript(); |