Fix loading of external Q1BSP textures. Does not fix skybox. Causes console spam

[xonotic/darkplaces.git] / cmd.h

diff --git a/cmd.h b/cmd.h
index 674b3c19e374937970daf59f7fea916eac635035..40b7195884f9a3cb465f6e14a59f808979e11856 100644 (file)
--- 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;
@@ -116,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;
 
@@ -137,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.
  */
@@ -180,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
@@ -229,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