X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.h;h=b10560077b9baa6abbc712a8158fdb07f65264f6;hp=dd9b43265debbe51c61f738a70894b38f04bcd2d;hb=d21ad272ad2c10c98373065fe37bdf91008288e4;hpb=e9ef9da90a206204b283dacd15c35bd3fd1fe5c9

diff --git a/cmd.h b/cmd.h
index dd9b4326..b1056007 100644
--- a/cmd.h
+++ b/cmd.h
@@ -38,10 +38,8 @@ The game starts with a Cbuf_AddText ("exec quake.rc\n"); Cbuf_Execute ();
 #define CMD_H
 
 #include "qtypes.h"
+#include "qdefs.h"
 #include "com_list.h"
-#include "cvar.h"
-#include "thread.h"
-#include "zone.h"
 
 struct cmd_state_s;
 
@@ -91,7 +89,7 @@ typedef struct cmd_function_s
 	const char *name;
 	const char *description;
 	xcommand_t function;
-	qbool csqcfunc;
+	qbool qcfunc;
 	qbool autofunc;
 	qbool initstate; // indicates this command existed at init
 } cmd_function_t;
@@ -100,7 +98,7 @@ typedef struct cmd_function_s
 typedef struct cmd_userdefined_s
 {
 	// csqc functions - this is a mess
-	cmd_function_t *csqc_functions;
+	cmd_function_t *qc_functions;
 
 	// aliases
 	cmd_alias_t *alias;
@@ -124,9 +122,10 @@ typedef struct cmd_buf_s
 /// 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
 {
-	mempool_t *mempool;
+	struct mempool_s *mempool;
 
 	int argc;
+	const char *cmdline;
 	const char *argv[MAX_ARGS];
 	const char *null_string;
 	const char *args;
@@ -138,7 +137,7 @@ typedef struct cmd_state_s
 
 	cmd_function_t *engine_functions;
 
-	cvar_state_t *cvars; // which cvar system is this cmd state able to access? (&cvars_all or &cvars_null)
+	struct cvar_state_s *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? (CF_CLIENT | CF_SERVER, or just CF_SERVER)
 
 	int cmd_flags; // cmd flags that identify this interpreter