Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh
index 0eabcae611f2bb1a8cdcc232c410ead5b5d7c419..4287e24e59f3ddfbc156f04b3a287fcdd894b113 100644 (file)
--- a/qcsrc/menu/skin.qh
+++ b/qcsrc/menu/skin.qh
@@ -1,36 +1,4 @@
-#ifndef SKIN_H
-#define SKIN_H
-
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "sys-post.qh"
-    #include "config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../common/util.qh"
-    #include "../common/test.qh"
-    #include "oo/base.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/constants.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/counting.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "command/menu_cmd.qh"
-    #include "menu.qh"
-    #include "draw.qh"
-#elif defined(SVQC)
-#endif
+#pragma once
 
 #define SKINBEGIN
 #define SKINVECTOR(name,def) vector SKIN##name = def
@@ -45,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