X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fskin.qh;h=4287e24e59f3ddfbc156f04b3a287fcdd894b113;hb=e12b0503854a3db83f9ddcda6285b6c343c0741a;hp=f19256833a98ae59fcefc0e35e446cbbc43cb8c9;hpb=ef5d72bcd06c2c1380e63fe900aafbca20153d02;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh index f19256833..4287e24e5 100644 --- a/qcsrc/menu/skin.qh +++ b/qcsrc/menu/skin.qh @@ -1,5 +1,4 @@ -#ifndef SKIN_H -#define SKIN_H +#pragma once #define SKINBEGIN #define SKINVECTOR(name,def) vector SKIN##name = def @@ -14,17 +13,16 @@ #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 #undef SKINFLOAT #undef SKINVECTOR #undef SKINBEGIN -#endif \ No newline at end of file