GetKickVoteVictim_newcommand = strcat(argv(0), " # ", ftos(num_for_edict(e)));
if(argv(0) == "kickban")
{
- GetKickVoteVictim_newcommand = strcat(GetKickVoteVictim_newcommand, " ", cvar_string("g_ban_default_bantime"), " ", cvar_string("g_ban_default_masksize"), " ", reason);
+ GetKickVoteVictim_newcommand = strcat(GetKickVoteVictim_newcommand, " ", ftos(cvar("g_ban_default_bantime")), " ", ftos(cvar("g_ban_default_masksize")), " ", reason);
}
else if(argv(0) == "kick")
{
}
float GameCommand_Vote(string s, entity e) {
+ local float playercount;
float argc;
argc = tokenize_console(s);
if(argv(0) == "help") {
if(vote == "") {
print_to(e, "^1Your vote is empty. See 'vhelp' for more info.");
} else if(e
- && time < e.vote_next) {
- print_to(e, strcat("^1You have to wait ^2", ftos(ceil(e.vote_next - time)), "^1 seconds before you can again call a vote."));
+ && time < e.vote_next) {
+ print_to(e, strcat("^1You have to wait ^2", ftos(ceil(e.vote_next - time)), "^1 seconds before you can again call a vote."));
} else if(VoteCheckNasty(vote)) {
print_to(e, "Syntax error in command. See 'vhelp' for more info.");
} else if(RemapVote(vote, "vcall", e)) {
Nagger_VoteChanged();
msg_entity = e;
VoteDialog_UpdateHighlight(1);
+
+ local entity player;
+ FOR_EACH_REALCLIENT(player)
+ {
+ ++playercount;
+ }
+ if(playercount > 1) // don't announce a "vote now" sound if player is alone
+ Announce("votecall");
} else {
print_to(e, "^1This vote is not ok. See 'vhelp' for more info.");
}
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 ", cvar_string("sv_vote_timeout"), "^7 seconds."));
+ print_to(e, strcat("^7If neither the vote will timeout after ", ftos(cvar("sv_vote_timeout")), "^7 seconds."));
print_to(e, "^7You can call a vote for or execute these commands:");
print_to(e, strcat("^3", cvar_string("sv_vote_commands"), "^7 and maybe further ^3arguments^7"));
}
// no wait for next vote
}
VoteReset();
+ Announce("voteaccept");
}
void VoteReject() {
bprint("\{1}^2* ^3", VoteNetname(votecaller), "^2's vote for ", votecalledvote_display, "^2 was rejected\n");
VoteReset();
+ Announce("votefail");
}
void VoteTimeout() {
bprint("\{1}^2* ^3", VoteNetname(votecaller), "^2's vote for ", votecalledvote_display, "^2 timed out\n");
VoteReset();
+ Announce("votefail");
}
void VoteStop(entity stopper) {