X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fskin.qh;h=4287e24e59f3ddfbc156f04b3a287fcdd894b113;hp=437c49bf72c3327f3b17b4ef70903fce63c47b4e;hb=3ac61b98c83be079c61cf525491d2028b2a889dc;hpb=1eadc66440474af5c3d2b2f7e5a24935da3ffbdf diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh index 437c49bf72..4287e24e59 100644 --- a/qcsrc/menu/skin.qh +++ b/qcsrc/menu/skin.qh @@ -1,8 +1,10 @@ +#pragma once + #define SKINBEGIN -#define SKINVECTOR(name,def) var vector SKIN##name = def -#define SKINFLOAT(name,def) var float SKIN##name = def +#define SKINVECTOR(name,def) vector SKIN##name = def +#define SKINFLOAT(name,def) float SKIN##name = def //#define SKINSTRING(name,def) const string SKIN##name = def -#define SKINSTRING(name,def) var string SKIN##name = def +#define SKINSTRING(name,def) string SKIN##name = def #define SKINEND #include "skin-customizables.inc" #undef SKINEND @@ -11,13 +13,13 @@ #undef SKINFLOAT #undef SKINVECTOR -#define SKINBEGIN void Skin_ApplySetting(string key, string value) { switch(key) { -#define SKINVECTOR(name,def) case #name: SKIN##name = stov(value); break -#define SKINFLOAT(name,def) case #name: SKIN##name = stof(value); break +#define SKINBEGIN void Skin_ApplySetting(string key, string _value) { switch(key) { +#define SKINVECTOR(name,def) case #name: SKIN##name = stov(_value); break +#define SKINFLOAT(name,def) case #name: SKIN##name = stof(_value); break //#define SKINSTRING(name,def) case #name: break -#define SKINSTRING(name,def) case #name: SKIN##name = strzone(value); break +#define SKINSTRING(name,def) case #name: SKIN##name = strzone(_value); break // I know this leaks memory when skin is read multiple times. Screw it. -#define SKINEND case "": break; case "//": break; default: dprint("Invalid key in skin file: ", key, "\n"); } } +#define SKINEND case "": break; case "//": break; default: LOG_TRACE("Invalid key in skin file: ", key); } } #include "skin-customizables.inc" #undef SKINEND #undef SKINSTRING