Skip to content

Gm command face me (#231) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ide1234000 merged 1 commit into from
Feb 6, 2019
Merged

Gm command face me (#231) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/game/Chat/Chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ ChatCommand * ChatHandler::getCommandTable()
{ NODE, "", SEC_GAMEMASTER, true, &ChatHandler::HandleGMTicketGetByIdOrNameCommand, "", nullptr },
{ MSTR, nullptr, 0, false,nullptr, "", nullptr }
};

static ChatCommand serviceCommandTable[] =
{
{ NODE, "del_characters", SEC_ADMINISTRATOR, true, &ChatHandler::HandleServiceDeleteCharacters, "", nullptr },
Expand Down Expand Up @@ -1055,6 +1055,7 @@ ChatCommand * ChatHandler::getCommandTable()
{ NODE, "commands", SEC_PLAYER, true, &ChatHandler::HandleCommandsCommand, "", nullptr },
{ NODE, "demorph", SEC_GAMEMASTER, false, &ChatHandler::HandleDeMorphCommand, "", nullptr },
{ NODE, "die", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDieCommand, "", nullptr },
{ NODE, "faceme", SEC_MODERATOR, false, &ChatHandler::HandleFacemeCommand, "", nullptr },
{ NODE, "fear", SEC_GAMEMASTER, false, &ChatHandler::HandleFearCommand, "", nullptr },
{ NODE, "revive", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReviveCommand, "", nullptr },
{ NODE, "dismount", SEC_PLAYER, false, &ChatHandler::HandleDismountCommand, "", nullptr },
Expand Down
3 changes: 2 additions & 1 deletion src/game/Chat/Chat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ class MANGOS_DLL_SPEC ChatHandler
bool HandleDebugPlaySoundCommand(char* args);
bool HandleDebugPlayScriptText(char* args);
bool HandleDebugPlayMusicCommand(char* args);

bool HandleDebugSendBuyErrorCommand(char* args);
bool HandleDebugSendChannelNotifyCommand(char* args);
bool HandleDebugSendChatMsgCommand(char* args);
Expand Down Expand Up @@ -809,6 +809,7 @@ class MANGOS_DLL_SPEC ChatHandler
bool HandleGetAngleCommand(char* args);
bool HandleModifyStandStateCommand(char* args);
bool HandleDieCommand(char* args);
bool HandleFacemeCommand(char* args);
bool HandleFearCommand(char* args);
bool HandleDamageCommand(char* args);
bool HandleReviveCommand(char* args);
Expand Down
24 changes: 22 additions & 2 deletions src/game/Commands/Level3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args)
}

auto it = skills.find(args);

if (it == skills.end())
{
std::stringstream options;
Expand Down Expand Up @@ -2434,7 +2434,7 @@ bool ChatHandler::HandleDeleteItemCommand(char* args)
SetSentErrorMessage(true);
return false;
}

if (!CharacterDatabase.DirectPExecute("DELETE FROM character_inventory WHERE item = %u", guid))
{
SendSysMessage("Encountered an error while attempting to remove item from inventory");
Expand Down Expand Up @@ -3906,6 +3906,26 @@ bool ChatHandler::HandleGetAngleCommand(char* args)
return true;
}

bool ChatHandler::HandleFacemeCommand(char* /*args*/)
{
Unit* target = getSelectedUnit();
if (!target || !m_session->GetPlayer()->GetSelectionGuid())
{
SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
SetSentErrorMessage(true);
return false;
}

if (target->GetTypeId() == TYPEID_PLAYER)
{
target->InterruptNonMeleeSpells(true);
target->SetFacingToObject(m_session->GetPlayer());
PSendSysMessage("%s is facing you.", GetNameLink((Player*) target).c_str());
}

return true;
}

bool ChatHandler::HandleDieCommand(char* /*args*/)
{
Unit* target = getSelectedUnit();
Expand Down