X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=c80fdf9078307f31f2f0afe5f9715af6fad25170;hb=refs%2Fheads%2FCloudwalk%2Fjson;hp=cba96ef2d3aa8b5cb4c9d31f7b6b6c24359bfc39;hpb=449895baf29da51030a04b4577d8d714d98e1c87;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.h b/cmd.h
index cba96ef2..c80fdf90 100644
--- a/cmd.h
+++ b/cmd.h
@@ -37,7 +37,9 @@ The game starts with a Cbuf_AddText ("exec quake.rc\n"); Cbuf_Execute ();
 #ifndef CMD_H
 #define CMD_H
 
-#include "thread.h"
+#include "qtypes.h"
+#include "qdefs.h"
+#include "com_list.h"
 
 struct cmd_state_s;
 
@@ -55,7 +57,7 @@ struct cmd_state_s;
 #define CF_USERINFO             (1<<9)  // command or cvar used to communicate userinfo to the server
 #define CF_PERSISTENT           (1<<10) // cvar must not be reset on gametype switch (such as scr_screenshot_name, which otherwise isn't set to the mod name properly)
 #define CF_PRIVATE              (1<<11) // cvar should not be $ expanded or sent to the server under any circumstances (rcon_password, etc)
-#define CF_MAXFLAGSVAL          4095    // used to determine if flags is valid
+#define CF_MAXFLAGSVAL          ((1<<12) - 1)    // used to determine if flags is valid
 // for internal use only!
 #define CF_DEFAULTSET (1<<30)
 #define CF_ALLOCATED (1<<31)
@@ -87,7 +89,7 @@ typedef struct cmd_function_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;
@@ -96,7 +98,7 @@ typedef struct cmd_function_s
 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;
@@ -120,9 +122,10 @@ typedef struct cmd_buf_s
 /// 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;
@@ -134,23 +137,21 @@ typedef struct cmd_state_s
 
 	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;
@@ -165,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;
 
@@ -280,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