From d70d05a71f275ed041483974576e490fa1725c3b Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 13 Dec 2011 05:08:52 -0500 Subject: [PATCH] Change all requests in server/ to use CMD_REQUEST_* with the common declaration --- qcsrc/server/command/cmd.qc | 132 +++++++++++++------------ qcsrc/server/command/cmd.qh | 3 - qcsrc/server/command/sv_cmd.qc | 172 +++++++++++++++++---------------- qcsrc/server/command/sv_cmd.qh | 3 - qcsrc/server/command/vote.qc | 42 ++++---- qcsrc/server/command/vote.qh | 3 - qcsrc/server/progs.src | 3 - 7 files changed, 174 insertions(+), 184 deletions(-) diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 15c03f5d2..ee34b0578 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,13 +1,11 @@ // ========================================================= // Server side networked commands code, reworked by Samual -// Last updated: December 11th, 2011 +// Last updated: December 13th, 2011 // ========================================================= -// move any necessary sprint statements to "print_to" +// declarations in cmd.qh -// ============================ -// Misc. Supporting Functions -// ============================ +// move any necessary sprint statements to "print_to" float SV_ParseClientCommand_floodcheck() { @@ -36,7 +34,7 @@ void ClientCommand_autoswitch(float request, float argc) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { self.autoswitch = ("0" != argv(1)); sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n")); @@ -44,7 +42,7 @@ void ClientCommand_autoswitch(float request, float argc) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd autoswitch selection\n"); sprint(self, " Where 'selection' is 1 or 0 for on or off.\n"); @@ -57,7 +55,7 @@ void ClientCommand_checkfail(float request, string command) // used only by clie { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)))); self.checkfail = 1; @@ -65,7 +63,7 @@ void ClientCommand_checkfail(float request, string command) // used only by clie } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd checkfail message\n"); sprint(self, " Where 'message' is the message reported by client about the fail.\n"); @@ -78,7 +76,7 @@ void ClientCommand_clientversion(float request, float argc) // used only by clie { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(self.flags & FL_CLIENT) { @@ -103,7 +101,7 @@ void ClientCommand_clientversion(float request, float argc) // used only by clie } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd clientversion version\n"); sprint(self, " Where 'version' is the game version reported by self.\n"); @@ -116,14 +114,14 @@ void ClientCommand_cvar_changes(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, cvar_changes); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n"); sprint(self, " No arguments required.\n"); @@ -137,14 +135,14 @@ void ClientCommand_cvar_purechanges(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, cvar_purechanges); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n"); sprint(self, " No arguments required.\n"); @@ -158,7 +156,7 @@ void ClientCommand_getmapvotepic(float request, float argc) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(intermission_running) MapVote_SendPicture(stof(argv(1))); @@ -167,7 +165,7 @@ void ClientCommand_getmapvotepic(float request, float argc) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n"); sprint(self, " Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n"); @@ -180,7 +178,7 @@ void ClientCommand_info(float request, float argc) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { string command; @@ -194,7 +192,7 @@ void ClientCommand_info(float request, float argc) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd info request\n"); sprint(self, " Where 'request' is the suffixed string appended onto the request for cvar.\n"); @@ -207,7 +205,7 @@ void ClientCommand_join(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(self.flags & FL_CLIENT) { @@ -234,7 +232,7 @@ void ClientCommand_join(float request) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd join\n"); sprint(self, " No arguments required.\n"); @@ -247,14 +245,14 @@ void ClientCommand_ladder(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, ladder_reply); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd ladder\n"); sprint(self, " No arguments required.\n"); @@ -267,14 +265,14 @@ void ClientCommand_lsmaps(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, lsmaps_reply); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd lsmaps\n"); sprint(self, " No arguments required.\n"); @@ -287,14 +285,14 @@ void ClientCommand_lsnewmaps(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, lsnewmaps_reply); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd lsnewmaps\n"); sprint(self, " No arguments required.\n"); @@ -307,14 +305,14 @@ void ClientCommand_maplist(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, maplist_reply); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd maplist\n"); sprint(self, " No arguments required.\n"); @@ -327,14 +325,14 @@ void ClientCommand_rankings(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, rankings_reply); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd rankings\n"); sprint(self, " No arguments required.\n"); @@ -347,7 +345,7 @@ void ClientCommand_ready(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(self.flags & FL_CLIENT) { @@ -378,7 +376,7 @@ void ClientCommand_ready(float request) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd ready\n"); sprint(self, " No arguments required.\n"); @@ -391,7 +389,7 @@ void ClientCommand_records(float request) // TODO: Isn't this flooding with the { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float i; @@ -402,7 +400,7 @@ void ClientCommand_records(float request) // TODO: Isn't this flooding with the } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd records\n"); sprint(self, " No arguments required.\n"); @@ -415,7 +413,7 @@ void ClientCommand_reportcvar(float request, float argc, string command) // TODO { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float tokens; string s; @@ -430,7 +428,7 @@ void ClientCommand_reportcvar(float request, float argc, string command) // TODO } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd reportcvar \n"); sprint(self, " Where 'cvar' is the cvar plus arguments to send to the server.\n"); @@ -443,14 +441,14 @@ void ClientCommand_say(float request, float argc, string command) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); } return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd say \n"); sprint(self, " Where 'message' is the string of text to say.\n"); @@ -463,14 +461,14 @@ void ClientCommand_say_team(float request, float argc, string command) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argc >= 2) { Say(self, TRUE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); } return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd say_team \n"); sprint(self, " Where 'message' is the string of text to say.\n"); @@ -483,7 +481,7 @@ void ClientCommand_selectteam(float request, float argc) // TODO: Update the mes { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float selection; @@ -525,7 +523,7 @@ void ClientCommand_selectteam(float request, float argc) // TODO: Update the mes } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { //sprint(self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) ); sprint(self, "\nUsage:^3 cmd selectteam team\n"); @@ -540,14 +538,14 @@ void ClientCommand_selfstuff(float request, string command) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd selfstuff command\n"); sprint(self, " Where 'command' is the string to be stuffed to your client.\n"); @@ -560,7 +558,7 @@ void ClientCommand_sentcvar(float request, float argc, string command) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float tokens; string s; @@ -575,7 +573,7 @@ void ClientCommand_sentcvar(float request, float argc, string command) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd sentcvar \n"); sprint(self, " Where 'cvar' is the cvar plus arguments to send to the server.\n"); @@ -588,7 +586,7 @@ void ClientCommand_spectate(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(self.flags & FL_CLIENT) { @@ -623,7 +621,7 @@ void ClientCommand_spectate(float request) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd spectate\n"); sprint(self, " No arguments required.\n"); @@ -636,14 +634,14 @@ void ClientCommand_suggestmap(float request, float argc) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { sprint(self, strcat(MapVote_Suggest(argv(1)), "\n")); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd suggestmap map\n"); sprint(self, " Where 'map' is the name of the map to suggest.\n"); @@ -656,14 +654,14 @@ void ClientCommand_teamstatus(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { Score_NicePrint(self); return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd teamstatus\n"); sprint(self, " No arguments required.\n"); @@ -676,7 +674,7 @@ void ClientCommand_tell(float request, float argc, string command) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1); @@ -693,7 +691,7 @@ void ClientCommand_tell(float request, float argc, string command) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd tell playerid \n"); sprint(self, " Where 'playerid' is the entity number of the player to send the 'message' to.\n"); @@ -706,7 +704,7 @@ void ClientCommand_timein(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(self.flags & FL_CLIENT) { @@ -741,7 +739,7 @@ void ClientCommand_timein(float request) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd timein\n"); sprint(self, " No arguments required.\n"); @@ -754,7 +752,7 @@ void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE. { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(self.flags & FL_CLIENT) { @@ -817,7 +815,7 @@ void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE. } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd timeout\n"); sprint(self, " No arguments required.\n"); @@ -830,7 +828,7 @@ void ClientCommand_voice(float request, float argc, string command) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argc >= 3) VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); @@ -840,7 +838,7 @@ void ClientCommand_voice(float request, float argc, string command) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd voice\n"); sprint(self, " FIXME ARGUMENTS UNKNOWN.\n"); @@ -853,7 +851,7 @@ void ClientCommand_who(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float total_listed_players, tmp_hours, tmp_minutes, tmp_seconds; entity tmp_player; @@ -896,7 +894,7 @@ void ClientCommand_who(float request) } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd who\n"); sprint(self, " No arguments required.\n"); @@ -910,14 +908,14 @@ void ClientCommand_(float request) { switch(request) { - case CC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { return; // never fall through to usage } default: - case CC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd \n"); sprint(self, " No arguments required.\n"); @@ -982,7 +980,7 @@ float ClientCommand_macro_command(float argc, string command) #define CLIENT_COMMAND(name,function,description) \ { if(name == strtolower(argv(0))) { function; return TRUE; } } - CLIENT_COMMANDS(CC_REQUEST_COMMAND, argc, command) + CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc, command) #undef CLIENT_COMMAND return FALSE; @@ -993,7 +991,7 @@ float ClientCommand_macro_usage(float argc, string command) #define CLIENT_COMMAND(name,function,description) \ { if(name == strtolower(argv(1))) { function; return TRUE; } } - CLIENT_COMMANDS(CC_REQUEST_USAGE, argc, command) + CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc, command) #undef CLIENT_COMMAND return FALSE; diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh index 9005c5410..a9695dff2 100644 --- a/qcsrc/server/command/cmd.qh +++ b/qcsrc/server/command/cmd.qh @@ -3,9 +3,6 @@ // Last updated: December 11th, 2011 // ========================================================= -#define CC_REQUEST_COMMAND 1 -#define CC_REQUEST_USAGE 2 - .float cmd_floodtime; .float cmd_floodcount; .float checkfail; diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 622fa2e88..9a99fd196 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -3,6 +3,8 @@ // Last updated: December 6th, 2011 // ===================================================== +// declarations in sv_cmd.qh + // ============================ // Misc. Supporting Functions // ============================ @@ -102,7 +104,7 @@ void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plu { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; float entno = stof(argv(1)); @@ -146,7 +148,7 @@ void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plu default: print("Incorrect parameters for ^2adminmsg^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd adminmsg clientnumber \"message\" [infobartime]\n"); print(" If infobartime is provided, the message will be sent to infobar.\n"); @@ -162,14 +164,14 @@ void GameCommand_allready(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { ReadyRestart(); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd allready\n"); print(" No arguments required.\n"); @@ -182,7 +184,7 @@ void GameCommand_allspec(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; string reason = argv(1); @@ -200,7 +202,7 @@ void GameCommand_allspec(float request, float argc) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd allspec [reason]\n"); print(" Where 'reason' is an optional argument for explanation of allspec command.\n"); @@ -214,7 +216,7 @@ void GameCommand_anticheat(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; float entno = stof(argv(1)); @@ -235,7 +237,7 @@ void GameCommand_anticheat(float request, float argc) default: print("Incorrect parameters for ^2anticheat^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd anticheat clientnumber\n"); print(" where 'clientnumber' is player entity number.\n"); @@ -248,7 +250,7 @@ void GameCommand_bbox(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z)); print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n"); @@ -327,7 +329,7 @@ void GameCommand_bbox(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd bbox\n"); print(" No arguments required.\n"); @@ -341,7 +343,7 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity bot; @@ -424,7 +426,7 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co default: print("Incorrect parameters for ^2bot_cmd^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd bot_cmd client command [argument]\n"); print(" 'client' can be either the name or entity id of the bot\n"); @@ -440,7 +442,7 @@ void GameCommand_cointoss(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n"); @@ -454,7 +456,7 @@ void GameCommand_cointoss(float request, float argc) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n"); print(" Where 'result1' and 'result2' are user created options.\n"); @@ -467,14 +469,14 @@ void GameCommand_cvar_changes(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { print(cvar_changes); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd cvar_changes\n"); print(" No arguments required.\n"); @@ -488,14 +490,14 @@ void GameCommand_cvar_purechanges(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { print(cvar_purechanges); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd cvar_purechanges\n"); print(" No arguments required.\n"); @@ -509,7 +511,7 @@ void GameCommand_database(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argc == 3) { @@ -537,7 +539,7 @@ void GameCommand_database(float request, float argc) default: print("Incorrect parameters for ^2database^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd database action filename\n"); print(" Where 'action' is the command to complete,\n"); @@ -552,7 +554,7 @@ void GameCommand_defer_clear(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; float entno = stof(argv(1)); @@ -581,7 +583,7 @@ void GameCommand_defer_clear(float request, float argc) default: print("Incorrect parameters for ^2defer_clear^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd defer_clear clientnumber\n"); print(" where 'clientnumber' is player entity number.\n"); @@ -595,7 +597,7 @@ void GameCommand_defer_clear_all(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; float i; @@ -604,7 +606,7 @@ void GameCommand_defer_clear_all(float request) FOR_EACH_CLIENT(client) { argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client)))); - GameCommand_defer_clear(GC_REQUEST_COMMAND, argc); + GameCommand_defer_clear(CMD_REQUEST_COMMAND, argc); ++i; } if(i) { print(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? @@ -612,7 +614,7 @@ void GameCommand_defer_clear_all(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd defer_clear_all\n"); print(" No arguments required.\n"); @@ -626,7 +628,7 @@ void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argv(1)) { @@ -640,7 +642,7 @@ void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge default: print("Incorrect parameters for ^2delrec^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd delrec ranking [map]\n"); print(" 'ranking' is which ranking level to clear up to, \n"); @@ -655,7 +657,7 @@ void GameCommand_effectindexdump(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float fh, d; string s; @@ -720,7 +722,7 @@ void GameCommand_effectindexdump(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd effectindexdump\n"); print(" No arguments required.\n"); @@ -733,14 +735,14 @@ void GameCommand_extendmatchtime(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd extendmatchtime\n"); print(" No arguments required.\n"); @@ -754,7 +756,7 @@ void GameCommand_find(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; @@ -766,7 +768,7 @@ void GameCommand_find(float request, float argc) default: print("Incorrect parameters for ^2find^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd find classname\n"); print(" Where 'classname' is the classname to search for.\n"); @@ -779,7 +781,7 @@ void GameCommand_gametype(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { string s = argv(1); float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype(); @@ -804,7 +806,7 @@ void GameCommand_gametype(float request, float argc) default: print("Incorrect parameters for ^2gametype^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd gametype mode\n"); print(" Where 'mode' is the gametype mode to switch to.\n"); @@ -818,7 +820,7 @@ void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: fini { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity tmp_entity; float i; @@ -865,7 +867,7 @@ void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: fini default: print("Incorrect parameters for ^2gettaginfo^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd gettaginfo\n"); print(" FIXME: Arguments currently unknown\n"); @@ -879,7 +881,7 @@ void GameCommand_gotomap(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argc == 2) { @@ -890,7 +892,7 @@ void GameCommand_gotomap(float request, float argc) default: print("Incorrect parameters for ^2gotomap^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd gotomap map\n"); print(" Where 'map' is the *.bsp file to change to.\n"); @@ -904,14 +906,14 @@ void GameCommand_ladder(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { print(ladder_reply); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd ladder\n"); print(" No arguments required.\n"); @@ -924,7 +926,7 @@ void GameCommand_lockteams(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(teamplay) { @@ -939,7 +941,7 @@ void GameCommand_lockteams(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd lockteams\n"); print(" No arguments required.\n"); @@ -953,7 +955,7 @@ void GameCommand_make_mapinfo(float request) // UNTESTED { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity tmp_entity; @@ -966,7 +968,7 @@ void GameCommand_make_mapinfo(float request) // UNTESTED } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd make_mapinfo\n"); print(" No arguments required.\n"); @@ -979,14 +981,14 @@ void GameCommand_modelbug(float request) // UNTESTED // is this even needed anym { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { modelbug(); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd modelbug\n"); print(" No arguments required.\n"); @@ -999,7 +1001,7 @@ void GameCommand_moveplayer(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; @@ -1118,7 +1120,7 @@ void GameCommand_moveplayer(float request, float argc) default: print("Incorrect parameters for ^2moveplayer^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd moveplayer clientnumbers destination [notify]\n"); print(" 'clientnumbers' is a list (separated by commas) of player entity ID's\n"); @@ -1139,7 +1141,7 @@ void GameCommand_nospectators(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { blockSpectators = 1; entity plr; @@ -1156,7 +1158,7 @@ void GameCommand_nospectators(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd nospectators\n"); print(" No arguments required.\n"); @@ -1169,7 +1171,7 @@ void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { onslaught_updatelinks(); print("ONS links updated\n"); @@ -1177,7 +1179,7 @@ void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd onslaught_updatelinks\n"); print(" No arguments required.\n"); @@ -1190,7 +1192,7 @@ void GameCommand_playerdemo(float request, float argc) // UNTESTED { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; float i, n, entno; @@ -1258,7 +1260,7 @@ void GameCommand_playerdemo(float request, float argc) // UNTESTED default: print("Incorrect parameters for ^2radarmap^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd \n"); print(" FIXME: Arguments currently unknown\n"); @@ -1271,7 +1273,7 @@ void GameCommand_printstats(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { DumpStats(FALSE); print("stats dumped.\n"); @@ -1279,7 +1281,7 @@ void GameCommand_printstats(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd printstats\n"); print(" No arguments required.\n"); @@ -1292,7 +1294,7 @@ void GameCommand_radarmap(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(RadarMap_Make(argc)) return; @@ -1300,7 +1302,7 @@ void GameCommand_radarmap(float request, float argc) default: print("Incorrect parameters for ^2radarmap^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]\n"); print(" The quality factor Q is roughly proportional to the time taken.\n"); @@ -1314,7 +1316,7 @@ void GameCommand_rankings(float request) // this is OLD.... jeez. { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { strunzone(rankings_reply); rankings_reply = strzone(getrankings()); @@ -1323,7 +1325,7 @@ void GameCommand_rankings(float request) // this is OLD.... jeez. } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd rankings\n"); print(" No arguments required.\n"); @@ -1336,7 +1338,7 @@ void GameCommand_records(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float i; @@ -1347,7 +1349,7 @@ void GameCommand_records(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd records\n"); print(" No arguments required.\n"); @@ -1360,14 +1362,14 @@ void GameCommand_reducematchtime(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd reducematchtime\n"); print(" No arguments required.\n"); @@ -1381,7 +1383,7 @@ void GameCommand_setbots(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(argc >= 2) { @@ -1394,7 +1396,7 @@ void GameCommand_setbots(float request, float argc) default: print("Incorrect parameters for ^2setbots^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd setbots botnumber\n"); print(" Where 'botnumber' is the amount of bots to set bot_number cvar to.\n"); @@ -1408,7 +1410,7 @@ void GameCommand_shuffleteams(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(teamplay) { @@ -1497,7 +1499,7 @@ void GameCommand_shuffleteams(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd shuffleteams\n"); print(" No arguments required.\n"); @@ -1516,7 +1518,7 @@ void GameCommand_stuffto(float request, float argc) #ifdef STUFFTO_ENABLED switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { entity client; float entno; @@ -1541,7 +1543,7 @@ void GameCommand_stuffto(float request, float argc) default: print("Incorrect parameters for ^2stuffto^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd stuffto clientnumber command\n"); print(" FIXME: Arguments currently unknown\n"); @@ -1561,14 +1563,14 @@ void GameCommand_teamstatus(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { Score_NicePrint(world); return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd teamstatus\n"); print(" No arguments required.\n"); @@ -1581,7 +1583,7 @@ void GameCommand_time(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { print("time = ", ftos(time), "\n"); print("frame start = ", ftos(gettime(GETTIME_FRAMESTART)), "\n"); @@ -1594,7 +1596,7 @@ void GameCommand_time(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd time\n"); print(" No arguments required.\n"); @@ -1607,7 +1609,7 @@ void GameCommand_trace(float request, float argc) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { // TODO: Clean up all of these variables and merge the code below to use only a few entity e; @@ -1771,7 +1773,7 @@ void GameCommand_trace(float request, float argc) default: print("Incorrect parameters for ^2trace^7\n"); - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd trace command [arguments]\n"); print(" FIXME: Arguments currently unknown\n"); @@ -1784,7 +1786,7 @@ void GameCommand_unlockteams(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(teamplay) { @@ -1799,7 +1801,7 @@ void GameCommand_unlockteams(float request) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd unlockteams\n"); print(" No arguments required.\n"); @@ -1813,7 +1815,7 @@ void GameCommand_warp(float request, float argc) { switch (request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(autocvar_g_campaign) { @@ -1834,7 +1836,7 @@ void GameCommand_warp(float request, float argc) } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd level\n"); print(" 'level' is the level to change campaign mode to.\n"); @@ -1848,14 +1850,14 @@ void GameCommand_(float request) { switch(request) { - case GC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { return; } default: - case GC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 sv_cmd \n"); print(" No arguments required.\n"); @@ -1931,7 +1933,7 @@ float GameCommand_macro_command(float argc, string command) #define SERVER_COMMAND(name,function,description) \ { if(name == strtolower(argv(0))) { function; return TRUE; } } - SERVER_COMMANDS(GC_REQUEST_COMMAND, argc, command) + SERVER_COMMANDS(CMD_REQUEST_COMMAND, argc, command) #undef SERVER_COMMAND return FALSE; @@ -1942,7 +1944,7 @@ float GameCommand_macro_usage(float argc) #define SERVER_COMMAND(name,function,description) \ { if(name == strtolower(argv(1))) { function; return TRUE; } } - SERVER_COMMANDS(GC_REQUEST_USAGE, argc, "") + SERVER_COMMANDS(CMD_REQUEST_USAGE, argc, "") #undef SERVER_COMMAND return FALSE; diff --git a/qcsrc/server/command/sv_cmd.qh b/qcsrc/server/command/sv_cmd.qh index 41981a594..c2b3a046c 100644 --- a/qcsrc/server/command/sv_cmd.qh +++ b/qcsrc/server/command/sv_cmd.qh @@ -3,9 +3,6 @@ // Last updated: December 6th, 2011 // ===================================================== -#define GC_REQUEST_COMMAND 1 -#define GC_REQUEST_USAGE 2 - float RadarMap_Make(float argc); string GotoMap(string m); diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index f511db548..f1d2ac83e 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -3,6 +3,8 @@ // Last updated: December 10th, 2011 // ============================================= +// declarations in vote.qh + // ============================================= // Nagger for players to know status of voting // ============================================= @@ -612,7 +614,7 @@ void VoteCommand_abstain(float request, entity caller) // CLIENT ONLY { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if not(votecalled) { 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."); } @@ -629,7 +631,7 @@ void VoteCommand_abstain(float request, entity caller) // CLIENT ONLY } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote abstain\n"); print(" No arguments required.\n"); @@ -642,7 +644,7 @@ void VoteCommand_call(float request, entity caller, float argc, string vote_comm { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage) @@ -690,7 +692,7 @@ void VoteCommand_call(float request, entity caller, float argc, string vote_comm } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote call\n"); print(" TODO.\n"); @@ -703,7 +705,7 @@ void VoteCommand_master(float request, entity caller, float argc, string vote_co { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(autocvar_sv_vote_master) { @@ -778,7 +780,7 @@ void VoteCommand_master(float request, entity caller, float argc, string vote_co } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote master action [arguments]\n"); print(" TODO.\n"); @@ -791,7 +793,7 @@ void VoteCommand_no(float request, entity caller) // CLIENT ONLY { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if not(votecalled) { 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."); } @@ -808,7 +810,7 @@ void VoteCommand_no(float request, entity caller) // CLIENT ONLY } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote no\n"); print(" No arguments required.\n"); @@ -821,7 +823,7 @@ void VoteCommand_status(float request, entity caller) // BOTH { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(votecalled) print_to(caller, strcat("^7Vote for ", votecalledvote_display, "^7 called by ^7", VoteCommand_getname(votecaller), "^7.")); @@ -832,7 +834,7 @@ void VoteCommand_status(float request, entity caller) // BOTH } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote status\n"); print(" No arguments required.\n"); @@ -845,7 +847,7 @@ void VoteCommand_stop(float request, entity caller) // BOTH { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if not(votecalled) { print_to(caller, "^1No vote called."); } else if((caller == votecaller) || !caller || caller.vote_master) { VoteStop(caller); } @@ -855,7 +857,7 @@ void VoteCommand_stop(float request, entity caller) // BOTH } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote stop\n"); print(" No arguments required.\n"); @@ -868,7 +870,7 @@ void VoteCommand_yes(float request, entity caller) // CLIENT ONLY { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if not(votecalled) { 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."); } @@ -885,7 +887,7 @@ void VoteCommand_yes(float request, entity caller) // CLIENT ONLY } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote yes\n"); print(" No arguments required.\n"); @@ -899,14 +901,14 @@ void VoteCommand_(float request) { switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { return; } default: - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { print("\nUsage:^3 vote \n"); print(" No arguments required.\n"); @@ -954,7 +956,7 @@ void VoteCommand_macro_help(entity caller, float argc) #define VOTE_COMMAND(name,function,description,assignment) \ { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(2))) { function; return; } } } - VOTE_COMMANDS(VC_REQUEST_USAGE, caller, argc, "") + VOTE_COMMANDS(CMD_REQUEST_USAGE, caller, argc, "") #undef VOTE_COMMAND } @@ -966,7 +968,7 @@ float VoteCommand_macro_command(entity caller, float argc, string vote_command) #define VOTE_COMMAND(name,function,description,assignment) \ { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(1))) { function; return TRUE; } } } - VOTE_COMMANDS(VC_REQUEST_COMMAND, caller, argc, vote_command) + VOTE_COMMANDS(CMD_REQUEST_COMMAND, caller, argc, vote_command) #undef VOTE_COMMAND return FALSE; @@ -986,7 +988,7 @@ void VoteCommand(float request, entity caller, float argc, string vote_command) switch(request) { - case VC_REQUEST_COMMAND: + case CMD_REQUEST_COMMAND: { if(VoteCommand_macro_command(caller, argc, vote_command)) return; @@ -994,7 +996,7 @@ void VoteCommand(float request, entity caller, float argc, string vote_command) default: print_to(caller, strcat("Unknown vote command", ((argv(1) != "") ? strcat(" \"", argv(1), "\"") : ""), ". For a list of supported commands, try ", VoteCommand_getprefix(caller), " help.\n")); - case VC_REQUEST_USAGE: + case CMD_REQUEST_USAGE: { VoteCommand_macro_help(caller, argc); return; diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh index c23431827..bf88e652b 100644 --- a/qcsrc/server/command/vote.qh +++ b/qcsrc/server/command/vote.qh @@ -1,6 +1,3 @@ -#define VC_REQUEST_COMMAND 1 -#define VC_REQUEST_USAGE 2 - #define VC_ASGNMNT_BOTH 1 #define VC_ASGNMNT_CLIENTONLY 2 #define VC_ASGNMNT_SERVERONLY 3 diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index 46ed5dd82..8cb8abad6 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -156,9 +156,6 @@ ipban.qc ../common/mapinfo.qc - - - t_quake3.qc t_halflife.qc t_quake.qc -- 2.39.2