mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 00:46:46 +00:00
[Commands] Cleanup #npcsay and #npcshout Commands. (#2107)
* [Commands] Cleanup #npcsay and #npcshout Commands. - Cleanup messages and logic. * Update npcsay.cpp * Update npcshout.cpp
This commit is contained in:
@@ -2,11 +2,18 @@
|
||||
|
||||
void command_npcsay(Client *c, const Seperator *sep)
|
||||
{
|
||||
if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->arg[1][0]) {
|
||||
c->GetTarget()->Say(sep->argplus[1]);
|
||||
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
|
||||
c->Message(Chat::White, "You must target an NPC to use this command.");
|
||||
return;
|
||||
}
|
||||
else {
|
||||
c->Message(Chat::White, "Usage: #npcsay message (requires NPC target");
|
||||
|
||||
int arguments = sep->argnum;
|
||||
if (!arguments) {
|
||||
c->Message(Chat::White, "Usage: #npcsay [Message]");
|
||||
return;
|
||||
}
|
||||
|
||||
std::string message = sep->argplus[1];
|
||||
c->GetTarget()->Say(message.c_str());
|
||||
}
|
||||
|
||||
|
||||
@@ -2,11 +2,18 @@
|
||||
|
||||
void command_npcshout(Client *c, const Seperator *sep)
|
||||
{
|
||||
if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->arg[1][0]) {
|
||||
c->GetTarget()->Shout(sep->argplus[1]);
|
||||
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
|
||||
c->Message(Chat::White, "You must target an NPC to use this command.");
|
||||
return;
|
||||
}
|
||||
else {
|
||||
c->Message(Chat::White, "Usage: #npcshout message (requires NPC target");
|
||||
|
||||
int arguments = sep->argnum;
|
||||
if (!arguments) {
|
||||
c->Message(Chat::White, "Usage: #npcshout [Message]");
|
||||
return;
|
||||
}
|
||||
|
||||
std::string message = sep->argplus[1];
|
||||
c->GetTarget()->Shout(message.c_str());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user