Fix compile warnings from gcc and g++

[xonotic/darkplaces.git] / cvar.h

diff --git a/cvar.h b/cvar.h
index aa36f6262be620c3fb0349b0b536766a760eae0c..96a5829980a3accb0f84cd216d64ef3760b5edca 100644 (file)
--- a/cvar.h
+++ b/cvar.h
@@ -124,12 +124,12 @@ typedef struct cvar_s
        const char *string;
        const char *description;
        int integer;
-       double value;
-       double vector[3];
+       float value;
+       float vector[3];
 
        const char *defstring;
 
-       void (*callback)(char *value);
+       void (*callback)(struct cvar_s *var);
        qboolean ignore_callback;
 
        char **aliases;
@@ -141,8 +141,8 @@ typedef struct cvar_s
        const char *initstring;
        const char *initdescription;
        int initinteger;
-       double initvalue;
-       double initvector[3];
+       float initvalue;
+       float initvector[3];
        const char *initdefstring;
 
        int globaldefindex[3];
@@ -180,7 +180,7 @@ void Cvar_MenuOption(cvar_t *variable, int menu, int value[16], const char *name
 
 void Cvar_RegisterAlias(cvar_t *variable, const char *alias );
 
-void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(char *));
+void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(cvar_t *));
 
 /// registers a cvar that already has the name, string, and optionally the
 /// archive elements set.
@@ -193,12 +193,12 @@ void Cvar_Set (cvar_state_t *cvars, const char *var_name, const char *value);
 void Cvar_Set_NoCallback (cvar_t *var, const char *value);
 
 /// expands value to a string and calls Cvar_Set
-void Cvar_SetValue (cvar_state_t *cvars, const char *var_name, double value);
+void Cvar_SetValue (cvar_state_t *cvars, const char *var_name, float value);
 
 void Cvar_SetQuick (cvar_t *var, const char *value);
-void Cvar_SetValueQuick (cvar_t *var, double value);
+void Cvar_SetValueQuick (cvar_t *var, float value);
 
-float Cvar_VariableValueOr (cvar_state_t *cvars, const char *var_name, double def, int neededflags);
+float Cvar_VariableValueOr (cvar_state_t *cvars, const char *var_name, float def, int neededflags);
 // returns def if not defined
 
 float Cvar_VariableValue (cvar_state_t *cvars, const char *var_name, int neededflags);