X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=a1cd3be600c7a9109553729be8059076bb03120d;hb=refs%2Fheads%2Fbones_was_here%2Fnet_s6;hp=f7b3b4d1078b31ae4d7bb902dfca225b1fcb9b5f;hpb=7c656ac03a03a5fa910f9cad3c4735ed62f7ab69;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.h b/cmd.h
index f7b3b4d1..a1cd3be6 100644
--- a/cmd.h
+++ b/cmd.h
@@ -125,6 +125,7 @@ typedef struct cmd_state_s
 	struct mempool_s *mempool;
 
 	int argc;
+	const char *cmdline;
 	const char *argv[MAX_ARGS];
 	const char *null_string;
 	const char *args;
@@ -141,18 +142,16 @@ typedef struct cmd_state_s
 
 	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;
@@ -167,15 +166,12 @@ typedef struct cmd_input_s
 extern cmd_userdefined_t cmd_userdefined_all; // aliases and csqc functions
 extern cmd_userdefined_t cmd_userdefined_null; // intentionally empty
 
-// command interpreter for client commands injected by CSQC, MQC or client engine code
-// uses cmddefs_all
-extern cmd_state_t cmd_client;
-// command interpreter for server commands injected by MQC, SVQC, menu engine code or server engine code
+// command interpreter for local commands injected by SVQC, CSQC, MQC, server or client engine code
 // uses cmddefs_all
-extern cmd_state_t cmd_server;
+extern cmd_state_t *cmd_local;
 // 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;
 
@@ -282,5 +278,7 @@ qbool Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quot
 
 void Cmd_ClearCSQCCommands (cmd_state_t *cmd);
 
+void Cmd_NoOperation_f(cmd_state_t *cmd);
+
 #endif