#define CMD_H
#include "qtypes.h"
+#include "qdefs.h"
#include "com_list.h"
-#include "cvar.h"
-#include "thread.h"
-#include "zone.h"
struct cmd_state_s;
const char *name;
const char *description;
xcommand_t function;
- qbool csqcfunc;
+ qbool qcfunc;
qbool autofunc;
qbool initstate; // indicates this command existed at init
} cmd_function_t;
typedef struct cmd_userdefined_s
{
// csqc functions - this is a mess
- cmd_function_t *csqc_functions;
+ cmd_function_t *qc_functions;
// aliases
cmd_alias_t *alias;
/// command interpreter state - the tokenizing and execution of commands, as well as pointers to which cvars and aliases they can access
typedef struct cmd_state_s
{
- mempool_t *mempool;
+ struct mempool_s *mempool;
int argc;
+ const char *cmdline;
const char *argv[MAX_ARGS];
const char *null_string;
const char *args;
cmd_function_t *engine_functions;
- cvar_state_t *cvars; // which cvar system is this cmd state able to access? (&cvars_all or &cvars_null)
+ struct cvar_state_s *cvars; // which cvar system is this cmd state able to access? (&cvars_all or &cvars_null)
int cvars_flagsmask; // which CVAR_* flags should be visible to this interpreter? (CF_CLIENT | CF_SERVER, or just CF_SERVER)
int cmd_flags; // cmd flags that identify this interpreter
- /*
- * If a requested flag matches auto_flags, a command will be
- * added to a given interpreter with auto_function. For example,
- * a CF_SERVER_FROM_CLIENT command should be automatically added
- * to the client interpreter as CL_ForwardToServer_f. It can be
- * overridden at any time.
- */
- int auto_flags;
- xcommand_t auto_function;
+ qbool (*Handle)(struct cmd_state_s *, struct cmd_function_s *, const char *, enum cmd_source_s);
+ qbool (*NotFound)(struct cmd_state_s *, struct cmd_function_s *, const char *, enum cmd_source_s);
}
cmd_state_t;
+qbool Cmd_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src);
+qbool Cmd_CL_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src);
+qbool Cmd_SV_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src);
+qbool Cmd_SV_NotFound(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src);
+
typedef struct cmd_input_s
{
llist_t list;
// command interpreter for client commands injected by CSQC, MQC or client engine code
// uses cmddefs_all
-extern cmd_state_t cmd_client;
+extern cmd_state_t *cmd_client;
// command interpreter for server commands injected by MQC, SVQC, menu engine code or server engine code
// uses cmddefs_all
-extern cmd_state_t cmd_server;
+extern cmd_state_t *cmd_server;
// command interpreter for server commands received over network from clients
// uses cmddefs_null
-extern cmd_state_t cmd_serverfromclient;
+extern cmd_state_t *cmd_serverfromclient;
extern qbool host_stuffcmdsrun;