// 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 "../../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_radius = stof(argv(2));
blurtest_power = stof(argv(3));
print("Enabled blurtest\n");
- return;
+ return;
}
-
+
default:
case CMD_REQUEST_USAGE:
{
#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;
}
}
}
-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");
-
+
fclose(fh);
}
else
}
return;
}
-
+
default:
case CMD_REQUEST_USAGE:
{
}
}
-void LocalCommand_debugmodel(float request, float argc)
+void LocalCommand_debugmodel(int request, int argc)
{
switch(request)
{
{
string modelname = argv(1);
entity debugmodel_entity;
-
+
debugmodel_entity = spawn();
precache_model(modelname);
setmodel(debugmodel_entity, modelname);
debugmodel_entity.angles = view_angles;
debugmodel_entity.draw = DrawDebugModel;
debugmodel_entity.classname = "debugmodel";
-
- return;
+
+ return;
}
-
+
default:
case CMD_REQUEST_USAGE:
{
}
}
-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)))
{
- vote_selection = 2;
+ vote_selection = 2;
vote_string = "yes";
}
else
{
- vote_selection = 1;
- vote_string = "no";
+ vote_selection = 1;
+ vote_string = "no";
}
-
+
if(vote_selection)
{
if(uid2name_dialog) // handled by "uid2name" option
uid2name_dialog = 0;
}
else { localcmd(strcat("cmd vote ", vote_string, "\n")); }
-
+
return;
}
}
-
+
default:
print("Incorrect parameters for ^2handlevote^7\n");
case CMD_REQUEST_USAGE:
}
}
-void LocalCommand_hud(float request, float argc)
+void LocalCommand_hud(int request, int argc)
{
switch(request)
{
cvar_set("_hud_configure", ftos(!autocvar__hud_configure));
return;
}
-
+
case "save":
{
if(argv(2))
break; // go to usage, we're missing the paramater needed here.
}
}
-
+
case "scoreboard_columns_set":
{
- Cmd_HUD_SetFields(argc);
+ Cmd_HUD_SetFields(argc);
return;
}
Cmd_HUD_Help();
return;
}
-
+
case "radar":
{
if(argv(2))
}
}
}
-
+
default:
print("Incorrect parameters for ^2hud^7\n");
case CMD_REQUEST_USAGE:
}
}
-void LocalCommand_localprint(float request, float argc)
+void LocalCommand_localprint(int request, int argc)
{
switch(request)
{
if(argv(1))
{
centerprint_hud(argv(1));
- return;
+ return;
}
}
-
+
default:
print("Incorrect parameters for ^2localprint^7\n");
case CMD_REQUEST_USAGE:
}
}
-void LocalCommand_mv_download(float request, float argc)
+void LocalCommand_mv_download(int request, int argc)
{
switch(request)
{
if(argv(1))
{
Cmd_MapVote_MapDownload(argc);
- return;
+ return;
}
}
-
+
default:
print("Incorrect parameters for ^2mv_download^7\n");
case CMD_REQUEST_USAGE:
}
}
-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))); )
+ print(etos(client), "\n");
+
+ return;
+ }
+
+ default:
+ print("Incorrect parameters for ^2find^7\n");
+ case CMD_REQUEST_USAGE:
+ {
+ print("\nUsage:^3 cl_cmd find classname\n");
+ print(" Where 'classname' is the classname to search for.\n");
+ return;
+ }
+ }
+}
+
+void LocalCommand_sendcvar(int request, int argc)
{
switch(request)
{
// W_FixWeaponOrder will trash argv, so save what we need.
string thiscvar = strzone(argv(1));
string s = cvar_string(thiscvar);
-
+
if(thiscvar == "cl_weaponpriority")
s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1);
else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18)
s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0);
-
+
localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
strunzone(thiscvar);
- return;
+ return;
}
}
-
+
default:
print("Incorrect parameters for ^2sendcvar^7\n");
case CMD_REQUEST_USAGE:
/* 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)
{
case CMD_REQUEST_COMMAND:
{
-
- return;
+
+ return;
}
-
+
default:
case CMD_REQUEST_USAGE:
{
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"); } }
-
- 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; } }
-
- CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc)
+ { if(name == strtolower(argv(0))) { function; return true; } }
+
+ 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; } }
-
- CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc)
+ { if(name == strtolower(argv(1))) { function; return true; } }
+
+ 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
+ // argv: 0 - 1 - 2 - 3
// cmd vote - master - login - password
- if(strtolower(argv(0)) == "help")
+ if(strtolower(argv(0)) == "help")
{
- if(argc == 1)
+ if(argc == 1)
{
print("\nClient console commands:\n");
LocalCommand_macro_help();
print("\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");
-
+
return;
- }
+ }
else if(GenericCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
{
return;
{
return;
}
- }
- else if(GenericCommand(command))
+ }
+ else if(GenericCommand(command))
{
return; // handled by common/command/generic.qc
}
{
return; // handled by one of the above LocalCommand_* functions
}
-
+
// 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");
-
+
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
#ifndef CAMERATEST
if(isdemo())
#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(int argc)
{
#define CONSOLE_COMMAND(name,execution) \
- { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
-
- CONSOLE_COMMANDS_NORMAL
+ { if(name == strtolower(argv(0))) { { execution } return true; } }
+
+ CONSOLE_COMMANDS_NORMAL();
#undef CONSOLE_COMMAND
-
- return FALSE;
+
+ return false;
}
-float ConsoleCommand_macro_movement(float argc)
+bool ConsoleCommand_macro_movement(int argc)
{
if(camera_active)
{
#define CONSOLE_COMMAND(name,execution) \
- { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
+ { if(name == strtolower(argv(0))) { { 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);
+ int argc = tokenize_console(command);
if(ConsoleCommand_macro_normal(argc))
{
- return TRUE;
+ return true;
}
else if(ConsoleCommand_macro_movement(argc))
{
- return TRUE;
+ return true;
}
-
+
// Return value should be 1 if CSQC handled the command, otherwise return 0 to have the engine handle it.
- return FALSE;
+ return false;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff