UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now uses new FindTarget stock

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401184
This commit is contained in:
Michael McKoy 2007-07-26 23:42:13 +00:00
parent 9ddf5504ff
commit 6b3a0c6a95
1 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
plugins/basechat.sp
View File

@ -131,39 +131,29 @@ public Action:Command_SayChat(client, args)
} }
else if (msgStart == 2 && (CheckAdminForChat(client) || GetConVarBool(g_Cvar_Psaymode))) // sm_psay alias else if (msgStart == 2 && (CheckAdminForChat(client) || GetConVarBool(g_Cvar_Psaymode))) // sm_psay alias
{ {
decl String:target[64]; decl String:arg[64];
new len = BreakString(message, target, sizeof(target)); new len = BreakString(message, arg, sizeof(target));
new target = FindTarget(client, arg, true, false);
new clients[2]; if (target == -1)
new numClients = SearchForClients(target, clients, 2);
if (numClients == 0)
{
PrintToChat(client, "[SM] %t", "No matching client");
return Plugin_Handled; return Plugin_Handled;
}
else if (numClients > 1)
{
PrintToChat(client, "[SM] %t", "More than one client matches", target);
return Plugin_Handled;
}
decl String:name2[64]; decl String:name2[64];
GetClientName(clients[0], name2, sizeof(name2)); GetClientName(target, name2, sizeof(name2));
if (g_DoColor) if (g_DoColor)
{ {
PrintToChat(client, "\x04(Private to %s) %s: \x01%s", name2, name, message[len]); PrintToChat(client, "\x04(Private to %s) %s: \x01%s", name2, name, message[len]);
PrintToChat(clients[0], "\x04(Private to %s) %s: \x01%s", name2, name, message[len]); PrintToChat(target, "\x04(Private to %s) %s: \x01%s", name2, name, message[len]);
} }
else else
{ {
PrintToChat(client, "(Private to %s) %s: %s", name2, name, message[len]); PrintToChat(client, "(Private to %s) %s: %s", name2, name, message[len]);
PrintToChat(clients[0], "(Private to %s) %s: %s", name2, name, message[len]); PrintToChat(target, "(Private to %s) %s: %s", name2, name, message[len]);
} }
LogMessage("%L triggered sm_psay to %L (text %s)", client, clients[0], message); LogMessage("%L triggered sm_psay to %L (text %s)", client, target, message);
} }
else else
return Plugin_Continue; return Plugin_Continue;
@ -287,7 +277,7 @@ public Action:Command_SmTsay(client, args)
new color = FindColor(colorStr); new color = FindColor(colorStr);
if (color == -1) if (color == -1)
SendDialogToAll(_, "%s: %s", name, text); SendDialogToAll(_, "%s: %s", name, text);
else else
SendDialogToAll(color, "%s: %s", name, text[len]); SendDialogToAll(color, "%s: %s", name, text[len]);
@ -324,49 +314,33 @@ public Action:Command_SmPsay(client, args)
return Plugin_Handled; return Plugin_Handled;
} }
decl String:text[192]; decl String:text[192], String:arg[64], String:message[192];
GetCmdArgString(text, sizeof(text)); GetCmdArgString(text, sizeof(text));
decl String:target[64], String:message[192];
new len = BreakString(text, target, sizeof(target)); new len = BreakString(text, arg, sizeof(arg));
BreakString(text[len], message, sizeof(message)); BreakString(text[len], message, sizeof(message));
new clients[2]; new target = FindTarget(client, arg, true, false);
new numClients = SearchForClients(target, clients, 2);
if (target == -1)
if (numClients == 0) return Plugin_Handled;
{
ReplyToCommand(client, "[SM] %t", "No matching client");
return Plugin_Handled;
}
else if (numClients > 1)
{
ReplyToCommand(client, "[SM] %t", "More than one client matches", target);
return Plugin_Handled;
}
else if (!CanUserTarget(client, clients[0]))
{
ReplyToCommand(client, "[SM] %t", "Unable to target");
return Plugin_Handled;
}
decl String:name[64], String:name2[64]; decl String:name[64], String:name2[64];
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
GetClientName(clients[0], name2, sizeof(name2)); GetClientName(target, name2, sizeof(name2));
if (g_DoColor) if (g_DoColor)
{ {
PrintToChat(client, "\x04(Private: %s) %s: \x01%s", name2, name, message); PrintToChat(client, "\x04(Private: %s) %s: \x01%s", name2, name, message);
PrintToChat(clients[0], "\x04(Private: %s) %s: \x01%s", name2, name, message); PrintToChat(target, "\x04(Private: %s) %s: \x01%s", name2, name, message);
} }
else else
{ {
PrintToChat(client, "(Private: %s) %s: %s", name2, name, message); PrintToChat(client, "(Private: %s) %s: %s", name2, name, message);
PrintToChat(clients[0], "(Private: %s) %s: %s", name2, name, message); PrintToChat(target, "(Private: %s) %s: %s", name2, name, message);
} }
LogMessage("%L triggered sm_psay to %L (text %s)", client, clients[0], message); LogMessage("%L triggered sm_psay to %L (text %s)", client, target, message);
return Plugin_Handled; return Plugin_Handled;
} }