X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fcvar.qh;fp=qcsrc%2Flib%2Fcvar.qh;h=81aaffe1380eb20b0c72c20513e21a06846f6456;hb=d3e642e032c1e9e62fc5400c14627c54e37e4ae0;hp=5ee3222bc6367908243d56899535728ddd2d2b97;hpb=afd0bb647a10128dd5212d54564f9448e8b8f2f8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/cvar.qh b/qcsrc/lib/cvar.qh index 5ee3222bc..81aaffe13 100644 --- a/qcsrc/lib/cvar.qh +++ b/qcsrc/lib/cvar.qh @@ -5,7 +5,7 @@ #include "progname.qh" #include "static.qh" -void RegisterCvars(void(string name, string def, string desc, bool archive, string file) f) { } +void RegisterCvars(void(string name, string def, string desc, bool archive, string file)f) {} /** escape the string to make it safe for consoles */ string MakeConsoleSafe(string input) @@ -17,34 +17,38 @@ string MakeConsoleSafe(string input) return input; } -void cvar_describe(string name, string desc) { - localcmd(sprintf("\nset %1$s \"$%1$s\" \"%2$s\"\n", name, MakeConsoleSafe(desc))); +void cvar_describe(string name, string desc) +{ + localcmd(sprintf("\nset %1$s \"$%1$s\" \"%2$s\"\n", name, MakeConsoleSafe(desc))); } -void cvar_archive(string name) { - localcmd(sprintf("\nseta %1$s \"$%1$s\"\n", name)); +void cvar_archive(string name) +{ + localcmd(sprintf("\nseta %1$s \"$%1$s\"\n", name)); } void RegisterCvars_Set(string name, string def, string desc, bool archive, string file) { - cvar_describe(name, desc); - if (archive) cvar_archive(name); + cvar_describe(name, desc); + if (archive) cvar_archive(name); } int RegisterCvars_Save_fd; void RegisterCvars_Save(string name, string def, string desc, bool archive, string file) { - if (!archive) return; - fputs(RegisterCvars_Save_fd, sprintf("seta %s \"%s\"\n", name, def)); + if (!archive) return; + fputs(RegisterCvars_Save_fd, sprintf("seta %s \"%s\"\n", name, def)); } -STATIC_INIT_LATE(Cvars) { - RegisterCvars(RegisterCvars_Set); - RegisterCvars_Save_fd = fopen(sprintf("default%s.cfg", PROGNAME), FILE_WRITE); - if (RegisterCvars_Save_fd >= 0) { - RegisterCvars(RegisterCvars_Save); - fclose(RegisterCvars_Save_fd); - } +STATIC_INIT_LATE(Cvars) +{ + RegisterCvars(RegisterCvars_Set); + RegisterCvars_Save_fd = fopen(sprintf("default%s.cfg", PROGNAME), FILE_WRITE); + if (RegisterCvars_Save_fd >= 0) + { + RegisterCvars(RegisterCvars_Save); + fclose(RegisterCvars_Save_fd); + } } const noref bool default_bool = false; @@ -53,19 +57,22 @@ const noref float default_float = 0; const noref string default_string = ""; const noref vector default_vector = '0 0 0'; -#define repr_cvar_bool(x) ((x) ? "1" : "0") -#define repr_cvar_int(x) (ftos(x)) -#define repr_cvar_float(x) (ftos(x)) +#define repr_cvar_bool(x) ((x) ? "1" : "0") +#define repr_cvar_int(x) (ftos(x)) +#define repr_cvar_float(x) (ftos(x)) #define repr_cvar_string(x) (x) #define repr_cvar_vector(x) (sprintf("%v", x)) #define __AUTOCVAR(file, archive, var, type, desc, default) \ - [[accumulate]] void RegisterCvars(void(string, string, string, bool, string) f) { f(#var, repr_cvar_##type(default), desc, archive, file); } \ - type autocvar_##var = default + [[accumulate]] void RegisterCvars(void(string, string, string, bool, string)f) \ + { \ + f( #var, repr_cvar_##type(default), desc, archive, file); \ + } \ + type autocvar_##var = default #define AUTOCVAR_5(file, archive, var, type, desc) \ - __AUTOCVAR(file, archive, var, type, desc, default_##type) + __AUTOCVAR(file, archive, var, type, desc, default_##type) #define AUTOCVAR_6(file, archive, var, type, default, desc) \ - __AUTOCVAR(file, archive, var, type, desc, default) + __AUTOCVAR(file, archive, var, type, desc, default) #define _AUTOCVAR(...) EVAL(OVERLOAD(AUTOCVAR, __FILE__, __VA_ARGS__)) #define AUTOCVAR_SAVE(...) _AUTOCVAR(true, __VA_ARGS__) #define AUTOCVAR(...) _AUTOCVAR(false, __VA_ARGS__)