X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fvote.qc;h=44b8acb8e7a8ff5fb9ea7e18688e269b3bd66be9;hp=76f08bdc9f4453f56e471406bc6b2cd92f6ab61c;hb=429e52163f53e75b848135f076b77c4eb43935ac;hpb=77e31eddd2bfdf218d5b2199c12ad43553094cbb diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 76f08bdc9..44b8acb8e 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -1,4 +1,5 @@ -#include +#include "vote.qh" +#include #include "vote.qh" #include "common.qh" @@ -9,11 +10,12 @@ #include "../round_handler.qh" #include "../scores.qh" -#include "../mutators/all.qh" +#include "../mutators/_mod.qh" #include +#include #include -#include +#include #include #include @@ -86,8 +88,7 @@ bool Nagger_SendEntity(entity this, entity to, float sendflags) void Nagger_Init() { - Net_LinkEntity(nagger = new(nagger), false, 0, Nagger_SendEntity); - make_pure(nagger); + Net_LinkEntity(nagger = new_pure(nagger), false, 0, Nagger_SendEntity); } void Nagger_VoteChanged() @@ -128,7 +129,7 @@ void VoteReset() } vote_called = VOTE_NULL; - vote_caller = world; + vote_caller = NULL; vote_caller_name = string_null; vote_endtime = 0; @@ -160,21 +161,21 @@ void VoteAccept() if (vote_caller) vote_caller.vote_waittime = 0; // people like your votes, you don't need to wait to vote again VoteReset(); - Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_VOTE_ACCEPT); + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_ACCEPT); } void VoteReject() { bprint("\{1}^2* ^3", OriginalCallerName(), "^2's vote for ", vote_called_display, "^2 was rejected\n"); VoteReset(); - Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_VOTE_FAIL); + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_FAIL); } void VoteTimeout() { bprint("\{1}^2* ^3", OriginalCallerName(), "^2's vote for ", vote_called_display, "^2 timed out\n"); VoteReset(); - Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_VOTE_FAIL); + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_FAIL); } void VoteSpam(float notvoters, float mincount, string result) @@ -202,9 +203,7 @@ void VoteCount(float first_count) // declarations vote_accept_count = vote_reject_count = vote_abstain_count = 0; - float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) - || ((autocvar_sv_vote_nospectators == 1) && (warmup_stage || gameover)) - || (autocvar_sv_vote_nospectators == 0)); + bool spectators_allowed = (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || gameover))); float vote_player_count = 0, notvoters = 0; float vote_real_player_count = 0, vote_real_accept_count = 0; @@ -215,7 +214,7 @@ void VoteCount(float first_count) Nagger_VoteCountChanged(); // add up all the votes from each connected client - FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA( + FOREACH_CLIENT(IS_REAL_CLIENT(it) && IS_CLIENT(it), LAMBDA( ++vote_player_count; if (IS_PLAYER(it)) ++vote_real_player_count; switch (it.vote_selection) @@ -335,28 +334,32 @@ void VoteThink() // Resets the state of all clients, items, weapons, waypoints, ... of the map. void reset_map(bool dorespawn) { - SELFPARAM(); - - if (time <= game_starttime && round_handler_IsActive()) round_handler_Reset(game_starttime); + if (time <= game_starttime) + { + if (gameover) + return; + if (round_handler_IsActive()) + round_handler_Reset(game_starttime); + } MUTATOR_CALLHOOK(reset_map_global); - FOREACH_ENTITY_ORDERED(IS_NOT_A_CLIENT(it), LAMBDA( + FOREACH_ENTITY_ORDERED(IS_NOT_A_CLIENT(it), { if (it.reset) { - WITH(entity, self, it, it.reset(it)); + it.reset(it); continue; } if (it.team_saved) it.team = it.team_saved; - if (it.flags & FL_PROJECTILE) remove(it); // remove any projectiles left - )); + if (it.flags & FL_PROJECTILE) delete(it); // remove any projectiles left + }); // Waypoints and assault start come LAST - FOREACH_ENTITY_ORDERED(IS_NOT_A_CLIENT(it), LAMBDA( - if (it.reset2) WITH(entity, self, it, it.reset2()); - )); + FOREACH_ENTITY_ORDERED(IS_NOT_A_CLIENT(it), { + if (it.reset2) it.reset2(it); + }); - FOREACH_CLIENT(IS_PLAYER(it) && STAT(FROZEN, it), LAMBDA(WITH(entity, self, it, Unfreeze(it)))); + FOREACH_CLIENT(IS_PLAYER(it) && STAT(FROZEN, it), LAMBDA(Unfreeze(it))); // Moving the player reset code here since the player-reset depends // on spawnpoint entities which have to be reset first --blub @@ -365,7 +368,6 @@ void reset_map(bool dorespawn) if (!MUTATOR_CALLHOOK(reset_map_players)) { FOREACH_CLIENT(true, LAMBDA( - setself(it); /* only reset players if a restart countdown is active this can either be due to cvar sv_ready_restart_after_countdown having set @@ -375,37 +377,37 @@ void reset_map(bool dorespawn) if (restart_mapalreadyrestarted || (time < game_starttime)) { // NEW: changed behaviour so that it prevents that previous spectators/observers suddenly spawn as players - if (IS_PLAYER(self)) + if (IS_PLAYER(it)) { - // PlayerScore_Clear(self); - self.killcount = 0; + // PlayerScore_Clear(it); + it.killcount = 0; // stop the player from moving so that he stands still once he gets respawned - self.velocity = '0 0 0'; - self.avelocity = '0 0 0'; - self.movement = '0 0 0'; - PutClientInServer(); + it.velocity = '0 0 0'; + it.avelocity = '0 0 0'; + it.movement = '0 0 0'; + PutClientInServer(it); } } )); - - setself(this); } } } // Restarts the map after the countdown is over (and cvar sv_ready_restart_after_countdown is set) -void ReadyRestart_think() +void ReadyRestart_think(entity this) { - SELFPARAM(); restart_mapalreadyrestarted = true; reset_map(true); Score_ClearAll(); - remove(this); + delete(this); } // Forces a restart of the game without actually reloading the map // this is a mess... void ReadyRestart_force() { + if (time <= game_starttime && gameover) + return; + bprint("^1Server is restarting...\n"); VoteReset(); @@ -445,9 +447,8 @@ void ReadyRestart_force() // initiate the restart-countdown-announcer entity if (autocvar_sv_ready_restart_after_countdown) { - entity restart_timer = new(restart_timer); - make_pure(restart_timer); - restart_timer.think = ReadyRestart_think; + entity restart_timer = new_pure(restart_timer); + setthink(restart_timer, ReadyRestart_think); restart_timer.nextthink = game_starttime; } @@ -464,7 +465,7 @@ void ReadyRestart_force() void ReadyRestart() { // no assault support yet... - if (g_assault | gameover | intermission_running | race_completing) localcmd("restart\n"); + if (g_assault || gameover || race_completing) localcmd("restart\n"); else localcmd("\nsv_hook_gamerestart\n"); // Reset ALL scores, but only do that at the beginning of the countdown if sv_ready_restart_after_countdown is off! @@ -571,10 +572,15 @@ float VoteCommand_checkargs(float startpos, float argc) { float p, q, check, minargs; string cvarname = strcat("sv_vote_command_restriction_", argv(startpos)); - string cmdrestriction = cvar_string(cvarname); // note: this warns on undefined cvar. We want that. + string cmdrestriction = ""; // No we don't. string charlist, arg; float checkmate; + if(cvar_type(cvarname) & CVAR_TYPEFLAG_EXISTS) + cmdrestriction = cvar_string(cvarname); + else + LOG_INFO("NOTE: ", cvarname, " does not exist, no restrictions will be applied.\n"); + if (cmdrestriction == "") return true; ++startpos; // skip command name @@ -748,9 +754,7 @@ void VoteCommand_call(float request, entity caller, float argc, string vote_comm { case CMD_REQUEST_COMMAND: { - float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) - || ((autocvar_sv_vote_nospectators == 1) && warmup_stage) - || (autocvar_sv_vote_nospectators == 0)); + bool spectators_allowed = (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || gameover))); float tmp_playercount = 0; @@ -807,7 +811,7 @@ void VoteCommand_call(float request, entity caller, float argc, string vote_comm } FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(++tmp_playercount)); - if (tmp_playercount > 1) Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_VOTE_CALL); // don't announce a "vote now" sound if player is alone + if (tmp_playercount > 1) Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_CALL); // don't announce a "vote now" sound if player is alone bprint("\{1}^2* ^3", OriginalCallerName(), "^2 calls a vote for ", vote_called_display, "\n"); if (autocvar_sv_eventlog) GameLogEcho(strcat(":vote:vcall:", ftos(vote_caller.playerid), ":", vote_called_display)); @@ -888,9 +892,7 @@ void VoteCommand_master(float request, entity caller, float argc, string vote_co default: // calling a vote for master { - float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) - || ((autocvar_sv_vote_nospectators == 1) && warmup_stage) - || (autocvar_sv_vote_nospectators == 0)); + bool spectators_allowed = (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || gameover))); if (!autocvar_sv_vote_master_callable) { print_to(caller, "^1Vote to become vote master is not allowed."); } else if (vote_called)