Merge branch 'master' into TimePath/experiments/csqc_prediction

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / command / cl_cmd.qc

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index 9ce7822ee837cc4a03df9c6935f17fece941c6ce..7b74d2dd7fa56752889ee75f6abb3cdbb1e08115 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -3,6 +3,9 @@
 //  Last updated: December 28th, 2011
 // ==============================================
 
+#include "../../common/command/generic.qh"
+#include "../../common/command/shared_defs.qh"
+
 void DrawDebugModel()
 {
        if(time - floor(time) > 0.5)
@@ -121,8 +124,8 @@ void LocalCommand_create_scrshot_ent(int request)
                        {
                                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");
@@ -416,40 +419,40 @@ 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(int 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(int 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;
@@ -516,26 +519,26 @@ void GameCommand(string command)
 
 // 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; }) \
@@ -548,7 +551,7 @@ void ConsoleCommand_macro_init()
        #define CONSOLE_COMMAND(name,execution) \
                { registercommand(name); }
 
-       CONSOLE_COMMANDS_NORMAL
+       CONSOLE_COMMANDS_NORMAL();
        #undef CONSOLE_COMMAND
 
        // then init movement commands
@@ -559,7 +562,7 @@ void ConsoleCommand_macro_init()
                #define CONSOLE_COMMAND(name,execution) \
                        { registercommand(name); }
 
-               CONSOLE_COMMANDS_MOVEMENT
+               CONSOLE_COMMANDS_MOVEMENT();
                #undef CONSOLE_COMMAND
        #ifndef CAMERATEST
        }
@@ -568,29 +571,29 @@ void ConsoleCommand_macro_init()
        return;
 }
 
-float ConsoleCommand_macro_normal(int argc)
+bool ConsoleCommand_macro_normal(int argc)
 {
        #define CONSOLE_COMMAND(name,execution) \
-               { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
+               { if(name == strtolower(argv(0))) { { execution } return true; } }
 
-       CONSOLE_COMMANDS_NORMAL
+       CONSOLE_COMMANDS_NORMAL();
        #undef CONSOLE_COMMAND
 
-       return FALSE;
+       return false;
 }
 
-float ConsoleCommand_macro_movement(int 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;
 }
 
 
@@ -599,20 +602,20 @@ float ConsoleCommand_macro_movement(int argc)
 // ======================================================
 // 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)
 {
        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;
 }