X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=9016c27c65ba16bda0c352956c1341effdd6d958;hb=4620b4e54cd32935a3b477c1da74b09ce704734f;hp=9b0046b0701919709761ec9d9a10bc0c47435d0e;hpb=fcd0f5f35807231044c74daee39d295ae55752d1;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.h b/cmd.h
index 9b0046b0..9016c27c 100644
--- a/cmd.h
+++ b/cmd.h
@@ -45,9 +45,9 @@ 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 3
@@ -114,7 +114,7 @@ typedef struct cmd_state_s
 
 	sizebuf_t text;
 	unsigned char text_buf[CMDBUFSIZE];
-	Thread_SpinLock text_lock;
+	void *text_mutex;
 
 	int argc;
 	const char *argv[MAX_ARGS];
@@ -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