X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=40b7195884f9a3cb465f6e14a59f808979e11856;hb=de772b8484eaa1b51bb7de519b27485045ec6a58;hp=6c12c626cf1807e9b5417fe3d5132a896392dc6b;hpb=8637b1ec26ca72f92d1ef8faf23a2f124c1f4ff3;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.h b/cmd.h
index 6c12c626..40b71958 100644
--- a/cmd.h
+++ b/cmd.h
@@ -45,12 +45,12 @@ struct cmd_state_s;
 #define CMD_CLIENT				(1<<0)
 #define CMD_SERVER				(1<<1)
 #define CMD_CLIENT_FROM_SERVER	(1<<2)
-#define CMD_SERVER_FROM_CLIENT	9
-#define CMD_INITWAIT			(1<<5)
-#define CMD_CHEAT				(1<<6)
+#define CMD_SERVER_FROM_CLIENT	(1<<3)
+#define CMD_USERINFO			(1<<4)
+#define CMD_CHEAT				(1<<5)
 
 
-#define CMD_SHARED 6
+#define CMD_SHARED 3
 
 typedef void(*xcommand_t) (struct cmd_state_s *cmd);
 
@@ -128,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;
 
@@ -149,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.
  */
@@ -241,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