// Last updated: December 28th, 2011
// ==============================================
+#include "../../common/command/command.qh"
+#include "cl_cmd.qh"
+
+#include "../autocvars.qh"
+#include "../defs.qh"
+#include "../hud.qh"
+#include "../hud_config.qh"
+#include "../main.qh"
+#include "../mapvoting.qh"
+#include "../miscfunctions.qh"
+
+#include "../mutators/events.qh"
+
+#include "../../common/mapinfo.qh"
+
+#include "../../common/command/generic.qh"
+
void DrawDebugModel()
{
if(time - floor(time) > 0.5)
// Command Sub-Functions
// =======================
-void LocalCommand_blurtest(float request)
+void LocalCommand_blurtest(int request)
{
// Simple command to work with postprocessing temporarily... possibly completely pointless, the glsl shader is used for a real feature now...
// Anyway, to enable it, just compile the client with -DBLURTEST and then you can use the command.
blurtest_time1 = time + stof(argv(1));
blurtest_radius = stof(argv(2));
blurtest_power = stof(argv(3));
- print("Enabled blurtest\n");
+ LOG_INFO("Enabled blurtest\n");
return;
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd blurtest\n");
- print(" No arguments required.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd blurtest\n");
+ LOG_INFO(" No arguments required.\n");
return;
}
}
#else
if(request)
{
- print("Blurtest is not enabled on this client.\n");
+ LOG_INFO("Blurtest is not enabled on this client.\n");
return;
}
#endif
}
-void LocalCommand_boxparticles(float request, float argc)
+void LocalCommand_boxparticles(int request, int argc)
{
switch(request)
{
{
if (argc == 9)
{
- float effect = particleeffectnum(argv(1));
+ int effect = _particleeffectnum(argv(1));
if (effect >= 0)
{
- float index = stof(argv(2));
+ int index = stoi(argv(2));
entity own;
if(index <= 0)
own = entitybyindex(-index);
vector org_to = stov(argv(4));
vector dir_from = stov(argv(5));
vector dir_to = stov(argv(6));
- float countmultiplier = stof(argv(7));
- float flags = stof(argv(8));
+ int countmultiplier = stoi(argv(7));
+ int flags = stoi(argv(8));
boxparticles(effect, own, org_from, org_to, dir_from, dir_to, countmultiplier, flags);
return;
}
}
default:
- print("Incorrect parameters for ^2boxparticles^7\n");
+ LOG_INFO("Incorrect parameters for ^2boxparticles^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n");
- print(" 'effectname' is the name of a particle effect in effectinfo.txt\n");
- print(" 'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n");
- print(" 'org_from' is the starting origin of the box\n");
- print(" 'org_to' is the ending origin of the box\n");
- print(" 'dir_from' is the minimum velocity\n");
- print(" 'dir_to' is the maximum velocity\n");
- print(" 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n");
- print(" 'flags' can contain:\n");
- print(" 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n");
- print(" 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n");
- print(" 4 to respect globals particles_fade (set right before via prvm_globalset client)\n");
- print(" 128 to draw a trail, not a box\n");
+ LOG_INFO("\nUsage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n");
+ LOG_INFO(" 'effectname' is the name of a particle effect in effectinfo.txt\n");
+ LOG_INFO(" 'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n");
+ LOG_INFO(" 'org_from' is the starting origin of the box\n");
+ LOG_INFO(" 'org_to' is the ending origin of the box\n");
+ LOG_INFO(" 'dir_from' is the minimum velocity\n");
+ LOG_INFO(" 'dir_to' is the maximum velocity\n");
+ LOG_INFO(" 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n");
+ LOG_INFO(" 'flags' can contain:\n");
+ LOG_INFO(" 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n");
+ LOG_INFO(" 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n");
+ LOG_INFO(" 4 to respect globals particles_fade (set right before via prvm_globalset client)\n");
+ LOG_INFO(" 128 to draw a trail, not a box\n");
return;
}
}
}
-void LocalCommand_create_scrshot_ent(float request)
+void LocalCommand_create_scrshot_ent(int request)
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- float fh;
string filename = strcat(MapInfo_Map_bspname, "_scrshot_ent.txt");
- fh = fopen(filename, FILE_WRITE);
+ int fh = fopen(filename, FILE_WRITE);
if(fh >= 0)
{
fputs(fh, "{\n");
fputs(fh, strcat("\"classname\" \"info_autoscreenshot\"\n"));
- fputs(fh, strcat("\"origin\" \"", strcat(ftos(view_origin_x), " ", ftos(view_origin_y), " ", ftos(view_origin_z)), "\"\n"));
- fputs(fh, strcat("\"angles\" \"", strcat(ftos(view_angles_x), " ", ftos(view_angles_y), " ", ftos(view_angles_z)), "\"\n"));
+ fputs(fh, strcat("\"origin\" \"", strcat(ftos(view_origin.x), " ", ftos(view_origin.y), " ", ftos(view_origin.z)), "\"\n"));
+ fputs(fh, strcat("\"angles\" \"", strcat(ftos(view_angles.x), " ", ftos(view_angles.y), " ", ftos(view_angles.z)), "\"\n"));
fputs(fh, "}\n");
- print("Completed screenshot entity dump in ^2data/data/", MapInfo_Map_bspname, "_scrshot_ent.txt^7.\n");
+ LOG_INFO("Completed screenshot entity dump in ^2data/data/", MapInfo_Map_bspname, "_scrshot_ent.txt^7.\n");
fclose(fh);
}
else
{
- print("^1Error: ^7Could not dump to file!\n");
+ LOG_INFO("^1Error: ^7Could not dump to file!\n");
}
return;
}
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd create_scrshot_ent\n");
- print(" No arguments required.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd create_scrshot_ent\n");
+ LOG_INFO(" No arguments required.\n");
return;
}
}
}
-void LocalCommand_debugmodel(float request, float argc)
+void LocalCommand_debugmodel(int request, int argc)
{
switch(request)
{
default:
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd debugmodel model\n");
- print(" Where 'model' is a string of the model name to use for the debug model.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd debugmodel model\n");
+ LOG_INFO(" Where 'model' is a string of the model name to use for the debug model.\n");
return;
}
}
}
-void LocalCommand_handlevote(float request, float argc)
+void LocalCommand_handlevote(int request, int argc)
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- float vote_selection;
+ int vote_selection;
string vote_string;
if(InterpretBoolean(argv(1)))
}
default:
- print("Incorrect parameters for ^2handlevote^7\n");
+ LOG_INFO("Incorrect parameters for ^2handlevote^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd handlevote vote\n");
- print(" Where 'vote' is the selection for either the current poll or uid2name.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd handlevote vote\n");
+ LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name.\n");
return;
}
}
}
-void LocalCommand_hud(float request, float argc)
+void LocalCommand_hud(int request, int argc)
{
switch(request)
{
return;
}
+ case "quickmenu":
+ {
+ if(QuickMenu_IsOpened())
+ QuickMenu_Close();
+ else
+ QuickMenu_Open(argv(2), argv(3)); // mode, submenu
+ return;
+ }
+
+ case "minigame":
+ {
+ if(HUD_MinigameMenu_IsOpened())
+ HUD_MinigameMenu_Close();
+ else
+ HUD_MinigameMenu_Open();
+ return;
+ }
+
case "save":
{
if(argv(2))
case "radar":
{
if(argv(2))
- hud_panel_radar_maximized = InterpretBoolean(argv(2));
+ HUD_Radar_Show_Maximized(InterpretBoolean(argv(2)),0);
else
- hud_panel_radar_maximized = !hud_panel_radar_maximized;
+ HUD_Radar_Show_Maximized(!hud_panel_radar_maximized,0);
+ return;
+ }
+
+ case "clickradar":
+ {
+ HUD_Radar_Show_Maximized(!hud_panel_radar_mouse,1);
return;
}
}
}
default:
- print("Incorrect parameters for ^2hud^7\n");
+ LOG_INFO("Incorrect parameters for ^2hud^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
- print(" Where 'action' is the command to complete,\n");
- print(" 'configname' is the name to save to for \"save\" action,\n");
- print(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
- print(" and 'layout' is how to organize the scoreboard columns for the set action.\n");
- print(" Full list of commands here: \"configure, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
+ LOG_INFO("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
+ LOG_INFO(" Where 'action' is the command to complete,\n");
+ LOG_INFO(" 'configname' is the name to save to for \"save\" action,\n");
+ LOG_INFO(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
+ LOG_INFO(" and 'layout' is how to organize the scoreboard columns for the set action.\n");
+ LOG_INFO(" quickmenu [[default | file | \"\"] submenu]\n");
+ LOG_INFO(" Called without options (or with "") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n");
+ LOG_INFO(" Submenu option allows to open quickmenu directly in a submenu, it requires to specify 'default', 'file' or '\"\"' option.\n");
+ LOG_INFO(" Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
return;
}
}
}
-void LocalCommand_localprint(float request, float argc)
+void LocalCommand_localprint(int request, int argc)
{
switch(request)
{
}
default:
- print("Incorrect parameters for ^2localprint^7\n");
+ LOG_INFO("Incorrect parameters for ^2localprint^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd localprint \"message\"\n");
- print(" 'message' is the centerprint message to send to yourself.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd localprint \"message\"\n");
+ LOG_INFO(" 'message' is the centerprint message to send to yourself.\n");
return;
}
}
}
-void LocalCommand_mv_download(float request, float argc)
+void LocalCommand_mv_download(int request, int argc)
{
switch(request)
{
}
default:
- print("Incorrect parameters for ^2mv_download^7\n");
+ LOG_INFO("Incorrect parameters for ^2mv_download^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd mv_download mapid\n");
- print(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd mv_download mapid\n");
+ LOG_INFO(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
return;
}
}
}
-void LocalCommand_sendcvar(float request, float argc)
+void LocalCommand_find(int request, int argc)
+{
+ switch(request)
+ {
+ case CMD_REQUEST_COMMAND:
+ {
+ entity client;
+
+ for(client = world; (client = find(client, classname, argv(1))); )
+ LOG_INFO(etos(client), "\n");
+
+ return;
+ }
+
+ default:
+ LOG_INFO("Incorrect parameters for ^2find^7\n");
+ case CMD_REQUEST_USAGE:
+ {
+ LOG_INFO("\nUsage:^3 cl_cmd find classname\n");
+ LOG_INFO(" Where 'classname' is the classname to search for.\n");
+ return;
+ }
+ }
+}
+
+void LocalCommand_sendcvar(int request, int argc)
{
switch(request)
{
}
default:
- print("Incorrect parameters for ^2sendcvar^7\n");
+ LOG_INFO("Incorrect parameters for ^2sendcvar^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd sendcvar <cvar>\n");
- print(" Where 'cvar' is the cvar plus arguments to send to the server.\n");
+ LOG_INFO("\nUsage:^3 cl_cmd sendcvar <cvar>\n");
+ LOG_INFO(" Where 'cvar' is the cvar plus arguments to send to the server.\n");
return;
}
}
/* use this when creating a new command, making sure to place it in alphabetical order... also,
** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
-void LocalCommand_(float request)
+void LocalCommand_(int request)
{
switch(request)
{
CLIENT_COMMAND("handlevote", LocalCommand_handlevote(request, arguments), "System to handle selecting a vote or option") \
CLIENT_COMMAND("hud", LocalCommand_hud(request, arguments), "Commands regarding/controlling the HUD system") \
CLIENT_COMMAND("localprint", LocalCommand_localprint(request, arguments), "Create your own centerprint sent to yourself") \
+ CLIENT_COMMAND("find", LocalCommand_find(request, arguments), "Search through entities for matching classname") \
CLIENT_COMMAND("mv_download", LocalCommand_mv_download(request, arguments), "Retrieve mapshot picture from the server") \
CLIENT_COMMAND("sendcvar", LocalCommand_sendcvar(request, arguments), "Send a cvar to the server (like weaponpriority)") \
/* nothing */
void LocalCommand_macro_help()
{
#define CLIENT_COMMAND(name,function,description) \
- { if(strtolower(description) != "") { print(" ^2", name, "^7: ", description, "\n"); } }
+ { if(strtolower(description) != "") { LOG_INFO(" ^2", name, "^7: ", description, "\n"); } }
- CLIENT_COMMANDS(0, 0)
+ CLIENT_COMMANDS(0, 0);
#undef CLIENT_COMMAND
return;
}
-float LocalCommand_macro_command(float argc)
+bool LocalCommand_macro_command(int argc)
{
#define CLIENT_COMMAND(name,function,description) \
- { if(name == strtolower(argv(0))) { function; return TRUE; } }
+ { if(name == strtolower(argv(0))) { function; return true; } }
- CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc)
+ CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc);
#undef CLIENT_COMMAND
- return FALSE;
+ return false;
}
-float LocalCommand_macro_usage(float argc)
+bool LocalCommand_macro_usage(int argc)
{
#define CLIENT_COMMAND(name,function,description) \
- { if(name == strtolower(argv(1))) { function; return TRUE; } }
+ { if(name == strtolower(argv(1))) { function; return true; } }
- CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc)
+ CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc);
#undef CLIENT_COMMAND
- return FALSE;
+ return false;
}
-void LocalCommand_macro_write_aliases(float fh)
+void LocalCommand_macro_write_aliases(int fh)
{
#define CLIENT_COMMAND(name,function,description) \
{ if(strtolower(description) != "") { CMD_Write_Alias("qc_cmd_cl", name, description); } }
- CLIENT_COMMANDS(0, 0)
+ CLIENT_COMMANDS(0, 0);
#undef CLIENT_COMMAND
return;
void GameCommand(string command)
{
- float argc = tokenize_console(command);
+ int argc = tokenize_console(command);
// Guide for working with argc arguments by example:
// argc: 1 - 2 - 3 - 4
// argv: 0 - 1 - 2 - 3
// cmd vote - master - login - password
-
- if(strtolower(argv(0)) == "help")
+ string s = strtolower(argv(0));
+ if (s == "help")
{
if(argc == 1)
{
- print("\nClient console commands:\n");
+ LOG_INFO("\nClient console commands:\n");
LocalCommand_macro_help();
- print("\nGeneric commands shared by all programs:\n");
+ LOG_INFO("\nGeneric commands shared by all programs:\n");
GenericCommand_macro_help();
- print("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above.\n");
- print("For help about a specific command, type cl_cmd help COMMAND\n");
+ LOG_INFO("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above.\n");
+ LOG_INFO("For help about a specific command, type cl_cmd help COMMAND\n");
return;
}
return;
}
}
- else if(GenericCommand(command))
- {
- return; // handled by common/command/generic.qc
- }
- else if(LocalCommand_macro_command(argc)) // continue as usual and scan for normal commands
- {
- return; // handled by one of the above LocalCommand_* functions
- }
+ // continue as usual and scan for normal commands
+ if (GenericCommand(command)// handled by common/command/generic.qc
+ || LocalCommand_macro_command(argc) // handled by one of the above LocalCommand_* functions
+ || MUTATOR_CALLHOOK(CSQC_ConsoleCommand, s, argc, command) // handled by a mutator
+ ) return;
// nothing above caught the command, must be invalid
- print(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help.\n");
+ LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help.\n");
return;
}
// These functions are here specifically to add special + - commands to the game, and are not really normal commands.
// Please add client commands to the function above this, as this is only for special reasons.
-#define CONSOLE_COMMANDS_NORMAL \
- CONSOLE_COMMAND("+showscores", { scoreboard_showscores = TRUE; }) \
- CONSOLE_COMMAND("-showscores", { scoreboard_showscores = FALSE; }) \
- CONSOLE_COMMAND("+showaccuracy", { scoreboard_showaccuracy = TRUE; }) \
- CONSOLE_COMMAND("-showaccuracy", { scoreboard_showaccuracy = FALSE; }) \
+#define CONSOLE_COMMANDS_NORMAL() \
+ CONSOLE_COMMAND("+showscores", { scoreboard_showscores = true; }) \
+ CONSOLE_COMMAND("-showscores", { scoreboard_showscores = false; }) \
+ CONSOLE_COMMAND("+showaccuracy", { scoreboard_showaccuracy = true; }) \
+ CONSOLE_COMMAND("-showaccuracy", { scoreboard_showaccuracy = false; }) \
/* nothing */
-#define CONSOLE_COMMANDS_MOVEMENT \
- CONSOLE_COMMAND("+forward", { ++camera_direction_x; }) \
- CONSOLE_COMMAND("-forward", { --camera_direction_x; }) \
- CONSOLE_COMMAND("+back", { --camera_direction_x; }) \
- CONSOLE_COMMAND("-back", { ++camera_direction_x; }) \
- CONSOLE_COMMAND("+moveup", { ++camera_direction_z; }) \
- CONSOLE_COMMAND("-moveup", { --camera_direction_z; }) \
- CONSOLE_COMMAND("+movedown", { --camera_direction_z; }) \
- CONSOLE_COMMAND("-movedown", { ++camera_direction_z; }) \
- CONSOLE_COMMAND("+moveright", { --camera_direction_y; }) \
- CONSOLE_COMMAND("-moveright", { ++camera_direction_y; }) \
- CONSOLE_COMMAND("+moveleft", { ++camera_direction_y; }) \
- CONSOLE_COMMAND("-moveleft", { --camera_direction_y; }) \
+#define CONSOLE_COMMANDS_MOVEMENT() \
+ CONSOLE_COMMAND("+forward", { ++camera_direction.x; }) \
+ CONSOLE_COMMAND("-forward", { --camera_direction.x; }) \
+ CONSOLE_COMMAND("+back", { --camera_direction.x; }) \
+ CONSOLE_COMMAND("-back", { ++camera_direction.x; }) \
+ CONSOLE_COMMAND("+moveup", { ++camera_direction.z; }) \
+ CONSOLE_COMMAND("-moveup", { --camera_direction.z; }) \
+ CONSOLE_COMMAND("+movedown", { --camera_direction.z; }) \
+ CONSOLE_COMMAND("-movedown", { ++camera_direction.z; }) \
+ CONSOLE_COMMAND("+moveright", { --camera_direction.y; }) \
+ CONSOLE_COMMAND("-moveright", { ++camera_direction.y; }) \
+ CONSOLE_COMMAND("+moveleft", { ++camera_direction.y; }) \
+ CONSOLE_COMMAND("-moveleft", { --camera_direction.y; }) \
CONSOLE_COMMAND("+roll_right", { ++camera_roll; }) \
CONSOLE_COMMAND("-roll_right", { --camera_roll; }) \
CONSOLE_COMMAND("+roll_left", { --camera_roll; }) \
#define CONSOLE_COMMAND(name,execution) \
{ registercommand(name); }
- CONSOLE_COMMANDS_NORMAL
+ CONSOLE_COMMANDS_NORMAL();
#undef CONSOLE_COMMAND
// then init movement commands
#define CONSOLE_COMMAND(name,execution) \
{ registercommand(name); }
- CONSOLE_COMMANDS_MOVEMENT
+ CONSOLE_COMMANDS_MOVEMENT();
#undef CONSOLE_COMMAND
#ifndef CAMERATEST
}
#endif
-
- return;
}
-float ConsoleCommand_macro_normal(float argc)
+bool ConsoleCommand_macro_normal(string s, int argc)
{
#define CONSOLE_COMMAND(name,execution) \
- { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
+ { if (name == s) { { execution } return true; } }
- CONSOLE_COMMANDS_NORMAL
+ CONSOLE_COMMANDS_NORMAL();
#undef CONSOLE_COMMAND
- return FALSE;
+ return false;
}
-float ConsoleCommand_macro_movement(float argc)
+bool ConsoleCommand_macro_movement(string s, int argc)
{
if(camera_active)
{
#define CONSOLE_COMMAND(name,execution) \
- { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
+ { if (name == s) { { execution } return true; } }
- CONSOLE_COMMANDS_MOVEMENT
+ CONSOLE_COMMANDS_MOVEMENT();
#undef CONSOLE_COMMAND
}
- return FALSE;
+ return false;
}
// ======================================================
// Used to parse commands in the console that have been registered with the "registercommand" function
-float CSQC_ConsoleCommand(string command)
+bool CSQC_ConsoleCommand(string command)
{
- float argc = tokenize_console(command);
-
- if(ConsoleCommand_macro_normal(argc))
- {
- return TRUE;
- }
- else if(ConsoleCommand_macro_movement(argc))
- {
- return TRUE;
- }
-
- // Return value should be 1 if CSQC handled the command, otherwise return 0 to have the engine handle it.
-
- return FALSE;
+ int argc = tokenize_console(command);
+ string s = strtolower(argv(0));
+ // Return value should be true if CSQC handled the command, otherwise return false to have the engine handle it.
+ return (ConsoleCommand_macro_normal(s, argc)
+ || ConsoleCommand_macro_movement(s, argc)
+ );
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff