From acf78d7c677a1d682f4269b122d67e67143cf3e6 Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 13 Dec 2011 04:11:08 -0500 Subject: [PATCH] More work with the declaration/.qh files and the common files -- now it compiles :D --- qcsrc/server/command/cmd.qc | 19 - qcsrc/server/command/cmd.qh | 1064 ---------------- qcsrc/server/command/common.qc | 6 +- qcsrc/server/command/radarmap.qc | 9 - qcsrc/server/command/radarmap.qh | 431 +------ qcsrc/server/command/sv_cmd.qc | 15 - qcsrc/server/command/sv_cmd.qh | 1992 ------------------------------ qcsrc/server/command/vote.qc | 16 - qcsrc/server/command/vote.qh | 15 + qcsrc/server/progs.src | 20 +- 10 files changed, 33 insertions(+), 3554 deletions(-) diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 86ff171f0..9ed8aa78f 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -3,17 +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; -.float lms_spectate_warning; - -string MapVote_Suggest(string m); -//void MapVote_SendPicture(float id) - // move any necessary sprint statements to "print_to" // ============================ @@ -860,14 +849,6 @@ void ClientCommand_voice(float request, float argc, string command) } } -string strlimitedlen(string input, float strip_colors, float limit) -{ - if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit) - return input; - else - return strcat(substring(input, 0, (strlen(input) - 3)), "..."); -} - void ClientCommand_who(float request) { switch(request) diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh index 86ff171f0..9005c5410 100644 --- a/qcsrc/server/command/cmd.qh +++ b/qcsrc/server/command/cmd.qh @@ -13,1067 +13,3 @@ string MapVote_Suggest(string m); //void MapVote_SendPicture(float id) - -// move any necessary sprint statements to "print_to" - -// ============================ -// Misc. Supporting Functions -// ============================ - -float SV_ParseClientCommand_floodcheck() -{ - if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code) - { - if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) - { - self.cmd_floodcount += 1; - if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return FALSE; } // too much spam, halt - } - else - { - self.cmd_floodtime = time; - self.cmd_floodcount = 1; - } - } - return TRUE; // continue, as we're not flooding yet -} - - -// ======================= -// Command Sub-Functions -// ======================= - -void ClientCommand_autoswitch(float request, float argc) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - self.autoswitch = ("0" != argv(1)); - sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n")); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd autoswitch selection\n"); - sprint(self, " Where 'selection' is 1 or 0 for on or off.\n"); - return; - } - } -} - -void ClientCommand_checkfail(float request, string command) // used only by client side code -{ - switch(request) - { - case CC_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; - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd checkfail message\n"); - sprint(self, " Where 'message' is the message reported by client about the fail.\n"); - return; - } - } -} - -void ClientCommand_clientversion(float request, float argc) // used only by client side code -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(self.flags & FL_CLIENT) - { - self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1))); - - if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max) - { - self.version_mismatch = 1; - ClientKill_TeamChange(-2); // observe - } - else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) - { - //JoinBestTeam(self, FALSE, TRUE); - } - else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) - { - self.classname = "observer"; // really? - stuffcmd(self, "menu_showteamselect\n"); - } - } - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd clientversion version\n"); - sprint(self, " Where 'version' is the game version reported by self.\n"); - return; - } - } -} - -void ClientCommand_cvar_changes(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, cvar_changes); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n"); - sprint(self, " No arguments required.\n"); - //sprint(self, "See also: ^2cvar_purechanges^7\n"); - return; - } - } -} - -void ClientCommand_cvar_purechanges(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, cvar_purechanges); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n"); - sprint(self, " No arguments required.\n"); - //sprint(self, "See also: ^2cvar_changes^7\n"); - return; - } - } -} - -void ClientCommand_getmapvotepic(float request, float argc) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(intermission_running) - MapVote_SendPicture(stof(argv(1))); - - return; // never fall through to usage - } - - default: - case CC_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"); - return; - } - } -} - -void ClientCommand_info(float request, float argc) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - string command; - - command = builtin_cvar_string(strcat("sv_info_", argv(1))); - if(command) - wordwrap_sprint(command, 1111); // why 1111? - else - sprint(self, "ERROR: unsupported info command\n"); - - return; // never fall through to usage - } - - default: - case CC_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"); - return; - } - } -} - -void ClientCommand_join(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(self.flags & FL_CLIENT) - { - if(self.classname != "player" && !lockteams && !g_arena) - { - if(nJoinAllowed(1)) - { - if(g_ca) { self.caplayer = 1; } - if(autocvar_g_campaign) { campaign_bots_may_start = 1; } - - self.classname = "player"; - PlayerScore_Clear(self); - bprint ("^4", self.netname, "^4 is playing now\n"); - PutClientInServer(); - } - else - { - //player may not join because of g_maxplayers is set - centerprint(self, PREVENT_JOIN_TEXT); - } - } - } - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd join\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_ladder(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, ladder_reply); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd ladder\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_lsmaps(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, lsmaps_reply); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd lsmaps\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_lsnewmaps(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, lsnewmaps_reply); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd lsnewmaps\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_maplist(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, maplist_reply); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd maplist\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_rankings(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, rankings_reply); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd rankings\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_ready(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(self.flags & FL_CLIENT) - { - if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2) - { - if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable) - { - if (self.ready) // toggle - { - self.ready = FALSE; - bprint(self.netname, "^2 is ^1NOT^2 ready\n"); - } - else - { - self.ready = TRUE; - bprint(self.netname, "^2 is ready\n"); - } - - // cannot reset the game while a timeout is active! - if(!timeoutStatus) - ReadyCount(); - } else { - sprint(self, "^1Game has already been restarted\n"); - } - } - } - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd ready\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_records(float request) // TODO: Isn't this flooding with the sprint messages? Old code, but perhaps bad? -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - float i; - - for(i = 0; i < 10; ++i) - sprint(self, records_reply[i]); - - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd records\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - float tokens; - string s; - - if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then - { - s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\""); - tokens = tokenize_console(s); - } - GetCvars(1); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd reportcvar \n"); - sprint(self, " Where 'cvar' is the cvar plus arguments to send to the server.\n"); - return; - } - } -} - -void ClientCommand_say(float request, float argc, string command) -{ - switch(request) - { - case CC_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: - { - sprint(self, "\nUsage:^3 cmd say \n"); - sprint(self, " Where 'message' is the string of text to say.\n"); - return; - } - } -} - -void ClientCommand_say_team(float request, float argc, string command) -{ - switch(request) - { - case CC_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: - { - sprint(self, "\nUsage:^3 cmd say_team \n"); - sprint(self, " Where 'message' is the string of text to say.\n"); - return; - } - } -} - -void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - float selection; - - if (self.flags & FL_CLIENT) - { - if(teamplay) - if not(self.team_forced > 0) - if not(lockteams) - { - switch(argv(1)) - { - case "red": selection = COLOR_TEAM1; break; - case "blue": selection = COLOR_TEAM2; break; - case "yellow": selection = COLOR_TEAM3; break; - case "pink": selection = COLOR_TEAM4; break; - case "auto": selection = (-1); break; - - default: break; - } - - if(selection) - { - if(self.team == selection && self.deadflag == DEAD_NO) - sprint(self, "^7You already are on that team.\n"); - else if(self.wasplayer && autocvar_g_changeteam_banned) - sprint(self, "^1You cannot change team, forbidden by the server.\n"); - else - ClientKill_TeamChange(selection); - } - } - else - sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n"); - else - sprint(self, "^7selectteam can not be used as your team is forced\n"); - else - sprint(self, "^7selectteam can only be used in teamgames\n"); - } - return; // never fall through to usage - } - - default: - case CC_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"); - sprint(self, " Where 'team' is the prefered team to try and join.\n"); - sprint(self, " Full list of options here: \"red, blue, yellow, pink, auto\"\n"); - return; - } - } -} - -void ClientCommand_selfstuff(float request, string command) -{ - switch(request) - { - case CC_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: - { - sprint(self, "\nUsage:^3 cmd selfstuff command\n"); - sprint(self, " Where 'command' is the string to be stuffed to your client.\n"); - return; - } - } -} - -void ClientCommand_sentcvar(float request, float argc, string command) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - float tokens; - string s; - - if(argc == 2) // undefined cvar: use the default value on the server then - { - s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\""); - tokens = tokenize_console(s); - } - GetCvars(1); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd sentcvar \n"); - sprint(self, " Where 'cvar' is the cvar plus arguments to send to the server.\n"); - return; - } - } -} - -void ClientCommand_spectate(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(self.flags & FL_CLIENT) - { - if(g_arena) { return; } - if(g_lms) - { - if(self.lms_spectate_warning) - { - // mark player as spectator - PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0)); - } - else - { - self.lms_spectate_warning = 1; - sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n"); - return; - } - } - - if(self.classname == "player" && autocvar_sv_spectate == 1) - ClientKill_TeamChange(-2); // observe - - // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list) - // note: if arena game mode is ever done properly, this needs to be removed. - if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer")) - { - sprint(self, "WARNING: you will spectate in the next round.\n"); - self.caplayer = 0; - } - } - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd spectate\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_suggestmap(float request, float argc) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - sprint(self, strcat(MapVote_Suggest(argv(1)), "\n")); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd suggestmap map\n"); - sprint(self, " Where 'map' is the name of the map to suggest.\n"); - return; - } - } -} - -void ClientCommand_teamstatus(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - Score_NicePrint(self); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd teamstatus\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_tell(float request, float argc, string command) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1); - - if(e && argc > ParseCommandPlayerSlotTarget_firsttoken) - { - Say(self, FALSE, e, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE); - } - else - { - if(argc > ParseCommandPlayerSlotTarget_firsttoken) - trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken))); - } - return; // never fall through to usage - } - - default: - case CC_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"); - return; - } - } -} - -void ClientCommand_timein(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(self.flags & FL_CLIENT) - { - if(autocvar_sv_timeout) - { - if (!timeoutStatus) - return sprint(self, "^7Error: There is no active timeout which could be aborted!\n"); - if (self != timeoutInitiator) - return sprint(self, "^7Error: You may not abort the active timeout. Only the player who called it can do that!\n"); - - if (timeoutStatus == 1) - { - remainingTimeoutTime = timeoutStatus = 0; - timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately - bprint(strcat("^7The timeout was aborted by ", self.netname, " !\n")); - } - else if (timeoutStatus == 2) - { - //only shorten the remainingTimeoutTime if it makes sense - if( remainingTimeoutTime > (autocvar_sv_timeout_resumetime + 1) ) - { - bprint(strcat("^1Attention: ^7", self.netname, " resumed the game! Prepare for battle!\n")); - remainingTimeoutTime = autocvar_sv_timeout_resumetime; - timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately - } - else - sprint(self, "^7Error: Your resumegame call was discarded!\n"); - } - } - } - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd timein\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE. -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(self.flags & FL_CLIENT) - { - if(autocvar_sv_timeout) - { - if(self.classname == "player") - { - if(votecalled) - sprint(self, "^7Error: you can not call a timeout while a vote is active!\n"); - else - { - if (inWarmupStage && !g_warmup_allow_timeout) - return sprint(self, "^7Error: You can not call a timeout in warmup-stage!\n"); - if (time < game_starttime ) - return sprint(self, "^7Error: You can not call a timeout while the map is being restarted!\n"); - - if (timeoutStatus != 2) { - //if the map uses a timelimit make sure that timeout cannot be called right before the map ends - if (autocvar_timelimit) { - //a timelimit was used - float myTl; - myTl = autocvar_timelimit; - - float lastPossibleTimeout; - lastPossibleTimeout = (myTl*60) - autocvar_sv_timeout_leadtime - 1; - - if (lastPossibleTimeout < time - game_starttime) - return sprint(self, "^7Error: It is too late to call a timeout now!\n"); - } - } - - //player may not call a timeout if he has no calls left - if (self.allowedTimeouts < 1) - return sprint(self, "^7Error: You already used all your timeout calls for this map!\n"); - - - //now all required checks are passed - self.allowedTimeouts -= 1; - bprint(self.netname, " ^7called a timeout (", ftos(self.allowedTimeouts), " timeouts left)!\n"); //write a bprint who started the timeout (and how many he has left) - remainingTimeoutTime = autocvar_sv_timeout_length; - remainingLeadTime = autocvar_sv_timeout_leadtime; - timeoutInitiator = self; - if (timeoutStatus == 0) { //if another timeout was already active, don't change its status (which was 1 or 2) to 1, only change it to 1 if no timeout was active yet - timeoutStatus = 1; - //create the timeout indicator which centerprints the information to all players and takes care of pausing/unpausing - timeoutHandler = spawn(); - timeoutHandler.think = timeoutHandler_Think; - } - timeoutHandler.nextthink = time; //always let the entity think asap - - //inform all connected clients about the timeout call - Announce("timeoutcalled"); - } - } - else - sprint(self, "^7Error: only players can call a timeout!\n"); - } - } - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd timeout\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -void ClientCommand_voice(float request, float argc, string command) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - if(argc >= 3) - VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); - else - VoiceMessage(argv(1), ""); - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd voice\n"); - sprint(self, " FIXME ARGUMENTS UNKNOWN.\n"); - return; - } - } -} - -string strlimitedlen(string input, float strip_colors, float limit) -{ - if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit) - return input; - else - return strcat(substring(input, 0, (strlen(input) - 3)), "..."); -} - -void ClientCommand_who(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - float total_listed_players, tmp_hours, tmp_minutes, tmp_seconds; - entity tmp_player; - string tmp_player_name; - - sprint(self, strcat("List of client information", (autocvar_sv_status_privacy ? " (some data is hidden for privacy)" : string_null), ":\n")); - sprint(self, sprintf(" %-4s %-20s %-5s %-3s %-9s %-16s %s\n", "ent", "nickname", "ping", "pl", "time", "ip", "crypto_id")); - - FOR_EACH_CLIENT(tmp_player) - { - tmp_player_name = strlimitedlen(tmp_player.netname, TRUE, 20); - - tmp_hours = tmp_minutes = tmp_seconds = 0; - - tmp_seconds = (time - tmp_player.jointime); - tmp_minutes = (tmp_seconds / 60); - - if(tmp_minutes) - { - tmp_seconds -= (tmp_minutes * 60); - tmp_hours = (tmp_minutes / 60); - - if(tmp_hours) { tmp_minutes -= (tmp_hours * 60); } - } - - sprint(self, sprintf(" %-4s %-20s %-5d %-3d %-9s %-16s %s\n", - strcat("#", ftos(num_for_edict(tmp_player))), - tmp_player.netname, //strcat(tmp_player_name, sprintf("%*s", (20 - strlen(strdecolorize(tmp_player_name))), "")), - tmp_player.ping, tmp_player.ping_packetloss, - sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds), - (autocvar_sv_status_privacy ? "hidden" : tmp_player.netaddress), - (autocvar_sv_status_privacy ? "hidden" : tmp_player.crypto_idfp))); - - ++total_listed_players; - } - - sprint(self, strcat("Finished listing ", ftos(total_listed_players), " client(s). \n")); - - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd who\n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} - -/* use this when creating a new command, making sure to place it in alphabetical order. -void ClientCommand_(float request) -{ - switch(request) - { - case CC_REQUEST_COMMAND: - { - - return; // never fall through to usage - } - - default: - case CC_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd \n"); - sprint(self, " No arguments required.\n"); - return; - } - } -} -*/ - - -// ===================================== -// Macro system for networked commands -// ===================================== - -// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -#define CLIENT_COMMANDS(request,arguments,command) \ - CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \ - CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \ - CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \ - CLIENT_COMMAND("cvar_changes", ClientCommand_cvar_changes(request), "Prints a list of all changed server cvars") \ - CLIENT_COMMAND("cvar_purechanges", ClientCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \ - CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \ - CLIENT_COMMAND("info", ClientCommand_info(request, arguments), "Request for unique server information set up by admin") \ - CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \ - CLIENT_COMMAND("ladder", ClientCommand_ladder(request), "Get information about top players if supported") \ - CLIENT_COMMAND("lsmaps", ClientCommand_lsmaps(request), "List maps which can be used with the current game mode") \ - CLIENT_COMMAND("lsnewmaps", ClientCommand_lsnewmaps(request), "List maps which TODO") \ - CLIENT_COMMAND("maplist", ClientCommand_maplist(request), "Full server maplist reply") \ - CLIENT_COMMAND("rankings", ClientCommand_rankings(request), "Print information about rankings") \ - CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \ - CLIENT_COMMAND("records", ClientCommand_records(request), "List top 10 records for the current map") \ - CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \ - CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \ - CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \ - CLIENT_COMMAND("selectteam", ClientCommand_selectteam(request, arguments), "Attempt to choose a team to join into") \ - CLIENT_COMMAND("selfstuff", ClientCommand_selfstuff(request, command), "Stuffcmd a command to your own client") \ - CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \ - CLIENT_COMMAND("spectate", ClientCommand_spectate(request), "Become an observer") \ - CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \ - CLIENT_COMMAND("teamstatus", ClientCommand_teamstatus(request), "Print detailed score information for all players") \ - CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \ - CLIENT_COMMAND("timein", ClientCommand_timein(request), "Resume the game from being paused with a timeout") \ - CLIENT_COMMAND("timeout", ClientCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \ - CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \ - CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \ - CLIENT_COMMAND("who", ClientCommand_who(request), "Display detailed client information about all players") \ - /* nothing */ - -void ClientCommand_macro_help() -{ - #define CLIENT_COMMAND(name,function,description) \ - { print(" ^2", name, "^7: ", description, "\n"); } - - CLIENT_COMMANDS(0, 0, "") - #undef CLIENT_COMMAND - - return; -} - -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) - #undef CLIENT_COMMAND - - return FALSE; -} - -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) - #undef CLIENT_COMMAND - - return FALSE; -} - - -// ====================================== -// Main Function Called By Engine (cmd) -// ====================================== -// If this function exists, server game code parses clientcommand before the engine code gets it. - -void SV_ParseClientCommand(string command) -{ - float argc = tokenize_console(command); - - // for floodcheck - switch(strtolower(argv(0))) - { - // exempt commands which are not subject to floodcheck - case "begin": break; // handled by engine in host_cmd.c - case "getmapvotepic": break; // handled by server in this file - case "pause": break; // handled by engine in host_cmd.c - case "prespawn": break; // handled by engine in host_cmd.c - case "reportcvar": break; // handled by server in this file - case "sentcvar": break; // handled by server in this file - case "spawn": break; // handled by engine in host_cmd.c - - default: - if(SV_ParseClientCommand_floodcheck()) - break; // "TRUE": continue, as we're not flooding yet - else - return; // "FALSE": not allowed to continue, halt - } - - /* NOTE: totally disabled for now, however the functionality and descriptions are there if we ever want it. - if(argv(0) == "help") - { - if(argc == 1) - { - sprint(self, "\nUsage:^3 cmd COMMAND...^7, where possible commands are:\n"); - ClientCommand_macro_help; - sprint(self, "For help about specific commands, type cmd help COMMAND\n"); - return; - } - else if(ClientCommand_macro_usage(argc, command)) // Instead of trying to call a command, we're going to see detailed information about it - { - return; - } - } - else*/ if(MUTATOR_CALLHOOK(SV_ParseClientCommand)) - { - return; // handled by a mutator - } - else if(CheatCommand(argc)) - { - return; // handled by server/cheats.qc - } - else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands - { - return; // handled by one of the above GameCommand_* functions - } - else - clientcommand(self, command); -} \ No newline at end of file diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 4a7c7a38d..8153505b5 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -39,10 +39,10 @@ float GetFilteredNumber(string input) } // switch between sprint and print depending on whether the reciever is the server or a player -void print_to(entity target, string input) +void print_to(entity to, string input) { - if(target) - sprint(target, strcat(input, "\n")); + if(to) + sprint(to, strcat(input, "\n")); else print(input, "\n"); } diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 99543cfa8..c0b09851b 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -2,15 +2,6 @@ // Generates radar map images for use in the HUD // =============================================== -entity radarmapper; - -float RADAR_WIDTH_MAX = 512; -float RADAR_HEIGHT_MAX = 512; -float sharpen_buffer[RADAR_WIDTH_MAX * 3]; -string doublehex = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFFFF"; -// FF is contained twice, to map 256 to FF too -// removes the need to bound() - float FullTraceFraction(vector a, vector mi, vector ma, vector b) { vector c; diff --git a/qcsrc/server/command/radarmap.qh b/qcsrc/server/command/radarmap.qh index 99543cfa8..b92d8466f 100644 --- a/qcsrc/server/command/radarmap.qh +++ b/qcsrc/server/command/radarmap.qh @@ -1,436 +1,13 @@ -// =============================================== -// Generates radar map images for use in the HUD -// =============================================== +// =========================================== +// Declarations for radarmap generation code +// =========================================== entity radarmapper; float RADAR_WIDTH_MAX = 512; float RADAR_HEIGHT_MAX = 512; float sharpen_buffer[RADAR_WIDTH_MAX * 3]; + string doublehex = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFFFF"; // FF is contained twice, to map 256 to FF too // removes the need to bound() - -float FullTraceFraction(vector a, vector mi, vector ma, vector b) -{ - vector c; - float white, black; - - white = 0.001; - black = 0.001; - - c = a; - - float n, m; - n = m = 0; - - while(vlen(c - b) > 1) - { - ++m; - - tracebox(c, mi, ma, b, MOVE_WORLDONLY, world); - ++n; - - if(!trace_startsolid) - { - black += vlen(trace_endpos - c); - c = trace_endpos; - } - - n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world); - - white += vlen(trace_endpos - c); - c = trace_endpos; - } - - if(n > 200) - dprint("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n"); - - return white / (black + white); -} -float RadarMapAtPoint_Trace(float x, float y, float w, float h, float zmin, float zsize, float q) -{ - vector a, b, mi, ma; - - mi = '0 0 0'; - ma = '1 0 0' * w + '0 1 0' * h; - a = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin; - b = '1 0 0' * x + '0 1 0' * y + '0 0 1' * (zsize + zmin); - - return FullTraceFraction(a, mi, ma, b); -} -float RadarMapAtPoint_LineBlock(float x, float y, float w, float h, float zmin, float zsize, float q) -{ - vector o, mi, ma; - float i, r; - vector dz; - - q = 256 * q - 1; - // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value - - mi = '0 0 0'; - dz = (zsize / q) * '0 0 1'; - ma = '1 0 0' * w + '0 1 0' * h + dz; - o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin; - - if(x < world.absmin_x - w) - return 0; - if(y < world.absmin_y - h) - return 0; - if(x > world.absmax_x) - return 0; - if(y > world.absmax_y) - return 0; - - r = 0; - for(i = 0; i < q; ++i) - { - vector v1, v2; - v1 = v2 = o + dz * i + mi; - v1_x += random() * (ma_x - mi_x); - v1_y += random() * (ma_y - mi_y); - v1_z += random() * (ma_z - mi_z); - v2_x += random() * (ma_x - mi_x); - v2_y += random() * (ma_y - mi_y); - v2_z += random() * (ma_z - mi_z); - traceline(v1, v2, MOVE_WORLDONLY, world); - if(trace_startsolid || trace_fraction < 1) - ++r; - } - return r / q; -} -float RadarMapAtPoint_Block(float x, float y, float w, float h, float zmin, float zsize, float q) -{ - vector o, mi, ma; - float i, r; - vector dz; - - q = 256 * q - 1; - // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value - - mi = '0 0 0'; - dz = (zsize / q) * '0 0 1'; - ma = '1 0 0' * w + '0 1 0' * h + dz; - o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin; - - if(x < world.absmin_x - w) - return 0; - if(y < world.absmin_y - h) - return 0; - if(x > world.absmax_x) - return 0; - if(y > world.absmax_y) - return 0; - - r = 0; - for(i = 0; i < q; ++i) - { - tracebox(o + dz * i, mi, ma, o + dz * i, MOVE_WORLDONLY, world); - if(trace_startsolid) - ++r; - } - return r / q; -} -float RadarMapAtPoint_Sample(float x, float y, float w, float h, float zmin, float zsize, float q) -{ - vector a, b, mi, ma; - - q *= 4; // choose q so it matches the regular algorithm in speed - - q = 256 * q - 1; - // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value - - mi = '0 0 0'; - ma = '1 0 0' * w + '0 1 0' * h; - a = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin; - b = '1 0 0' * w + '0 1 0' * h + '0 0 1' * zsize; - - float c, i; - c = 0; - - for(i = 0; i < q; ++i) - { - vector v; - v_x = a_x + random() * b_x; - v_y = a_y + random() * b_y; - v_z = a_z + random() * b_z; - traceline(v, v, MOVE_WORLDONLY, world); - if(trace_startsolid) - ++c; - } - - return c / q; -} -void sharpen_set(float x, float v) -{ - sharpen_buffer[x + 2 * RADAR_WIDTH_MAX] = v; -} -float sharpen_getpixel(float x, float y) -{ - if(x < 0) - return 0; - if(x >= RADAR_WIDTH_MAX) - return 0; - if(y < 0) - return 0; - if(y > 2) - return 0; - return sharpen_buffer[x + y * RADAR_WIDTH_MAX]; -} -float sharpen_get(float x, float a) -{ - float sum; - sum = sharpen_getpixel(x, 1); - if(a == 0) - return sum; - sum *= (8 + 1/a); - sum -= sharpen_getpixel(x - 1, 0); - sum -= sharpen_getpixel(x - 1, 1); - sum -= sharpen_getpixel(x - 1, 2); - sum -= sharpen_getpixel(x + 1, 0); - sum -= sharpen_getpixel(x + 1, 1); - sum -= sharpen_getpixel(x + 1, 2); - sum -= sharpen_getpixel(x, 0); - sum -= sharpen_getpixel(x, 2); - return bound(0, sum * a, 1); -} -void sharpen_shift(float w) -{ - float i; - for(i = 0; i < w; ++i) - { - sharpen_buffer[i] = sharpen_buffer[i + RADAR_WIDTH_MAX]; - sharpen_buffer[i + RADAR_WIDTH_MAX] = sharpen_buffer[i + 2 * RADAR_WIDTH_MAX]; - sharpen_buffer[i + 2 * RADAR_WIDTH_MAX] = 0; - } -} -void sharpen_init(float w) -{ - float i; - for(i = 0; i < w; ++i) - { - sharpen_buffer[i] = 0; - sharpen_buffer[i + RADAR_WIDTH_MAX] = 0; - sharpen_buffer[i + 2 * RADAR_WIDTH_MAX] = 0; - } -} -void RadarMap_Next() -{ - if(radarmapper.count & 4) - { - localcmd("quit\n"); - } - else if(radarmapper.count & 2) - { - localcmd(strcat("defer 1 \"sv_cmd radarmap --flags ", ftos(radarmapper.count), strcat(" --res ", ftos(radarmapper.size_x), " ", ftos(radarmapper.size_y), " --sharpen ", ftos(radarmapper.ltime), " --qual ", ftos(radarmapper.size_z)), "\"\n")); - GotoNextMap(); - } - remove(radarmapper); - radarmapper = world; -} -void RadarMap_Think() -{ - // rough map entity - // cnt: current line - // size: pixel width/height - // maxs: cell width/height - // frame: counter - - float i, x, l; - string si; - - if(self.frame == 0) - { - // initialize - get_mi_min_max_texcoords(1); - self.mins = mi_picmin; - self.maxs_x = (mi_picmax_x - mi_picmin_x) / self.size_x; - self.maxs_y = (mi_picmax_y - mi_picmin_y) / self.size_y; - self.maxs_z = mi_max_z - mi_min_z; - print("Picture mins/maxs: ", ftos(self.maxs_x), " and ", ftos(self.maxs_y), " should match\n"); - self.netname = strzone(strcat("gfx/", mi_shortname, "_radar.xpm")); - if(!(self.count & 1)) - { - self.cnt = fopen(self.netname, FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.tga"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.png"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.jpg"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.tga"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.png"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.jpg"), FILE_READ); - if(self.cnt >= 0) - { - fclose(self.cnt); - - print(self.netname, " already exists, aborting (you may want to specify --force)\n"); - RadarMap_Next(); - return; - } - } - self.cnt = fopen(self.netname, FILE_WRITE); - if(self.cnt < 0) - { - print("Error writing ", self.netname, "\n"); - remove(self); - radarmapper = world; - return; - } - print("Writing to ", self.netname, "...\n"); - fputs(self.cnt, "/* XPM */\n"); - fputs(self.cnt, "static char *RadarMap[] = {\n"); - fputs(self.cnt, "/* columns rows colors chars-per-pixel */\n"); - fputs(self.cnt, strcat("\"", ftos(self.size_x), " ", ftos(self.size_y), " 256 2\",\n")); - for(i = 0; i < 256; ++i) - { - si = substring(doublehex, i*2, 2); - fputs(self.cnt, strcat("\"", si, " c #", si, si, si, "\",\n")); - } - self.frame += 1; - self.nextthink = time; - sharpen_init(self.size_x); - } - else if(self.frame <= self.size_y) - { - // fill the sharpen buffer with this line - sharpen_shift(self.size_x); - i = self.count & 24; - - switch(i) - { - case 0: - default: - for(x = 0; x < self.size_x; ++x) - { - l = RadarMapAtPoint_Block(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z); - sharpen_set(x, l); - } - break; - case 8: - for(x = 0; x < self.size_x; ++x) - { - l = RadarMapAtPoint_Trace(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z); - sharpen_set(x, l); - } - break; - case 16: - for(x = 0; x < self.size_x; ++x) - { - l = RadarMapAtPoint_Sample(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z); - sharpen_set(x, l); - } - break; - case 24: - for(x = 0; x < self.size_x; ++x) - { - l = RadarMapAtPoint_LineBlock(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z); - sharpen_set(x, l); - } - break; - } - - // do we have enough lines? - if(self.frame >= 2) - { - // write a pixel line - fputs(self.cnt, "\""); - for(x = 0; x < self.size_x; ++x) - { - l = sharpen_get(x, self.ltime); - fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2)); - } - if(self.frame == self.size_y) - fputs(self.cnt, "\"\n"); - else - { - fputs(self.cnt, "\",\n"); - print(ftos(self.size_y - self.frame), " lines left\n"); - } - } - - // is this the last line? then write back the missing line - if(self.frame == self.size_y) - { - sharpen_shift(self.size_x); - // write a pixel line - fputs(self.cnt, "\""); - for(x = 0; x < self.size_x; ++x) - { - l = sharpen_get(x, self.ltime); - fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2)); - } - if(self.frame == self.size_y) - fputs(self.cnt, "\"\n"); - else - { - fputs(self.cnt, "\",\n"); - print(ftos(self.size_y - self.frame), " lines left\n"); - } - } - - self.frame += 1; - self.nextthink = time; - } - else - { - // close the file - fputs(self.cnt, "};\n"); - fclose(self.cnt); - print("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n"); - RadarMap_Next(); - } -} - -float RadarMap_Make(float argc) -{ - float i; - - if(!radarmapper) - { - radarmapper = spawn(); - radarmapper.classname = "radarmapper"; - radarmapper.think = RadarMap_Think; - radarmapper.nextthink = time; - radarmapper.count = 8; // default to the --trace method, as it is faster now - radarmapper.ltime = 1; - radarmapper.size = '512 512 1'; - for(i = 1; i < argc; ++i) - { - switch(argv(i)) - { - case "--force": { radarmapper.count |= 1; break; } - case "--loop": { radarmapper.count |= 2; break; } - case "--quit": { radarmapper.count |= 4; break; } - case "--block": { radarmapper.count &~= 24; break; } - case "--trace": { radarmapper.count &~= 24; radarmapper.count |= 8; break; } - case "--sample": { radarmapper.count &~= 24; radarmapper.count |= 16; break; } - case "--lineblock": { radarmapper.count |= 24; break; } - case "--flags": { ++i; radarmapper.count = stof(argv(i)); break; } // for the recursive call - case "--sharpen": { ++i; radarmapper.ltime = stof(argv(i)); break; } // for the recursive call - case "--res": // minor alias - case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; } - case "--qual": // minor alias - case "--quality": { ++i; radarmapper.size_z = stof(argv(i)); break; } - - default: - i = argc; - remove(radarmapper); - radarmapper = world; - break; - } - } - - if(radarmapper) // after doing the arguments, see if we successfully went forward. - { - print("Radarmap entity spawned.\n"); - return TRUE; // if so, don't print usage. - } - } - - return FALSE; -} \ No newline at end of file diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 7d24f2e5a..622fa2e88 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -3,21 +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); - -void race_deleteTime(string map, float pos); - -#define SHUFFLETEAMS_MAX_PLAYERS 255 -#define SHUFFLETEAMS_MAX_TEAMS 4 -float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player slots -float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams - - // ============================ // Misc. Supporting Functions // ============================ diff --git a/qcsrc/server/command/sv_cmd.qh b/qcsrc/server/command/sv_cmd.qh index 7d24f2e5a..41981a594 100644 --- a/qcsrc/server/command/sv_cmd.qh +++ b/qcsrc/server/command/sv_cmd.qh @@ -16,1995 +16,3 @@ void race_deleteTime(string map, float pos); #define SHUFFLETEAMS_MAX_TEAMS 4 float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player slots float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams - - -// ============================ -// Misc. Supporting Functions -// ============================ - -// used by GameCommand_make_mapinfo() -void make_mapinfo_Think() -{ - if(MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1)) - { - print("Done rebuiling mapinfos.\n"); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); - remove(self); - } - else - { - self.think = make_mapinfo_Think; - self.nextthink = time; - } -} - -// used by GameCommand_extendmatchtime() and GameCommand_reducematchtime() -void changematchtime(float delta, float mi, float ma) -{ - float cur; - float new; - float lim; - - if(delta == 0) - return; - if(autocvar_timelimit < 0) - return; - - if(mi <= 10) - mi = 10; // at least ten sec in the future - cur = time - game_starttime; - if(cur > 0) - mi += cur; // from current time! - - lim = autocvar_timelimit * 60; - - if(delta > 0) - { - if(lim == 0) - return; // cannot increase any further - else if(lim < ma) - new = min(ma, lim + delta); - else // already above maximum: FAIL - return; - } - else - { - if(lim == 0) // infinite: try reducing to max, if we are allowed to - new = max(mi, ma); - else if(lim > mi) // above minimum: decrease - new = max(mi, lim + delta); - else // already below minimum: FAIL - return; - } - - cvar_set("timelimit", ftos(new / 60)); -} - -// used by GameCommand_modelbug() // TODO: is this even needed? -float g_clientmodel_genericsendentity (entity to, float sf); -void modelbug_make_svqc(); -void modelbug_make_csqc() -{ - Net_LinkEntity(self, TRUE, 0, g_clientmodel_genericsendentity); - self.think = modelbug_make_svqc; - self.nextthink = time + 1; - setorigin(self, self.origin - '0 0 8'); -} -void modelbug_make_svqc() -{ - self.SendEntity = func_null; - self.think = modelbug_make_csqc; - self.nextthink = time + 1; - setorigin(self, self.origin + '0 0 8'); -} -void modelbug() -{ - entity e; - e = spawn(); - setorigin(e, nextent(world).origin); - precache_model("models_portal.md3"); - setmodel(e, "models/portal.md3"); - e.think = modelbug_make_svqc; - e.nextthink = time + 1; -} - - -// ======================= -// Command Sub-Functions -// ======================= - -void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plus support multiple clients at once like moveplayer -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - float entno = stof(argv(1)); - float n, i; - string s; - - if(argc >= 3 && argc <= 4) { - if((entno < 0) | (entno > maxclients)) { - print("Player ", argv(1), " doesn't exist\n"); - return; - } - n = 0; - for(i = (entno ? entno : 1); i <= (entno ? entno : maxclients); ++i) - { - client = edict_num(i); - if(client.flags & FL_CLIENT) - { - if(argc == 4) - { - // make the string console safe - s = argv(2); - s = strreplace("\n", "", s); - s = strreplace("\\", "\\\\", s); - s = strreplace("$", "$$", s); - s = strreplace("\"", "\\\"", s); - stuffcmd(client, sprintf("\ninfobar %f \"%s\"\n", stof(argv(3)), s)); - } - else - { - centerprint(client, strcat("^3", admin_name(), ":\n\n^7", argv(2))); - sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n")); - } - dprint("Message sent to ", client.netname, "\n"); - ++n; - } - } - if(!n) { print(strcat("Client (", argv(1) ,") not found.\n")); } - return; - } - } - - default: - print("Incorrect parameters for ^2adminmsg^7\n"); - case GC_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"); - print(" Otherwise, it will just be sent as a centerprint message.\n"); - print("Examples: adminmsg 4 \"this infomessage will last for ten seconds\" 10\n"); - print(" adminmsg 2 \"this message will be a centerprint\"\n"); - return; - } - } -} - -void GameCommand_allready(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - ReadyRestart(); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd allready\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_allspec(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - string reason = argv(1); - float i; - - FOR_EACH_REALPLAYER(client) - { - self = client; - PutObserverInServer(); - ++i; - } - if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); } - else { print("No players found to spectate.\n"); } - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd allspec [reason]\n"); - print(" Where 'reason' is an optional argument for explanation of allspec command.\n"); - print("See also: ^2moveplayer, shuffleteams^7\n"); - return; - } - } -} - -void GameCommand_anticheat(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - float entno = stof(argv(1)); - - if((entno < 1) | (entno > maxclients)) { - print("Player ", argv(1), " doesn't exist\n"); - return; - } - client = edict_num(entno); - if(clienttype(client) != CLIENTTYPE_REAL || clienttype(client) != CLIENTTYPE_BOT) { - print("Player ", client.netname, " is not active\n"); - return; - } - self = client; - anticheat_report(); - return; - } - - default: - print("Incorrect parameters for ^2anticheat^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd anticheat clientnumber\n"); - print(" where 'clientnumber' is player entity number.\n"); - return; - } - } -} - -void GameCommand_bbox(float request) -{ - switch(request) - { - case GC_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"); - print("Currently set size: ", ftos(world.mins_x), " ", ftos(world.mins_y), " ", ftos(world.mins_z)); - print(" ", ftos(world.maxs_x), " ", ftos(world.maxs_y), " ", ftos(world.maxs_z), "\n"); - print("Solid bounding box size:"); - - tracebox('1 0 0' * world.absmin_x, - '0 1 0' * world.absmin_y + '0 0 1' * world.absmin_z, - '0 1 0' * world.absmax_y + '0 0 1' * world.absmax_z, - '1 0 0' * world.absmax_x, - MOVE_WORLDONLY, - world); - if(trace_startsolid) - print(" ", ftos(world.absmin_x)); - else - print(" ", ftos(trace_endpos_x)); - - tracebox('0 1 0' * world.absmin_y, - '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z, - '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z, - '0 1 0' * world.absmax_y, - MOVE_WORLDONLY, - world); - if(trace_startsolid) - print(" ", ftos(world.absmin_y)); - else - print(" ", ftos(trace_endpos_y)); - - tracebox('0 0 1' * world.absmin_z, - '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y, - '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y, - '0 0 1' * world.absmax_z, - MOVE_WORLDONLY, - world); - if(trace_startsolid) - print(" ", ftos(world.absmin_z)); - else - print(" ", ftos(trace_endpos_z)); - - tracebox('1 0 0' * world.absmax_x, - '0 1 0' * world.absmin_y + '0 0 1' * world.absmin_z, - '0 1 0' * world.absmax_y + '0 0 1' * world.absmax_z, - '1 0 0' * world.absmin_x, - MOVE_WORLDONLY, - world); - if(trace_startsolid) - print(" ", ftos(world.absmax_x)); - else - print(" ", ftos(trace_endpos_x)); - - tracebox('0 1 0' * world.absmax_y, - '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z, - '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z, - '0 1 0' * world.absmin_y, - MOVE_WORLDONLY, - world); - if(trace_startsolid) - print(" ", ftos(world.absmax_y)); - else - print(" ", ftos(trace_endpos_y)); - - tracebox('0 0 1' * world.absmax_z, - '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y, - '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y, - '0 0 1' * world.absmin_z, - MOVE_WORLDONLY, - world); - if(trace_startsolid) - print(" ", ftos(world.absmax_z)); - else - print(" ", ftos(trace_endpos_z)); - - print("\n"); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd bbox\n"); - print(" No arguments required.\n"); - print("See also: ^2gettaginfo^7\n"); - return; - } - } -} - -void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code. -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity bot; - - if(argv(1) == "reset") - { - bot_resetqueues(); - return; - } - else if(argv(1) == "load" && argc == 3) - { - float fh, i; - string s; - fh = fopen(argv(2), FILE_READ); - if(fh < 0) - { - print("cannot open the file\n"); - return; - } - - i = 0; - while((s = fgets(fh))) - { - argc = tokenize_console(s); - - if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd") - { - if(argv(2) == "reset") - { - bot_resetqueues(); - } - else if(argv(2) == "setbots") - { - cvar_settemp("minplayers", "0"); - cvar_settemp("bot_number", argv(3)); - if(!bot_fixcount()) - print("Sorry, could not set requested bot count\n"); - } - else - { - // let's start at token 2 so we can skip sv_cmd bot_cmd - bot = find_bot_by_number(stof(argv(2))); - if(bot == world) - bot = find_bot_by_name(argv(2)); - if(bot) - bot_queuecommand(bot, strcat(argv(3), " ", argv(4))); - } - } - else - localcmd(strcat(s, "\n")); - - ++i; - } - print(ftos(i), " commands read\n"); - fclose(fh); - return; - } - else if(argv(1) == "help") - { - if(argv(2)) - bot_cmdhelp(argv(2)); - else - bot_list_commands(); - return; - } - else if(argc >= 3) // this comes last - { - bot = find_bot_by_number(stof(argv(1))); - if(bot == world) - bot = find_bot_by_name(argv(1)); - if(bot) - { - print(strcat("Command '", strcat(argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n")); - bot_queuecommand(bot, strcat(argv(2), " ", argv(3))); - return; - } - else - print(strcat("Error: Can't find bot with the name or id '", argv(1),"' - Did you mistype the command?\n")); // don't return so that usage is shown - } - } - - default: - print("Incorrect parameters for ^2bot_cmd^7\n"); - case GC_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"); - print(" For full list of commands, see bot_cmd help [command].\n"); - print("Examples: bot_cmd cc \"say something\"\n"); - print(" bot_cmd presskey jump\n"); - return; - } - } -} - -void GameCommand_cointoss(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n"); - string result2 = (argv(2) ? strcat("^7", argv(2), "^3!\n") : "^4TAILS^3!\n"); - string choice = ((random() > 0.5) ? result1 : result2); - - FOR_EACH_CLIENT(client) - centerprint(client, strcat("^3Throwing coin... Result: ", choice)); - bprint(strcat("^3Throwing coin... Result: ", choice)); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n"); - print(" Where 'result1' and 'result2' are user created options.\n"); - return; - } - } -} - -void GameCommand_cvar_changes(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - print(cvar_changes); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd cvar_changes\n"); - print(" No arguments required.\n"); - print("See also: ^2cvar_purechanges^7\n"); - return; - } - } -} - -void GameCommand_cvar_purechanges(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - print(cvar_purechanges); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd cvar_purechanges\n"); - print(" No arguments required.\n"); - print("See also: ^2cvar_changes^7\n"); - return; - } - } -} - -void GameCommand_database(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(argc == 3) - { - if(argv(1) == "save") - { - db_save(ServerProgsDB, argv(2)); - print(strcat("Copied serverprogs database to '", argv(2), "' in the data directory.\n")); - return; - } - else if(argv(1) == "dump") - { - db_dump(ServerProgsDB, argv(2)); - print("DB dumped.\n"); // wtf does this do? - return; - } - else if(argv(1) == "load") - { - db_close(ServerProgsDB); - ServerProgsDB = db_load(argv(2)); - print(strcat("Loaded '", argv(2), "' as new serverprogs database.\n")); - return; - } - } - } - - default: - print("Incorrect parameters for ^2database^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd database action filename\n"); - print(" Where 'action' is the command to complete,\n"); - print(" and 'filename' is what it acts upon.\n"); - print(" Full list of commands here: \"save, dump, load.\"\n"); - return; - } - } -} - -void GameCommand_defer_clear(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - float entno = stof(argv(1)); - - if(argc == 2) - { - // player_id is out of range - if((entno < 1) | (entno > maxclients)) { - print("Player ", argv(1), " doesn't exist\n"); - return; - } - client = edict_num(entno); - if not(client.flags & FL_CLIENT) { - print("Player ", argv(1), " doesn't exist\n"); - return; - } - if(clienttype(client) == CLIENTTYPE_BOT) { - print("Player ", argv(1), " (", client.netname, ") is a bot\n"); - return; - } - stuffcmd(client, "defer clear\n"); - print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n"); - return; - } - } - - default: - print("Incorrect parameters for ^2defer_clear^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd defer_clear clientnumber\n"); - print(" where 'clientnumber' is player entity number.\n"); - print("See also: ^2defer_clear_all^7\n"); - return; - } - } -} - -void GameCommand_defer_clear_all(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - float i; - float argc; - - FOR_EACH_CLIENT(client) - { - argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client)))); - GameCommand_defer_clear(GC_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? - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd defer_clear_all\n"); - print(" No arguments required.\n"); - print("See also: ^2defer_clear^7\n"); - return; - } - } -} - -void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such? -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(argv(1)) - { - if(argv(2)) - race_deleteTime(argv(2), stof(argv(1))); - else - race_deleteTime(GetMapname(), stof(argv(1))); - return; - } - } - - default: - print("Incorrect parameters for ^2delrec^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd delrec ranking [map]\n"); - print(" 'ranking' is which ranking level to clear up to, \n"); - print(" it will clear all records up to nth place.\n"); - print(" if 'map' is not provided it will use current map.\n"); - return; - } - } -} - -void GameCommand_effectindexdump(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - float fh, d; - string s; - - d = db_create(); - print("begin of effects list\n"); - db_put(d, "TE_GUNSHOT", "1"); print("effect TE_GUNSHOT is ", ftos(particleeffectnum("TE_GUNSHOT")), "\n"); - db_put(d, "TE_GUNSHOTQUAD", "1"); print("effect TE_GUNSHOTQUAD is ", ftos(particleeffectnum("TE_GUNSHOTQUAD")), "\n"); - db_put(d, "TE_SPIKE", "1"); print("effect TE_SPIKE is ", ftos(particleeffectnum("TE_SPIKE")), "\n"); - db_put(d, "TE_SPIKEQUAD", "1"); print("effect TE_SPIKEQUAD is ", ftos(particleeffectnum("TE_SPIKEQUAD")), "\n"); - db_put(d, "TE_SUPERSPIKE", "1"); print("effect TE_SUPERSPIKE is ", ftos(particleeffectnum("TE_SUPERSPIKE")), "\n"); - db_put(d, "TE_SUPERSPIKEQUAD", "1"); print("effect TE_SUPERSPIKEQUAD is ", ftos(particleeffectnum("TE_SUPERSPIKEQUAD")), "\n"); - db_put(d, "TE_WIZSPIKE", "1"); print("effect TE_WIZSPIKE is ", ftos(particleeffectnum("TE_WIZSPIKE")), "\n"); - db_put(d, "TE_KNIGHTSPIKE", "1"); print("effect TE_KNIGHTSPIKE is ", ftos(particleeffectnum("TE_KNIGHTSPIKE")), "\n"); - db_put(d, "TE_EXPLOSION", "1"); print("effect TE_EXPLOSION is ", ftos(particleeffectnum("TE_EXPLOSION")), "\n"); - db_put(d, "TE_EXPLOSIONQUAD", "1"); print("effect TE_EXPLOSIONQUAD is ", ftos(particleeffectnum("TE_EXPLOSIONQUAD")), "\n"); - db_put(d, "TE_TAREXPLOSION", "1"); print("effect TE_TAREXPLOSION is ", ftos(particleeffectnum("TE_TAREXPLOSION")), "\n"); - db_put(d, "TE_TELEPORT", "1"); print("effect TE_TELEPORT is ", ftos(particleeffectnum("TE_TELEPORT")), "\n"); - db_put(d, "TE_LAVASPLASH", "1"); print("effect TE_LAVASPLASH is ", ftos(particleeffectnum("TE_LAVASPLASH")), "\n"); - db_put(d, "TE_SMALLFLASH", "1"); print("effect TE_SMALLFLASH is ", ftos(particleeffectnum("TE_SMALLFLASH")), "\n"); - db_put(d, "TE_FLAMEJET", "1"); print("effect TE_FLAMEJET is ", ftos(particleeffectnum("TE_FLAMEJET")), "\n"); - db_put(d, "EF_FLAME", "1"); print("effect EF_FLAME is ", ftos(particleeffectnum("EF_FLAME")), "\n"); - db_put(d, "TE_BLOOD", "1"); print("effect TE_BLOOD is ", ftos(particleeffectnum("TE_BLOOD")), "\n"); - db_put(d, "TE_SPARK", "1"); print("effect TE_SPARK is ", ftos(particleeffectnum("TE_SPARK")), "\n"); - db_put(d, "TE_PLASMABURN", "1"); print("effect TE_PLASMABURN is ", ftos(particleeffectnum("TE_PLASMABURN")), "\n"); - db_put(d, "TE_TEI_G3", "1"); print("effect TE_TEI_G3 is ", ftos(particleeffectnum("TE_TEI_G3")), "\n"); - db_put(d, "TE_TEI_SMOKE", "1"); print("effect TE_TEI_SMOKE is ", ftos(particleeffectnum("TE_TEI_SMOKE")), "\n"); - db_put(d, "TE_TEI_BIGEXPLOSION", "1"); print("effect TE_TEI_BIGEXPLOSION is ", ftos(particleeffectnum("TE_TEI_BIGEXPLOSION")), "\n"); - db_put(d, "TE_TEI_PLASMAHIT", "1"); print("effect TE_TEI_PLASMAHIT is ", ftos(particleeffectnum("TE_TEI_PLASMAHIT")), "\n"); - db_put(d, "EF_STARDUST", "1"); print("effect EF_STARDUST is ", ftos(particleeffectnum("EF_STARDUST")), "\n"); - db_put(d, "TR_ROCKET", "1"); print("effect TR_ROCKET is ", ftos(particleeffectnum("TR_ROCKET")), "\n"); - db_put(d, "TR_GRENADE", "1"); print("effect TR_GRENADE is ", ftos(particleeffectnum("TR_GRENADE")), "\n"); - db_put(d, "TR_BLOOD", "1"); print("effect TR_BLOOD is ", ftos(particleeffectnum("TR_BLOOD")), "\n"); - db_put(d, "TR_WIZSPIKE", "1"); print("effect TR_WIZSPIKE is ", ftos(particleeffectnum("TR_WIZSPIKE")), "\n"); - db_put(d, "TR_SLIGHTBLOOD", "1"); print("effect TR_SLIGHTBLOOD is ", ftos(particleeffectnum("TR_SLIGHTBLOOD")), "\n"); - db_put(d, "TR_KNIGHTSPIKE", "1"); print("effect TR_KNIGHTSPIKE is ", ftos(particleeffectnum("TR_KNIGHTSPIKE")), "\n"); - db_put(d, "TR_VORESPIKE", "1"); print("effect TR_VORESPIKE is ", ftos(particleeffectnum("TR_VORESPIKE")), "\n"); - db_put(d, "TR_NEHAHRASMOKE", "1"); print("effect TR_NEHAHRASMOKE is ", ftos(particleeffectnum("TR_NEHAHRASMOKE")), "\n"); - db_put(d, "TR_NEXUIZPLASMA", "1"); print("effect TR_NEXUIZPLASMA is ", ftos(particleeffectnum("TR_NEXUIZPLASMA")), "\n"); - db_put(d, "TR_GLOWTRAIL", "1"); print("effect TR_GLOWTRAIL is ", ftos(particleeffectnum("TR_GLOWTRAIL")), "\n"); - db_put(d, "TR_SEEKER", "1"); print("effect TR_SEEKER is ", ftos(particleeffectnum("TR_SEEKER")), "\n"); - db_put(d, "SVC_PARTICLE", "1"); print("effect SVC_PARTICLE is ", ftos(particleeffectnum("SVC_PARTICLE")), "\n"); - - fh = fopen("effectinfo.txt", FILE_READ); - while((s = fgets(fh))) - { - tokenize_console(s); - if(argv(0) == "effect") - { - if(db_get(d, argv(1)) != "1") - { - if(particleeffectnum(argv(1)) >= 0) - print("effect ", argv(1), " is ", ftos(particleeffectnum(argv(1))), "\n"); - db_put(d, argv(1), "1"); - } - } - } - print("end of effects list\n"); - - db_close(d); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd effectindexdump\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_extendmatchtime(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd extendmatchtime\n"); - print(" No arguments required.\n"); - print("See also: ^2reducematchtime^7\n"); - return; - } - } -} - -void GameCommand_find(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - - for(client = world; (client = find(client, classname, argv(1))); ) - print(etos(client), "\n"); - - return; - } - - default: - print("Incorrect parameters for ^2find^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd find classname\n"); - print(" Where 'classname' is the classname to search for.\n"); - return; - } - } -} - -void GameCommand_gametype(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - string s = argv(1); - float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype(); - - if(t) - { - MapInfo_SwitchGameType(t); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); - if(MapInfo_count > 0) - bprint("Game type successfully switched to ", s, "\n"); - else - { - bprint("Cannot use this game type: no map for it found\n"); - MapInfo_SwitchGameType(tsave); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); - } - } - else - bprint("Game type switch to ", s, " failed: this type does not exist!\n"); - return; - } - - default: - print("Incorrect parameters for ^2gametype^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd gametype mode\n"); - print(" Where 'mode' is the gametype mode to switch to.\n"); - print("See also: ^2gotomap^7\n"); - return; - } - } -} - -void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: finish usage description for it (but, must first learn this shit) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity tmp_entity; - float i; - vector v; - - if(argc >= 4) - { - tmp_entity = spawn(); - if(argv(1) == "w") - setmodel(tmp_entity, (nextent(world)).weaponentity.model); - else - { - precache_model(argv(1)); - setmodel(tmp_entity, argv(1)); - } - tmp_entity.frame = stof(argv(2)); - if(substring(argv(3), 0, 1) == "#") - i = stof(substring(argv(3), 1, -1)); - else - i = gettagindex(tmp_entity, argv(3)); - if(i) - { - v = gettaginfo(tmp_entity, i); - print("model ", tmp_entity.model, " frame ", ftos(tmp_entity.frame), " tag ", gettaginfo_name); - print(" index ", ftos(i), " parent ", ftos(gettaginfo_parent), "\n"); - print(" vector = ", ftos(v_x), " ", ftos(v_y), " ", ftos(v_z), "\n"); - print(" offset = ", ftos(gettaginfo_offset_x), " ", ftos(gettaginfo_offset_y), " ", ftos(gettaginfo_offset_z), "\n"); - print(" forward = ", ftos(gettaginfo_forward_x), " ", ftos(gettaginfo_forward_y), " ", ftos(gettaginfo_forward_z), "\n"); - print(" right = ", ftos(gettaginfo_right_x), " ", ftos(gettaginfo_right_y), " ", ftos(gettaginfo_right_z), "\n"); - print(" up = ", ftos(gettaginfo_up_x), " ", ftos(gettaginfo_up_y), " ", ftos(gettaginfo_up_z), "\n"); - if(argc >= 6) - { - v_y = -v_y; - localcmd(strcat(argv(4), vtos(v), argv(5), "\n")); - } - } - else - print("bone not found\n"); - - remove(tmp_entity); - return; - } - } - - default: - print("Incorrect parameters for ^2gettaginfo^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd gettaginfo\n"); - print(" FIXME: Arguments currently unknown\n"); - print("See also: ^2bbox^7\n"); - return; - } - } -} - -void GameCommand_gotomap(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(argc == 2) - { - print(GotoMap(argv(1)), "\n"); - return; - } - } - - default: - print("Incorrect parameters for ^2gotomap^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd gotomap map\n"); - print(" Where 'map' is the *.bsp file to change to.\n"); - print("See also: ^2gametype^7\n"); - return; - } - } -} - -void GameCommand_ladder(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - print(ladder_reply); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd ladder\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_lockteams(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(teamplay) - { - lockteams = 1; - bprint("^1The teams are now locked.\n"); - } - else - { - bprint("lockteams command can only be used in a team-based gamemode.\n"); - } - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd lockteams\n"); - print(" No arguments required.\n"); - print("See also: ^2unlockteams^7\n"); - return; - } - } -} - -void GameCommand_make_mapinfo(float request) // UNTESTED -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity tmp_entity; - - tmp_entity = spawn(); - tmp_entity.classname = "make_mapinfo"; - tmp_entity.think = make_mapinfo_Think; - tmp_entity.nextthink = time; // this sucks... todo: re-write this -- Use initializeentity later - MapInfo_Enumerate(); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd make_mapinfo\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_modelbug(float request) // UNTESTED // is this even needed anymore? -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - modelbug(); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd modelbug\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_moveplayer(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - - string targets = strreplace(",", " ", argv(1)); - string original_targets = strreplace(" ", ", ", targets); - string destination = argv(2); - string notify = argv(3); - - string successful, t; - - // lets see if the target(s) even actually exist. - if((targets) && (destination)) - { - for(;targets;) - { - t = car(targets); targets = cdr(targets); - - // Check to see if the player is a valid target - if((GetFilteredNumber(t) < 1) || (GetFilteredNumber(t) > maxclients)) // player_id is out of range - { - print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (out of range)", (targets ? ", skipping to next player.\n" : ".\n")); - continue; - } - client = edict_num(GetFilteredNumber(t)); - if not(client.flags & FL_CLIENT) // player entity is not a client - { - print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (not a client)", (targets ? ", skipping to next player.\n" : ".\n")); - continue; - } - - // Where are we putting this player? - if(destination == "spec" || destination == "spectator") - { - if(client.classname != "spectator" && client.classname != "observer") - { - self = client; - PutObserverInServer(); - - successful = strcat(successful, (successful ? ", " : ""), client.netname); - } - else - { - print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already spectating.\n"); - } - continue; - } - else - { - if(client.classname != "spectator" && client.classname != "observer") - { - if(teamplay) - { - // set up - float team_color; - float save = client.team_forced; - client.team_forced = 0; - - // find the team to move the player to - team_color = ColourToNumber(destination); - if(team_color == client.team) // already on the destination team - { - // keep the forcing undone - print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), (targets ? ", skipping to next player.\n" : ".\n")); - continue; - } - else if(team_color == 0) // auto team - { - team_color = NumberToTeamNumber(FindSmallestTeam(client, FALSE)); - } - else - { - CheckAllowedTeams(client); - } - client.team_forced = save; - - // Check to see if the destination team is even available - switch(team_color) - { - case COLOR_TEAM1: if(c1 == -1) { print("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break; - case COLOR_TEAM2: if(c2 == -1) { print("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break; - case COLOR_TEAM3: if(c3 == -1) { print("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break; - case COLOR_TEAM4: if(c4 == -1) { print("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break; - - default: print("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); return; - } - - // If so, lets continue and finally move the player - client.team_forced = 0; - MoveToTeam(client, team_color, 6, stof(notify)); - successful = strcat(successful, (successful ? ", " : ""), client.netname); - print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n"); - continue; - } - else - { - print("Can't change teams when currently not playing a team game.\n"); - return; - } - } - else - { - print("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P - return; - } - } - } - - if(successful) - bprint("Successfully moved players ", successful, " to destination ", destination, ".\n"); - else - print("No players given (", original_targets, ") are able to move.\n"); - - return; // still correct parameters so return to avoid usage print - } - } - - default: - print("Incorrect parameters for ^2moveplayer^7\n"); - case GC_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"); - print(" 'destination' is what to send the player to, be it team or spectating\n"); - print(" Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n"); - print(" 'notify' is whether or not to send messages notifying of the move. Detail below.\n"); - print(" 0 (00) automove centerprint, admin message; 1 (01) automove centerprint, no admin message\n"); - print(" 2 (10) no centerprint, admin message; 3 (11) no centerprint, no admin message\n"); - print("Examples: moveplayer 1,3,5 red 3\n"); - print(" moveplayer 2 spec \n"); - print("See also: ^2allspec, shuffleteams^7\n"); - return; - } - } -} - -void GameCommand_nospectators(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - blockSpectators = 1; - entity plr; - FOR_EACH_CLIENT(plr) //give every spectator seconds time to become a player - { - if(plr.classname == "spectator" || plr.classname == "observer") - { - plr.spectatortime = time; - sprint(plr, strcat("^7You have to become a player within the next ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds, otherwise you will be kicked, because spectators aren't allowed at this time!\n")); - } - } - bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\n")); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd nospectators\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this be here? Perhaps some mutatorhook call instead.... -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - onslaught_updatelinks(); - print("ONS links updated\n"); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd onslaught_updatelinks\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_playerdemo(float request, float argc) // UNTESTED -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - entity client; - float i, n, entno; - string s; - - switch(argv(1)) - { - case "read": - { - // TODO: Create a general command for looking this up, save a lot of space everywhere in this file - entno = GetFilteredNumber(argv(2)); - if((entno < 1) | (entno > maxclients)) { - print("Player ", argv(2), " doesn't exist\n"); - return; - } - client = edict_num(entno); - if(clienttype(client) != CLIENTTYPE_BOT) { - print("Player ", client.netname, " is not a bot\n"); - return; - } - self = client; - playerdemo_open_read(argv(3)); - return; - } - - case "write": - { - entno = GetFilteredNumber(argv(2)); - if((entno < 1) | (entno > maxclients)) { - print("Player ", argv(2), " doesn't exist\n"); - return; - } - client = edict_num(entno); - self = client; - playerdemo_open_write(argv(3)); - return; - } - - case "auto_read_and_write": - { - s = argv(2); - n = GetFilteredNumber(argv(3)); - cvar_set("bot_number", ftos(n)); - localcmd("wait; wait; wait\n"); - for(i = 0; i < n; ++i) - localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", s, ftos(i+1), "\n"); - localcmd("sv_cmd playerdemo write 1 ", ftos(n+1), "\n"); - return; - } - - case "auto_read": - { - s = argv(2); - n = GetFilteredNumber(argv(3)); - cvar_set("bot_number", ftos(n)); - localcmd("wait; wait; wait\n"); - for(i = 0; i < n; ++i) - localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", s, ftos(i+1), "\n"); - return; - } - - return; - } - } - - default: - print("Incorrect parameters for ^2radarmap^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd \n"); - print(" FIXME: Arguments currently unknown\n"); - return; - } - } -} - -void GameCommand_printstats(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - DumpStats(FALSE); - print("stats dumped.\n"); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd printstats\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_radarmap(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(RadarMap_Make(argc)) - return; - } - - default: - print("Incorrect parameters for ^2radarmap^7\n"); - case GC_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"); - print(" trace supports no quality factor; its result should look like --block with infinite quality factor.\n"); - return; - } - } -} - -void GameCommand_rankings(float request) // this is OLD.... jeez. -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - strunzone(rankings_reply); - rankings_reply = strzone(getrankings()); - print(rankings_reply); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd rankings\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_records(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - float i; - - for (i = 0; i < 10; ++i) - print(records_reply[i]); - - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd records\n"); - print(" No arguments required.\n"); - return; - } - } -} - -void GameCommand_reducematchtime(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd reducematchtime\n"); - print(" No arguments required.\n"); - print("See also: ^2extendmatchtime^7\n"); - return; - } - } -} - -void GameCommand_setbots(float request, float argc) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(argc >= 2) - { - cvar_settemp("minplayers", "0"); - cvar_settemp("bot_number", argv(1)); - bot_fixcount(); - return; - } - } - - default: - print("Incorrect parameters for ^2setbots^7\n"); - case GC_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"); - print("See also: ^2bot_cmd^7\n"); - return; - } - } -} - -void GameCommand_shuffleteams(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(teamplay) - { - entity tmp_player; - float i, x, z, t_teams, t_players, team_color; - - // count the total amount of players and total amount of teams - FOR_EACH_PLAYER(tmp_player) - { - CheckAllowedTeams(tmp_player); - - if(c1 >= 0) t_teams = max(1, t_teams); - if(c2 >= 0) t_teams = max(2, t_teams); - if(c3 >= 0) t_teams = max(3, t_teams); - if(c4 >= 0) t_teams = max(4, t_teams); - - ++t_players; - } - - // build a list of the players in a random order - FOR_EACH_PLAYER(tmp_player) - { - for(;;) - { - i = bound(1, floor(random() * maxclients) + 1, maxclients); - - if(shuffleteams_players[i]) - { - continue; // a player is already assigned to this slot - } - else - { - shuffleteams_players[i] = num_for_edict(tmp_player); - break; - } - } - } - - // finally, from the list made earlier, re-join the players in different order. - for(i = 1; i <= t_teams; ++i) - { - // find out how many players to assign to this team - x = (t_players / t_teams); - x = ((i == 1) ? ceil(x) : floor(x)); - - team_color = NumberToTeamNumber(i); - - // sort through the random list of players made earlier - for(z = 1; z <= maxclients; ++z) - { - if not(shuffleteams_teams[i] >= x) - { - if not(shuffleteams_players[z]) - continue; // not a player, move on to next random slot - - self = edict_num(shuffleteams_players[z]); // TODO: add sanity checks for this entity to make sure it's okay and not some error. - - if(self.team != team_color) - MoveToTeam(self, team_color, 6, 0); - - shuffleteams_players[z] = 0; - shuffleteams_teams[i] = shuffleteams_teams[i] + 1; - } - else - { - break; // move on to next team - } - } - } - - bprint("Successfully shuffled the players around randomly.\n"); - - // clear the buffers now - for (i=0; i 0) - dq += dqf * trace_fraction; - dqf *= 0.5; - q0 = q; - } - if(dq > 0) - { - print("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); - print("could go ", ftos(dq), " units further to ", vtos(q), "\n"); - break; - } - } - } - } - return; - } - - case "debug2": - { - e = nextent(world); - tracebox(e.origin + '0 0 32', e.mins, e.maxs, e.origin + '0 0 -1024', MOVE_NORMAL, e); - vv = trace_endpos; - if(trace_fraction == 1) - { - print("not above ground, aborting\n"); - return; - } - f = 0; - for(i = 0; i < 100000; ++i) - { - dv = randomvec(); - if(dv_z > 0) - dv = -1 * dv; - tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e); - if(trace_startsolid) - print("bug 1\n"); - if(trace_fraction == 1) - if(dv_z < f) - { - print("bug 2: ", ftos(dv_x), " ", ftos(dv_y), " ", ftos(dv_z)); - print(" (", ftos(asin(dv_z / vlen(dv)) * 180 / M_PI), " degrees)\n"); - f = dv_z; - } - } - print("highest possible dist: ", ftos(f), "\n"); - return; - } - - case "walk": - { - if(argc == 3) - { - e = nextent(world); - if(tracewalk(e, stov(argv(1)), e.mins, e.maxs, stov(argv(2)), MOVE_NORMAL)) - print("can walk\n"); - else - print("cannot walk\n"); - return; - } - } - - case "showline": - { - if(argc == 3) - { - vv = stov(argv(1)); - dv = stov(argv(2)); - traceline(vv, dv, MOVE_NORMAL, world); - trailparticles(world, particleeffectnum("TR_NEXUIZPLASMA"), vv, trace_endpos); - trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv); - return; - } - } - - // no default case, just go straight to invalid - } - } - - default: - print("Incorrect parameters for ^2trace^7\n"); - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd trace command [arguments]\n"); - print(" FIXME: Arguments currently unknown\n"); - return; - } - } -} - -void GameCommand_unlockteams(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - if(teamplay) - { - lockteams = 0; - bprint("^1The teams are now unlocked.\n"); - } - else - { - bprint("unlockteams command can only be used in a team-based gamemode.\n"); - } - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd unlockteams\n"); - print(" No arguments required.\n"); - print("See also: ^2lockteams^7\n"); - return; - } - } -} - -void GameCommand_warp(float request, float argc) -{ - switch (request) - { - case GC_REQUEST_COMMAND: - { - if(autocvar_g_campaign) - { - if(argc >= 2) - { - CampaignLevelWarp(stof(argv(1))); - print("Successfully warped to campaign level ", stof(argv(1)), ".\n"); - } - else - { - CampaignLevelWarp(-1); - print("Successfully warped to next campaign level.\n"); - } - } - else - print("Not in campaign, can't level warp\n"); - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd level\n"); - print(" 'level' is the level to change campaign mode to.\n"); - return; - } - } -} - -/* use this when creating a new command, making sure to place it in alphabetical order. -void GameCommand_(float request) -{ - switch(request) - { - case GC_REQUEST_COMMAND: - { - - return; - } - - default: - case GC_REQUEST_USAGE: - { - print("\nUsage:^3 sv_cmd \n"); - print(" No arguments required.\n"); - return; - } - } -} -*/ - - -// ================================== -// Macro system for server commands -// ================================== - -// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -#define SERVER_COMMANDS(request,arguments,command) \ - SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \ - SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \ - SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \ - SERVER_COMMAND("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \ - SERVER_COMMAND("bbox", GameCommand_bbox(request), "Print detailed information about world size") \ - SERVER_COMMAND("bot_cmd", GameCommand_bot_cmd(request, arguments), "Control and send commands to bots") \ - SERVER_COMMAND("cointoss", GameCommand_cointoss(request, arguments), "Flip a virtual coin and give random result") \ - SERVER_COMMAND("cvar_changes", GameCommand_cvar_changes(request), "Prints a list of all changed server cvars") \ - SERVER_COMMAND("cvar_purechanges", GameCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \ - SERVER_COMMAND("database", GameCommand_database(request, arguments), "Extra controls of the serverprogs database") \ - SERVER_COMMAND("defer_clear", GameCommand_defer_clear(request, arguments), "Clear all queued defer commands for a specific client") \ - SERVER_COMMAND("defer_clear_all", GameCommand_defer_clear_all(request), "Clear all queued defer commands for all clients") \ - SERVER_COMMAND("delrec", GameCommand_delrec(request, arguments), "Delete race time record for a map") \ - SERVER_COMMAND("effectindexdump", GameCommand_effectindexdump(request), "Dump list of effects from code and effectinfo.txt") \ - SERVER_COMMAND("extendmatchtime", GameCommand_extendmatchtime(request), "Increase the timelimit value incrementally") \ - SERVER_COMMAND("find", GameCommand_find(request, arguments), "Search through entities for matching classname") \ - SERVER_COMMAND("gametype", GameCommand_gametype(request, arguments), "Simple command to change the active gametype") \ - SERVER_COMMAND("gettaginfo", GameCommand_gettaginfo(request, arguments), "Get specific information about a weapon model") \ - SERVER_COMMAND("gotomap", GameCommand_gotomap(request, arguments), "Simple command to switch to another map") \ - SERVER_COMMAND("ladder", GameCommand_ladder(request), "Get information about top players if supported") \ - SERVER_COMMAND("lockteams", GameCommand_lockteams(request), "Disable the ability for players to switch or enter teams") \ - SERVER_COMMAND("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \ - SERVER_COMMAND("modelbug", GameCommand_modelbug(request), "TODO foobar") \ - SERVER_COMMAND("moveplayer", GameCommand_moveplayer(request, arguments), "Change the team/status of a player") \ - SERVER_COMMAND("nospectators", GameCommand_nospectators(request), "Automatically remove spectators from a match") \ - SERVER_COMMAND("onslaught_updatelinks", GameCommand_onslaught_updatelinks(request), "Refresh link status for onslaught") \ - SERVER_COMMAND("playerdemo", GameCommand_playerdemo(request, arguments), "Control the ability to save demos of players") \ - SERVER_COMMAND("printstats", GameCommand_printstats(request), "TODO foobar") \ - SERVER_COMMAND("radarmap", GameCommand_radarmap(request, arguments), "Generate a radar image of the map") \ - SERVER_COMMAND("rankings", GameCommand_rankings(request), "Print information about rankings") \ - SERVER_COMMAND("records", GameCommand_records(request), "List top 10 records for the current map") \ - SERVER_COMMAND("reducematchtime", GameCommand_reducematchtime(request), "Decrease the timelimit value incrementally") \ - SERVER_COMMAND("setbots", GameCommand_setbots(request, arguments), "Adjust how many bots are in the match") \ - SERVER_COMMAND("shuffleteams", GameCommand_shuffleteams(request), "Randomly move players to different teams") \ - SERVER_COMMAND("stuffto", GameCommand_stuffto(request, arguments), "Send a command to be executed on a client") \ - SERVER_COMMAND("teamstatus", GameCommand_teamstatus(request), "Show information about player and team scores") \ - SERVER_COMMAND("time", GameCommand_time(request), "Print different formats/readouts of time") \ - SERVER_COMMAND("trace", GameCommand_trace(request, arguments), "Various debugging tools with tracing") \ - SERVER_COMMAND("unlockteams", GameCommand_unlockteams(request), "Enable the ability for players to switch or enter teams") \ - SERVER_COMMAND("warp", GameCommand_warp(request, arguments), "Choose different level in campaign") \ - SERVER_COMMAND("vote", VoteCommand(request, world, arguments, command), "Server side control of voting") /* handled in server/vote.qc */ \ - /* nothing */ - -void GameCommand_macro_help() -{ - #define SERVER_COMMAND(name,function,description) \ - { print(" ^2", name, "^7: ", description, "\n"); } - - SERVER_COMMANDS(0, 0, "") - #undef SERVER_COMMAND - - return; -} - -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) - #undef SERVER_COMMAND - - return FALSE; -} - -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, "") - #undef SERVER_COMMAND - - return FALSE; -} - - -// ========================================= -// Main Function Called By Engine (sv_cmd) -// ========================================= -// If this function exists, game code handles gamecommand instead of the engine code. - -void GameCommand(string command) -{ - float argc = tokenize_console(command); - - if(strtolower(argv(0)) == "help") - { - if(argc == 1) - { - print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n"); - GameCommand_macro_help(); - - GameCommand_Ban("help"); - GameCommand_Generic("help"); - print("For help about specific commands, type sv_cmd help COMMAND\n"); - return; - } - else if(GameCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it - { - return; - } - } - else if(GameCommand_Ban(command)) - { - return; // handled by server/ipban.qc - } - else if(GameCommand_Generic(command)) - { - return; // handled by common/gamecommand.qc - } - else if(GameCommand_macro_command(argc, command)) // continue as usual and scan for normal commands - { - return; // handled by one of the above GameCommand_* functions - } - - // nothing above caught the command, must be invalid - print("Unknown server command", ((command != "") ? strcat(" \"", command, "\"") : ""), ". For a list of supported commands, try sv_cmd help.\n"); - - return; -} \ No newline at end of file diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 2ed9f4f9e..f511db548 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -3,22 +3,6 @@ // Last updated: December 10th, 2011 // ============================================= -#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 - -#define VOTE_SELECT_ABSTAIN -2 -#define VOTE_SELECT_REJECT -1 -#define VOTE_SELECT_NULL 0 -#define VOTE_SELECT_ACCEPT 1 - -string vote_parsed_command; -string vote_parsed_display; - - // ============================================= // Nagger for players to know status of voting // ============================================= diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh index fb34ba2f9..c23431827 100644 --- a/qcsrc/server/command/vote.qh +++ b/qcsrc/server/command/vote.qh @@ -1,3 +1,18 @@ +#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 + +#define VOTE_SELECT_ABSTAIN -2 +#define VOTE_SELECT_REJECT -1 +#define VOTE_SELECT_NULL 0 +#define VOTE_SELECT_ACCEPT 1 + +string vote_parsed_command; +string vote_parsed_display; + float votecalled; string votecalledvote; string votecalledvote_display; diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index fa29804bf..72fac171b 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -36,6 +36,12 @@ campaign.qh ../common/mapinfo.qh ../common/util.qc +command/common.qh +command/radarmap.qh +command/vote.qh +command/cmd.qh +command/sv_cmd.qh + accuracy.qh csqcprojectile.qh csqceffects.qc @@ -58,8 +64,6 @@ race.qh antilag.qh -vote.qh - playerdemo.qh // singleplayer stuff @@ -132,19 +136,17 @@ g_hook.qc t_swamp.qc -clientcommands.qc - -vote.qc - campaign.qc ../common/campaign_file.qc ../common/campaign_setup.qc ../common/urllib.qc ../common/gamecommand.qc -gamecommand.qc - -radarmap.qc +command/common.qc +command/radarmap.qc +command/vote.qc +command/cmd.qc +command/sv_cmd.qc assault.qc -- 2.39.2