Merge branch 'master' into terencehill/slider_anim_improvements

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / skin.qh

diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh
index d44f6577efdec377597398e5b790ccb5ae91932c..10c81e7ef34bbec061df61789857970764025c1f 100644 (file)
--- a/qcsrc/menu/skin.qh
+++ b/qcsrc/menu/skin.qh
@@ -1,3 +1,6 @@
+#ifndef SKIN_H
+#define SKIN_H
+
 #define SKINBEGIN
 #define SKINVECTOR(name,def) vector SKIN##name = def
 #define SKINFLOAT(name,def) float SKIN##name = def
@@ -11,11 +14,11 @@
 #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"); } }
 #include "skin-customizables.inc"
@@ -24,3 +27,4 @@
 #undef SKINFLOAT
 #undef SKINVECTOR
 #undef SKINBEGIN
+#endif