- moved more translation phrases around

- converted more code to ProcessTargetString()

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401631
This commit is contained in:
David Anderson
2007-10-22 00:49:44 +00:00
parent 53156446d4
commit ef6da943d6
18 changed files with 148 additions and 112 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ DisplayVoteAllTalkMenu(client)
}
LogAction(client, -1, "\"%L\" initiated an alltalk vote.", client);
ShowActivity(client, "%t", "Initiated Vote Alltalk");
ShowActivity2(client, "[SM] ", "%t", "Initiated Vote Alltalk");
g_voteType = voteType:alltalk;
g_voteInfo[VOTE_NAME][0] = '\0';
+16 -5
View File
@@ -1,4 +1,4 @@
DisplayVoteBurnMenu(client,target,String:name[])
DisplayVoteBurnMenu(client, target, String:name[])
{
if (!IsPlayerAlive(target))
{
@@ -10,7 +10,7 @@ DisplayVoteBurnMenu(client,target,String:name[])
GetClientName(target, g_voteInfo[VOTE_NAME], sizeof(g_voteInfo[]));
LogAction(client, target, "\"%L\" initiated a burn vote against \"%L\"", client, target);
ShowActivity(client, "%t", "Initiated Vote Burn", g_voteInfo[VOTE_NAME]);
ShowActivity2(client, "[SM] ", "%t", "Initiated Vote Burn", g_voteInfo[VOTE_NAME]);
g_voteType = voteType:burn;
@@ -122,13 +122,24 @@ public Action:Command_VoteBurn(client, args)
BreakString(text, arg, sizeof(arg));
new target = FindTarget(client, arg);
if (target == -1)
decl String:target_name[MAX_TARGET_LENGTH];
decl target_list[MAXPLAYERS], target_count, bool:tn_is_ml;
if ((target_count = ProcessTargetString(
arg,
client,
target_list,
MAXPLAYERS,
COMMAND_FILTER_NO_MULTI,
target_name,
sizeof(target_name),
tn_is_ml)) <= 0)
{
ReplyToTargetError(client, target_count);
return Plugin_Handled;
}
DisplayVoteBurnMenu(client, target, arg);
DisplayVoteBurnMenu(client, target_list[0], arg);
return Plugin_Handled;
}
+1 -1
View File
@@ -12,7 +12,7 @@ DisplayVoteFFMenu(client)
}
LogAction(client, -1, "\"%L\" initiated a friendly fire vote.", client);
ShowActivity(client, "%t", "Initiated Vote FF");
ShowActivity2(client, "[SM] ", "%t", "Initiated Vote FF");
g_voteType = voteType:ff;
g_voteInfo[VOTE_NAME][0] = '\0';
+1 -1
View File
@@ -2,7 +2,7 @@
DisplayVoteGravityMenu(client,count,String:items[5][])
{
LogAction(client, -1, "\"%L\" initiated a gravity vote.", client);
ShowActivity(client, "%t", "Initiated Vote Gravity");
ShowActivity2(client, "[SM] ", "%t", "Initiated Vote Gravity");
g_voteType = voteType:gravity;
+17 -6
View File
@@ -1,5 +1,5 @@
DisplayVoteSlayMenu(client,target,String:name[])
DisplayVoteSlayMenu(client, target, String:name[])
{
if (!IsPlayerAlive(target))
{
@@ -11,7 +11,7 @@ DisplayVoteSlayMenu(client,target,String:name[])
GetClientName(target, g_voteInfo[VOTE_NAME], sizeof(g_voteInfo[]));
LogAction(client, target, "\"%L\" initiated a slay vote against \"%L\"", client, target);
ShowActivity(client, "%t", "Initiated Vote Slay", g_voteInfo[VOTE_NAME]);
ShowActivity2(client, "[SM] ", "%t", "Initiated Vote Slay", g_voteInfo[VOTE_NAME]);
g_voteType = voteType:slay;
@@ -123,13 +123,24 @@ public Action:Command_VoteSlay(client, args)
BreakString(text, arg, sizeof(arg));
new target = FindTarget(client, arg);
if (target == -1)
decl String:target_name[MAX_TARGET_LENGTH];
decl target_list[MAXPLAYERS], target_count, bool:tn_is_ml;
if ((target_count = ProcessTargetString(
arg,
client,
target_list,
MAXPLAYERS,
COMMAND_FILTER_NO_MULTI,
target_name,
sizeof(target_name),
tn_is_ml)) <= 0)
{
ReplyToTargetError(client, target_count);
return Plugin_Handled;
}
DisplayVoteSlayMenu(client, target, arg);
DisplayVoteSlayMenu(client, target_list[0], arg);
return Plugin_Handled;
}
}