UNMERGE

[xonotic/darkplaces.git] / cvar.h

diff --git a/cvar.h b/cvar.h
index 1509f756f5ce405a7ff65a344541744c69bf02b0..3c94aae266b91b13e25b481e0162931256aee192 100644 (file)
--- a/cvar.h
+++ b/cvar.h
@@ -114,15 +114,15 @@ typedef struct cvar_s
 {
        int flags;
 
-       const char *name;
+       char *name;
 
-       const char *string;
-       const char *description;
+       char *string;
+       char *description;
        int integer;
        float value;
        float vector[3];
 
-       const char *defstring;
+       char *defstring;
 
        unsigned int globaldefindex_progid[3];
        int globaldefindex[3];
@@ -213,7 +213,7 @@ void Cvar_Del_f (void);
 /// or merely sets its value if it already exists.
 cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription);
 
-extern const char *cvar_dummy_description; // ALWAYS the same pointer
+extern char *cvar_dummy_description; // ALWAYS the same pointer
 extern cvar_t *cvar_vars; // used to list all cvars
 
 void Cvar_UpdateAllAutoCvars(void); // updates ALL autocvars of the active prog to the cvar values (savegame loading)