josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7004 from Vincent-Michael/guildCommand

Browse Source 
Core/Commands: Convert guild commands in commandscript
This commit is contained in:
Subv
2012-07-05 12:48:10 -07:00
parent ad71a69efd f8374fac0b
commit 6a83cd453c
6 changed files with 202 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Chat.cpp
-11
View File
@@ -112,16 +112,6 @@ ChatCommand* ChatHandler::getCommandTable()
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand guildCommandTable[] =
{
{ "create", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildCreateCommand>, "", NULL },
{ "delete", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildDeleteCommand>, "", NULL },
{ "invite", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildInviteCommand>, "", NULL },
{ "uninvite", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildUninviteCommand>, "", NULL },
{ "rank", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildRankCommand>, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand lookupPlayerCommandTable[] =
{
{ "ip", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleLookupPlayerIpCommand>, "", NULL },
@@ -215,7 +205,6 @@ ChatCommand* ChatHandler::getCommandTable()
{
{ "lookup", SEC_ADMINISTRATOR, true, NULL, "", lookupCommandTable },
{ "pdump", SEC_ADMINISTRATOR, true, NULL, "", pdumpCommandTable },
{ "guild", SEC_ADMINISTRATOR, true, NULL, "", guildCommandTable },
{ "group", SEC_ADMINISTRATOR, false, NULL, "", groupCommandTable },
{ "channel", SEC_ADMINISTRATOR, true, NULL, "", channelCommandTable },
src/server/game/Chat/Chat.h
-6
View File
@@ -157,12 +157,6 @@ class ChatHandler
bool HandleBindSightCommand(const char* args);
bool HandleUnbindSightCommand(const char* args);
bool HandleGuildCreateCommand(const char* args);
bool HandleGuildInviteCommand(const char* args);
bool HandleGuildUninviteCommand(const char* args);
bool HandleGuildRankCommand(const char* args);
bool HandleGuildDeleteCommand(const char* args);
bool HandleLookupAreaCommand(const char* args);
bool HandleLookupCreatureCommand(const char* args);
bool HandleLookupEventCommand(const char* args);
src/server/game/Chat/Commands/Level3.cpp
-139
View File
@@ -1300,145 +1300,6 @@ bool ChatHandler::HandleLookupMapCommand(const char *args)
return true;
}
/** \brief GM command level 3 - Create a guild.
*
* This command allows a GM (level 3) to create a guild.
*
* The "args" parameter contains the name of the guild leader
* and then the name of the guild.
*
*/
bool ChatHandler::HandleGuildCreateCommand(const char *args)
{
if (!*args)
return false;
// if not guild name only (in "") then player name
Player* target;
if (!extractPlayerTarget(*args != '"' ? (char*)args : NULL, &target))
return false;
char* tailStr = *args != '"' ? strtok(NULL, "") : (char*)args;
if (!tailStr)
return false;
char* guildStr = extractQuotedArg(tailStr);
if (!guildStr)
return false;
std::string guildname = guildStr;
if (target->GetGuildId())
{
SendSysMessage(LANG_PLAYER_IN_GUILD);
return true;
}
Guild* guild = new Guild;
if (!guild->Create(target, guildname))
{
delete guild;
SendSysMessage(LANG_GUILD_NOT_CREATED);
SetSentErrorMessage(true);
return false;
}
sGuildMgr->AddGuild(guild);
return true;
}
bool ChatHandler::HandleGuildInviteCommand(const char *args)
{
if (!*args)
return false;
// if not guild name only (in "") then player name
uint64 target_guid;
if (!extractPlayerTarget(*args != '"' ? (char*)args : NULL, NULL, &target_guid))
return false;
char* tailStr = *args != '"' ? strtok(NULL, "") : (char*)args;
if (!tailStr)
return false;
char* guildStr = extractQuotedArg(tailStr);
if (!guildStr)
return false;
std::string glName = guildStr;
Guild* targetGuild = sGuildMgr->GetGuildByName(glName);
if (!targetGuild)
return false;
// player's guild membership checked in AddMember before add
return targetGuild->AddMember(target_guid);
}
bool ChatHandler::HandleGuildUninviteCommand(const char *args)
{
Player* target;
uint64 target_guid;
if (!extractPlayerTarget((char*)args, &target, &target_guid))
return false;
uint32 glId = target ? target->GetGuildId() : Player::GetGuildIdFromDB(target_guid);
if (!glId)
return false;
Guild* targetGuild = sGuildMgr->GetGuildById(glId);
if (!targetGuild)
return false;
targetGuild->DeleteMember(target_guid, false, true);
return true;
}
bool ChatHandler::HandleGuildRankCommand(const char *args)
{
char* nameStr;
char* rankStr;
extractOptFirstArg((char*)args, &nameStr, &rankStr);
if (!rankStr)
return false;
Player* target;
uint64 target_guid;
std::string target_name;
if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name))
return false;
uint32 glId = target ? target->GetGuildId() : Player::GetGuildIdFromDB(target_guid);
if (!glId)
return false;
Guild* targetGuild = sGuildMgr->GetGuildById (glId);
if (!targetGuild)
return false;
uint32 newrank = uint32 (atoi (rankStr));
return targetGuild->ChangeMemberRank(target_guid, newrank);
}
bool ChatHandler::HandleGuildDeleteCommand(const char *args)
{
if (!*args)
return false;
char* guildStr = extractQuotedArg((char*)args);
if (!guildStr)
return false;
std::string gld = guildStr;
Guild* targetGuild = sGuildMgr->GetGuildByName(gld);
if (!targetGuild)
return false;
targetGuild->Disband();
return true;
}
bool ChatHandler::HandleGetDistanceCommand(const char *args)
{
WorldObject* obj = NULL;
src/server/game/Scripting/ScriptLoader.cpp
+2
View File
@@ -52,6 +52,7 @@ void AddSC_event_commandscript();
void AddSC_gm_commandscript();
void AddSC_go_commandscript();
void AddSC_gobject_commandscript();
void AddSC_guild_commandscript();
void AddSC_honor_commandscript();
void AddSC_instance_commandscript();
void AddSC_learn_commandscript();
@@ -660,6 +661,7 @@ void AddCommandScripts()
AddSC_gm_commandscript();
AddSC_go_commandscript();
AddSC_gobject_commandscript();
AddSC_guild_commandscript();
AddSC_honor_commandscript();
AddSC_instance_commandscript();
AddSC_learn_commandscript();