X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fskin.qh;h=10c81e7ef34bbec061df61789857970764025c1f;hb=08e6497842b33529d0c1b0caa431b49ca98d79da;hp=437c49bf72c3327f3b17b4ef70903fce63c47b4e;hpb=2886ed5676755f4242704d64d3315124026496bb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh
index 437c49bf7..10c81e7ef 100644
--- a/qcsrc/menu/skin.qh
+++ b/qcsrc/menu/skin.qh
@@ -1,8 +1,11 @@
+#ifndef SKIN_H
+#define SKIN_H
+
 #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,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