X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=40b7195884f9a3cb465f6e14a59f808979e11856;hb=73bbf90a419c7b19c0b6f1cb11f05813a1658199;hp=c08d92cd96b238ea0cd5901d80af2c0ad9acf946;hpb=c38d0d2d6409d9b3174b6cf04f1bd09694cbfc81;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.h b/cmd.h
index c08d92cd..40b71958 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_USERINFO			(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;
@@ -76,10 +88,20 @@ typedef struct cmddeferred_s
 	double delay;
 } cmddeferred_t;
 
-typedef struct cmd_state_s
+/// container for user-defined QC functions and aliases, shared between different command interpreters
+typedef struct cmd_userdefined_s
 {
+	// csqc functions - this is a mess
+	cmd_function_t *csqc_functions;
+
+	// aliases
 	cmdalias_t *alias;
+}
+cmd_userdefined_t;
 
+/// 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
+{
 	qboolean wait;
 
 	mempool_t *mempool;
@@ -88,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];
@@ -99,17 +122,28 @@ typedef struct cmd_state_s
 	const char *args;
 	cmd_source_t source;
 
-	cmd_function_t *functions;		// possible commands to execute
+	cmd_userdefined_t *userdefined; // possible csqc functions and aliases to execute
+
+	cmd_function_t *engine_functions;
+
+	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;
 
+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 client commands received over network from server
-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;
 // command interpreter for server commands received over network from clients
+// uses cmddefs_null
 extern cmd_state_t cmd_serverfromclient;
 
 extern qboolean host_stuffcmdsrun;
@@ -117,8 +151,6 @@ extern qboolean host_stuffcmdsrun;
 void Cbuf_Lock(cmd_state_t *cmd);
 void Cbuf_Unlock(cmd_state_t *cmd);
 
-void Cmd_Init_Commands(qboolean dedicated_server);
-
 /*! as new commands are generated from the console or keybindings,
  * the text is added to the end of the command buffer.
  */
@@ -160,7 +192,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
@@ -209,15 +241,6 @@ int Cmd_CheckParm (cmd_state_t *cmd, const char *parm);
 /// The text can come from the command buffer, a remote client, or stdin.
 void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qboolean lockmutex);
 
-/// adds the string as a clc_stringcmd to the client message.
-/// (used when there is no reason to generate a local command to do it)
-void Cmd_ForwardStringToServer (const char *s);
-
-/// adds the current command line as a clc_stringcmd to the client message.
-/// things like godmode, noclip, etc, are commands directed to the server,
-/// so when they are typed in at the console, they will need to be forwarded.
-void Cmd_ForwardToServer_f (cmd_state_t *cmd);
-
 /// quotes a string so that it can be used as a command argument again;
 /// quoteset is a string that contains one or more of ", \, $ and specifies
 /// the characters to be quoted (you usually want to either pass "\"\\" or
@@ -226,7 +249,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