// =============================================
// Server side voting code, reworked by Samual
-// Last updated: December 14th, 2011
+// Last updated: December 27th, 2011
// =============================================
// Nagger for players to know status of voting
}
// after a restart every players number of allowed timeouts gets reset, too
- if(autocvar_sv_timeout) { FOR_EACH_REALPLAYER(tmp_player) { tmp_player.allowedTimeouts = autocvar_sv_timeout_number; } }
+ if(autocvar_sv_timeout) { FOR_EACH_REALPLAYER(tmp_player) { tmp_player.allowed_timeouts = autocvar_sv_timeout_number; } }
//reset map immediately if this cvar is not set
if not(autocvar_sv_ready_restart_after_countdown) { reset_map(TRUE); }
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_to(caller, "\nUsage:^3 vote abstain");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote abstain"));
print_to(caller, " No arguments required.");
return;
}
if not(autocvar_sv_vote_call || !caller) { print_to(caller, "^1Vote calling is not allowed."); }
else if(vote_called) { print_to(caller, "^1There is already a vote called."); }
else if(!spectators_allowed && (caller && (caller.classname != "player"))) { print_to(caller, "^1Only players can call a vote."); }
- else if(timeoutStatus) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
+ else if(timeout_status) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
else if(caller && (time < caller.vote_waittime)) { print_to(caller, strcat("^1You have to wait ^2", ftos(ceil(caller.vote_waittime - time)), "^1 seconds before you can again call a vote.")); }
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."); }
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote call command");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " 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");
+ print_to(caller, strcat("Examples: ", GetCommandPrefix(caller), " vote call gotomap dance"));
+ print_to(caller, strcat(" ", GetCommandPrefix(caller), " vote call endmatch"));
return;
}
}
{
if not(autocvar_sv_vote_master_callable) { print_to(caller, "^1Vote to become vote master is not allowed."); }
else if(vote_called) { print_to(caller, "^1There is already a vote called."); }
+ else if(timeout_status) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
else // everything went okay, continue with creating vote
{
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote master [action [command | password]]");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " 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;
{
if not(vote_called) { print_to(caller, "^1No vote called."); }
else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+ else if(((caller == vote_caller) || caller.vote_master) && autocvar_sv_vote_no_stops_vote) { VoteStop(caller); }
else // everything went okay, continue changing vote
{
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote no");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote no"));
print_to(caller, " No arguments required.");
return;
}
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote status");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote status"));
print_to(caller, " No arguments required.");
return;
}
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote stop");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote stop"));
print_to(caller, " No arguments required.");
return;
}
case CMD_REQUEST_COMMAND:
{
if not(vote_called) { print_to(caller, "^1No vote called."); }
- if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+ else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
else // everything went okay, continue changing vote
{
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote yes");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote yes"));
print_to(caller, " No arguments required.");
return;
}
}
}
-/* use this when creating a new command, making sure to place it in alphabetical order.
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
void VoteCommand_(float request)
{
switch(request)
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote ");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote ");
print_to(caller, " No arguments required.");
return;
}
VOTE_COMMAND("abstain", VoteCommand_abstain(request, caller), "Abstain your vote in current vote", VC_ASGNMNT_CLIENTONLY) \
VOTE_COMMAND("call", VoteCommand_call(request, caller, arguments, command), "Create a new vote for players to decide on", VC_ASGNMNT_BOTH) \
VOTE_COMMAND("help", VoteCommand_macro_help(caller, arguments), "Shows this information", VC_ASGNMNT_BOTH) \
- VOTE_COMMAND("master", VoteCommand_master(request, caller, arguments, command), "", VC_ASGNMNT_CLIENTONLY) \
+ VOTE_COMMAND("master", VoteCommand_master(request, caller, arguments, command), "TODO", VC_ASGNMNT_CLIENTONLY) \
VOTE_COMMAND("no", VoteCommand_no(request, caller), "Select no in current vote", VC_ASGNMNT_CLIENTONLY) \
VOTE_COMMAND("status", VoteCommand_status(request, caller), "Prints information about current vote", VC_ASGNMNT_BOTH) \
VOTE_COMMAND("stop", VoteCommand_stop(request, caller), "Immediately end a vote", VC_ASGNMNT_BOTH) \