}
vote_called = VOTE_NULL;
+ vote_caller = world;
vote_endtime = 0;
+
vote_called_command = string_null;
vote_called_display = string_null;
else
localcmd(strcat(vote_called_command, "\n"));
- if(vote_caller) { vote_caller.vote_waittime = 0; } // people like your votes, you don't need to wait to vote again // todo separate anti-spam even for succeeded votes
+ if(vote_caller) { vote_caller.vote_waittime = 0; } // people like your votes, you don't need to wait to vote again
VoteReset();
Announce("voteaccept");
return;
}
-// Count the players who are ready and determine whether or not to restart the match // todo: add percentage ready support
+// Count the players who are ready and determine whether or not to restart the match
void ReadyCount()
{
entity tmp_player;
else
output = substring(input, argv_start_index(startpos), argv_end_index(-1) - argv_start_index(startpos));
- print("VoteCommand_parse: '", output, "'. \n");
return output;
}
first_command = argv(startpos);
- if not(VoteCommand_checkinlist(vote_command, vote_list))
+ if not(VoteCommand_checkinlist(first_command, vote_list))
return FALSE;
- if((argc - 1) < startpos) // These commands won't work without arguments
+ if(argc < startpos) // These commands won't work without arguments
{
switch(first_command)
{
case "kick":
case "kickban": // catch all kick/kickban commands
{
- victim = edict_num(GetFilteredNumber(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1))));
+ victim = GetFilteredEntity(argv(startpos + 1));
if not(victim) { return FALSE; }
// TODO: figure out how kick/kickban/ban commands work and re-write this to fit around them
vote_parsed_command = vote_command;
case "chmap":
case "gotomap": // re-direct all map selection commands to gotomap
{
- vote_command = ValidateMap(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1)), caller);
+ vote_command = ValidateMap(argv(startpos + 1), caller);
if not(vote_command) { return FALSE; }
vote_parsed_command = strcat("gotomap ", vote_command);
vote_parsed_display = strzone(strcat("^1", vote_parsed_command));
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote abstain\n");
- print(" No arguments required.\n");
+ print_to(caller, "\nUsage:^3 vote abstain");
+ print_to(caller, " No arguments required.");
return;
}
}
else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_commands, 2, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
- else // everything went okay, continue with calling the vote // TODO: fixes to make this more compatible with sv_cmd
+ else // everything went okay, continue with calling the vote
{
+ vote_caller = caller; // remember who called the vote
vote_called = VOTE_NORMAL;
vote_called_command = strzone(vote_parsed_command);
vote_called_display = strzone(vote_parsed_display);
vote_endtime = time + autocvar_sv_vote_timeout;
- vote_caller = caller; // remember who called the vote
if(caller)
{
caller.vote_selection = VOTE_SELECT_ACCEPT;
caller.vote_waittime = time + autocvar_sv_vote_wait;
- msg_entity = caller; // todo: what is this for?
+ msg_entity = caller;
}
FOR_EACH_REALCLIENT(tmp_player) { ++tmp_playercount; }
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote call\n");
- print(" TODO.\n");
+ print_to(caller, "\nUsage:^3 vote call command");
+ print_to(caller, " Where 'command' is the command to request a vote upon.");
+ print_to(caller, "Examples: call gotomap dance");
+ print_to(caller, " call endmatch");
return;
}
}
else // everything went okay, continue with creating vote
{
+ vote_caller = caller;
vote_called = VOTE_MASTER;
vote_called_command = strzone("XXX");
vote_called_display = strzone("^3master");
vote_endtime = time + autocvar_sv_vote_timeout;
- vote_caller = caller;
caller.vote_selection = VOTE_SELECT_ACCEPT;
caller.vote_waittime = time + autocvar_sv_vote_wait;
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote master action [arguments]\n");
- print(" TODO.\n");
+ print_to(caller, "\nUsage:^3 vote master [action [command | password]]");
+ print_to(caller, " If action is left blank, it calls a vote for you to become master.");
+ print_to(caller, " Otherwise the actions are either 'do' a command or 'login' as master.");
return;
}
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote no\n");
- print(" No arguments required.\n");
+ print_to(caller, "\nUsage:^3 vote no");
+ print_to(caller, " No arguments required.");
return;
}
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote status\n");
- print(" No arguments required.\n");
+ print_to(caller, "\nUsage:^3 vote status");
+ print_to(caller, " No arguments required.");
return;
}
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote stop\n");
- print(" No arguments required.\n");
+ print_to(caller, "\nUsage:^3 vote stop");
+ print_to(caller, " No arguments required.");
return;
}
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote yes\n");
- print(" No arguments required.\n");
+ print_to(caller, "\nUsage:^3 vote yes");
+ print_to(caller, " No arguments required.");
return;
}
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 vote \n");
- print(" No arguments required.\n");
+ print_to(caller, "\nUsage:^3 vote ");
+ print_to(caller, " No arguments required.");
return;
}
}
if(argc == 2) // help display listing all commands
{
- print("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are:\n");
+ print_to(caller, strcat("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are:"));
#define VOTE_COMMAND(name,function,description,assignment) \
- { if(Votecommand_check_assignment(caller, assignment)) { print(" ^2", name, "^7: ", description, "\n"); } }
+ { if(Votecommand_check_assignment(caller, assignment)) { print_to(caller, strcat(" ^2", name, "^7: ", description)); } }
VOTE_COMMANDS(0, caller, 0, "")
#undef VOTE_COMMAND
- print("For help about specific commands, type ", command_origin, " vote help COMMAND\n");
+ print_to(caller, strcat("For help about specific commands, type ", command_origin, " vote help COMMAND"));
+ print_to(caller, "^7You can call a vote for or execute these commands:");
+ print_to(caller, strcat("^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
}
else // usage for individual command
{
}
default:
- print_to(caller, strcat("Unknown vote command", ((argv(1) != "") ? strcat(" \"", argv(1), "\"") : ""), ". For a list of supported commands, try ", GetCommandPrefix(caller), " help.\n"));
+ print_to(caller, strcat(((argv(1) != "") ? strcat("Unknown vote command \"", argv(1), "\"") : "No command provided"), ". For a list of supported commands, try ", GetCommandPrefix(caller), " vote help.\n"));
case CMD_REQUEST_USAGE:
{
VoteCommand_macro_help(caller, argc);
return;
}
}
-}
-
-// =======================
-// Game logic for voting
-// =======================
-
-void VoteHelp(entity e) {
- string vmasterdis;
- if(!autocvar_sv_vote_master) {
- vmasterdis = " ^1(disabled)";
- }
-
- string vlogindis;
- if("" == autocvar_sv_vote_master_password) {
- vlogindis = " ^1(disabled)";
- }
-
- string vcalldis;
- if(!autocvar_sv_vote_call) {
- vcalldis = " ^1(disabled)";
- }
-
- print_to(e, "^7You can use voting with \"^2cmd vote help^7\" \"^2cmd vote status^7\" \"^2cmd vote call ^3COMMAND ARGUMENTS^7\" \"^2cmd vote stop^7\" \"^2cmd vote master^7\" \"^2cmd vote login^7\" \"^2cmd vote do ^3COMMAND ARGUMENTS^7\" \"^2cmd vote yes^7\" \"^2cmd vote no^7\" \"^2cmd vote abstain^7\" \"^2cmd vote dontcare^7\".");
- print_to(e, "^7Or if your version is up to date you can use these aliases \"^2vhelp^7\" \"^2vstatus^7\" \"^2vcall ^3COMMAND ARGUMENTS^7\" \"^2vstop^7\" \"^2vmaster^7\" \"^2vlogin^7\" \"^2vdo ^3COMMAND ARGUMENTS^7\" \"^2vyes^7\" \"^2vno^7\" \"^2abstain^7\" \"^2vdontcare^7\".");
- print_to(e, "^7\"^2help^7\" shows this info.");
- print_to(e, "^7\"^2status^7\" shows if there is a vote called and who called it.");
- print_to(e, strcat("^7\"^2call^7\" is used to call a vote. See the list of allowed commands.", vcalldis, "^7"));
- print_to(e, "^7\"^2stop^7\" can be used by the vote caller or an admin to stop a vote and maybe correct it.");
- print_to(e, strcat("^7\"^2master^7\" call a vote to become master who can execute commands without a vote", vmasterdis, "^7"));
- print_to(e, strcat("^7\"^2login^7\" login to become master who can execute commands without a vote.", vlogindis, "^7"));
- print_to(e, "^7\"^2do^7\" executes a command if you are a master. See the list of allowed commands.");
- print_to(e, "^7\"^2yes^7\", \"^2no^7\", \"^2abstain^7\" and \"^2dontcare^7\" to make your vote.");
- print_to(e, "^7If enough of the players vote yes the vote is accepted.");
- print_to(e, "^7If enough of the players vote no the vote is rejected.");
- print_to(e, strcat("^7If neither the vote will timeout after ", ftos(autocvar_sv_vote_timeout), "^7 seconds."));
- print_to(e, "^7You can call a vote for or execute these commands:");
- print_to(e, strcat("^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
}
\ No newline at end of file
projects / xonotic / xonotic-data.pk3dir.git / blobdiff