Unify the command and cvar flags, under the CF_ prefix.

[xonotic/darkplaces.git] / cvar.h

diff --git a/cvar.h b/cvar.h
index 96a5829980a3accb0f84cd216d64ef3760b5edca..525d4f004695b955f7dce91b1c7c441eabdb6e4d 100644 (file)
--- a/cvar.h
+++ b/cvar.h
@@ -59,62 +59,6 @@ interface from being ambiguous.
 #ifndef CVAR_H
 #define CVAR_H
 
-// cvar flags
-
-#define CVAR_SAVE 1
-#define CVAR_NOTIFY 2
-#define CVAR_READONLY 4
-#define CVAR_SERVERINFO 8
-#define CVAR_USERINFO 16
-// CVAR_PRIVATE means do not $ expand or sendcvar this cvar under any circumstances (rcon_password uses this)
-#define CVAR_PRIVATE 32
-// for engine-owned cvars that must not be reset on gametype switch (e.g. scr_screenshot_name, which otherwise isn't set to the mod name properly)
-#define CVAR_NORESETTODEFAULTS 64
-// cvar is accessible in client
-#define CVAR_CLIENT 128
-// cvar is accessible in dedicated server
-#define CVAR_SERVER 256
-// used to determine if flags is valid
-#define CVAR_MAXFLAGSVAL 511
-// for internal use only!
-#define CVAR_DEFAULTSET (1<<30)
-#define CVAR_ALLOCATED (1<<31)
-
-/*
-// type of a cvar for menu purposes
-#define CVARMENUTYPE_FLOAT 1
-#define CVARMENUTYPE_INTEGER 2
-#define CVARMENUTYPE_SLIDER 3
-#define CVARMENUTYPE_BOOL 4
-#define CVARMENUTYPE_STRING 5
-#define CVARMENUTYPE_OPTION 6
-
-// which menu to put a cvar in
-#define CVARMENU_GRAPHICS 1
-#define CVARMENU_SOUND 2
-#define CVARMENU_INPUT 3
-#define CVARMENU_NETWORK 4
-#define CVARMENU_SERVER 5
-
-#define MAX_CVAROPTIONS 16
-
-typedef struct cvaroption_s
-{
-       int value;
-       const char *name;
-}
-cvaroption_t;
-
-typedef struct menucvar_s
-{
-       int type;
-       float valuemin, valuemax, valuestep;
-       int numoptions;
-       cvaroption_t optionlist[MAX_CVAROPTIONS];
-}
-menucvar_t;
-*/
-
 typedef struct cvar_s
 {
        int flags;
@@ -130,13 +74,13 @@ typedef struct cvar_s
        const char *defstring;
 
        void (*callback)(struct cvar_s *var);
-       qboolean ignore_callback;
+       qbool ignore_callback;
 
        char **aliases;
        int aliasindex;
 
        // values at init (for Cvar_RestoreInitState)
-       qboolean initstate; // indicates this existed at init
+       qbool initstate; // indicates this existed at init
        int initflags;
        const char *initstring;
        const char *initdescription;
@@ -148,7 +92,6 @@ typedef struct cvar_s
        int globaldefindex[3];
        int globaldefindex_stringno[3];
 
-       //menucvar_t menuinfo;
        struct cvar_s *next;
 } cvar_t;
 
@@ -168,16 +111,6 @@ cvar_state_t;
 extern cvar_state_t cvars_all;
 extern cvar_state_t cvars_null; // used by cmd_serverfromclient which intentionally has no cvars available
 
-/*
-void Cvar_MenuSlider(cvar_t *variable, int menu, float slider_min, float slider_max, float slider_step);
-void Cvar_MenuBool(cvar_t *variable, int menu, const char *name_false, const char *name_true);
-void Cvar_MenuFloat(cvar_t *variable, int menu, float range_min, float range_max);
-void Cvar_MenuInteger(cvar_t *variable, int menu, int range_min, int range_max);
-void Cvar_MenuString(cvar_t *variable, int menu);
-void Cvar_MenuOption(cvar_t *variable, int menu, int value[16], const char *name[16]);
-*/
-
-
 void Cvar_RegisterAlias(cvar_t *variable, const char *alias );
 
 void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(cvar_t *));
@@ -186,7 +119,7 @@ void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(cvar_t *));
 /// archive elements set.
 void Cvar_RegisterVariable(cvar_t *variable);
 
-qboolean Cvar_Readonly (cvar_t *var, const char *cmd_name);
+qbool Cvar_Readonly (cvar_t *var, const char *cmd_name);
 
 /// equivelant to "<name> <variable>" typed at the console
 void Cvar_Set (cvar_state_t *cvars, const char *var_name, const char *value);
@@ -220,11 +153,11 @@ const char *Cvar_CompleteVariable (cvar_state_t *cvars, const char *partial, int
 // attempts to match a partial variable name for command line completion
 // returns NULL if nothing fits
 
-void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full);
+void Cvar_PrintHelp(cvar_t *cvar, const char *name, qbool full);
 
 void Cvar_CompleteCvarPrint (cvar_state_t *cvars, const char *partial, int neededflags);
 
-qboolean Cvar_Command (cmd_state_t *cmd);
+qbool Cvar_Command (cmd_state_t *cmd);
 // called by Cmd_ExecuteString when Cmd_Argv(cmd, 0) doesn't match a known
 // command.  Returns true if the command was a variable reference that
 // was handled. (print or change)