From: Samual Date: Wed, 4 Jan 2012 17:10:08 +0000 (-0500) Subject: Final preparations/cleanup/fixes before merge X-Git-Tag: xonotic-v0.6.0~188^2~28^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c34b479cc49b1145be55f7a4906979535125fd81;p=xonotic%2Fxonotic-data.pk3dir.git Final preparations/cleanup/fixes before merge --- diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 06262e109..5a7eb03ff 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -142,7 +142,7 @@ void ClientCommand_mv_getpicture(float request, float argc) // internal command, } } -void ClientCommand_join(float request) // legacy +void ClientCommand_join(float request) { switch(request) { @@ -418,7 +418,7 @@ void ClientCommand_sentcvar(float request, float argc, string command) } } -void ClientCommand_spectate(float request) // legacy +void ClientCommand_spectate(float request) { switch(request) { @@ -530,7 +530,7 @@ void ClientCommand_tell(float request, float argc, string command) } } -void ClientCommand_voice(float request, float argc, string command) // legacy +void ClientCommand_voice(float request, float argc, string command) { switch(request) { @@ -682,7 +682,7 @@ void SV_ParseClientCommand(string command) if(SV_ParseClientCommand_floodcheck()) break; // "TRUE": continue, as we're not flooding yet else - return print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); // "FALSE": not allowed to continue, halt TODO + return; // "FALSE": not allowed to continue, halt // print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); } /* NOTE: should this be disabled? It can be spammy perhaps, but hopefully it's okay for now */ diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 842bb5aa8..3b71e3d70 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -298,7 +298,7 @@ void CommonCommand_cvar_purechanges(float request, entity caller) } } -void CommonCommand_info(float request, entity caller, float argc) // legacy +void CommonCommand_info(float request, entity caller, float argc) { switch(request) { diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 0fa566760..98d877c43 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -222,7 +222,7 @@ void GameCommand_anticheat(float request, float argc) } } -void GameCommand_bbox(float request) // legacy +void GameCommand_bbox(float request) { switch(request) { @@ -315,7 +315,7 @@ void GameCommand_bbox(float request) // legacy } } -void GameCommand_bot_cmd(float request, float argc) // mostly legacy +void GameCommand_bot_cmd(float request, float argc) { switch(request) { @@ -441,7 +441,7 @@ void GameCommand_cointoss(float request, float argc) } } -void GameCommand_database(float request, float argc) // legacy +void GameCommand_database(float request, float argc) { switch(request) { @@ -552,7 +552,7 @@ void GameCommand_defer_clear_all(float request) } } -void GameCommand_delrec(float request, float argc) // legacy // perhaps merge later with records and printstats and such? +void GameCommand_delrec(float request, float argc) // perhaps merge later with records and printstats and such? { switch(request) { @@ -581,7 +581,7 @@ void GameCommand_delrec(float request, float argc) // legacy // perhaps merge la } } -void GameCommand_effectindexdump(float request) // legacy +void GameCommand_effectindexdump(float request) { switch(request) { @@ -659,7 +659,7 @@ void GameCommand_effectindexdump(float request) // legacy } } -void GameCommand_extendmatchtime(float request) // legacy +void GameCommand_extendmatchtime(float request) { switch(request) { @@ -680,7 +680,7 @@ void GameCommand_extendmatchtime(float request) // legacy } } -void GameCommand_find(float request, float argc) // legacy // is this even needed? We have prvm_edicts command and such ANYWAY +void GameCommand_find(float request, float argc) // is this even needed? We have prvm_edicts command and such ANYWAY { switch(request) { @@ -705,7 +705,7 @@ void GameCommand_find(float request, float argc) // legacy // is this even neede } } -void GameCommand_gametype(float request, float argc) // legacy +void GameCommand_gametype(float request, float argc) { switch(request) { @@ -748,7 +748,7 @@ void GameCommand_gametype(float request, float argc) // legacy } } -void GameCommand_gettaginfo(float request, float argc) // legacy +void GameCommand_gettaginfo(float request, float argc) { switch(request) { @@ -808,7 +808,7 @@ void GameCommand_gettaginfo(float request, float argc) // legacy } } -void GameCommand_gotomap(float request, float argc) // mostly legacy +void GameCommand_gotomap(float request, float argc) { switch(request) { @@ -862,7 +862,7 @@ void GameCommand_lockteams(float request) } } -void GameCommand_make_mapinfo(float request) // legacy +void GameCommand_make_mapinfo(float request) { switch(request) { @@ -1027,7 +1027,7 @@ void GameCommand_moveplayer(float request, float argc) } } -void GameCommand_nospectators(float request) // legacy +void GameCommand_nospectators(float request) { switch(request) { @@ -1057,7 +1057,7 @@ void GameCommand_nospectators(float request) // legacy } } -void GameCommand_playerdemo(float request, float argc) // mostly legacy +void GameCommand_playerdemo(float request, float argc) { switch(request) { @@ -1138,7 +1138,7 @@ void GameCommand_playerdemo(float request, float argc) // mostly legacy } } -void GameCommand_printstats(float request) // legacy +void GameCommand_printstats(float request) { switch(request) { @@ -1182,7 +1182,7 @@ void GameCommand_radarmap(float request, float argc) } } -void GameCommand_reducematchtime(float request) // legacy +void GameCommand_reducematchtime(float request) { switch(request) { @@ -1387,7 +1387,6 @@ void GameCommand_trace(float request, float argc) { case CMD_REQUEST_COMMAND: { - // This is kinda a mess, a lot of it is legacy and thus not rewritten/optimized. entity e; vector org, delta, start, end, p, q, q0, pos, vv, dv; float i, f, safe, unsafe, dq, dqf; @@ -1588,7 +1587,7 @@ void GameCommand_unlockteams(float request) } } -void GameCommand_warp(float request, float argc) // mostly legacy +void GameCommand_warp(float request, float argc) { switch (request) { diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 277720369..f3e846110 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -923,7 +923,7 @@ void VoteCommand_macro_help(entity caller, float argc) if(argc == 2) // help display listing all commands { - print("\nVoting commands:\n"); + print_to(caller, "\nVoting commands:\n"); #define VOTE_COMMAND(name,function,description,assignment) \ { if(Votecommand_check_assignment(caller, assignment)) { print_to(caller, strcat(" ^2", name, "^7: ", description)); } }