X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=8badf436735d13e5ced818463af5982a9d81b245;hb=a51a70c2254b27a68e5fe74cc5985b02dc36e1e9;hp=5a88ea918a794aeff3386188309f74ed9264d7da;hpb=d74aa38fe15426dc870889a72c1ffd1a8bd38575;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.h b/cmd.h
index 5a88ea91..8badf436 100644
--- a/cmd.h
+++ b/cmd.h
@@ -41,6 +41,17 @@ The game starts with a Cbuf_AddText ("exec quake.rc\n"); Cbuf_Execute ();
 
 struct cmd_state_s;
 
+// Command flags
+#define CMD_CLIENT				(1<<0)
+#define CMD_SERVER				(1<<1)
+#define CMD_CLIENT_FROM_SERVER	(1<<2)
+#define CMD_SERVER_FROM_CLIENT	(1<<3)
+#define CMD_INITWAIT			(1<<4)
+#define CMD_CHEAT				(1<<5)
+
+
+#define CMD_SHARED 3
+
 typedef void(*xcommand_t) (struct cmd_state_s *cmd);
 
 typedef enum
@@ -61,6 +72,7 @@ typedef struct cmdalias_s
 
 typedef struct cmd_function_s
 {
+	int flags;
 	struct cmd_function_s *next;
 	const char *name;
 	const char *description;
@@ -98,6 +110,7 @@ typedef struct cmd_state_s
 	int tokenizebufferpos;
 
 	cmddeferred_t *deferred_list;
+	double deferred_oldrealtime;
 
 	sizebuf_t text;
 	unsigned char text_buf[CMDBUFSIZE];
@@ -115,6 +128,8 @@ typedef struct cmd_state_s
 
 	cvar_state_t *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? (CVAR_CLIENT | CVAR_SERVER, or just CVAR_SERVER)
+
+	int cmd_flags; // cmd flags that identify this interpreter
 }
 cmd_state_t;
 
@@ -124,9 +139,6 @@ 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 client commands received over network from server
-// uses cmddefs_all
-extern cmd_state_t cmd_clientfromserver;
 // 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;
@@ -182,7 +194,7 @@ void Cmd_SaveInitState(void);
 // called by FS_GameDir_f, this restores cvars, commands and aliases to init values
 void Cmd_RestoreInitState(void);
 
-void Cmd_AddCommand(cmd_state_t *cmd, const char *cmd_name, xcommand_t function, const char *description);
+void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const char *description);
 // called by the init functions of other parts of the program to
 // register commands and functions to call for them.
 // The cmd_name is referenced later, so it should not be in temp memory
@@ -248,7 +260,7 @@ void Cmd_ForwardToServer_f (cmd_state_t *cmd);
 /// enclosing quote marks are also put.
 qboolean Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset, qboolean putquotes);
 
-void Cmd_ClearCsqcFuncs (cmd_state_t *cmd);
+void Cmd_ClearCSQCCommands (cmd_state_t *cmd);
 
 #endif