X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Fmisc.qh;h=dfabebeeb549923efa956428313c9dd898c65abd;hp=db7819b8cec056a7df0be4d9569dd4848aee0744;hb=0f8553d27e17cc90ccbdd7d56d86bb5136330db7;hpb=349aeb508e5a3d577df60bef8a552da2db7d928d

diff --git a/qcsrc/lib/misc.qh b/qcsrc/lib/misc.qh
index db7819b8c..dfabebeeb 100644
--- a/qcsrc/lib/misc.qh
+++ b/qcsrc/lib/misc.qh
@@ -1,12 +1,6 @@
-#ifndef MISC_H
-#define MISC_H
+#pragma once
 
-#ifdef GMQCC
-	#define EVAL(...) __VA_ARGS__
-
-	#define OVERLOAD_(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
-	#define OVERLOAD(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
-#else
+#ifdef __STDC__
 	#define EMPTY()
 	#define DEFER(id) id EMPTY()
 
@@ -17,10 +11,24 @@
 	#define EVAL4(...) EVAL5(EVAL5(EVAL5(__VA_ARGS__)))
 	#define EVAL5(...) __VA_ARGS__
 
-	#define OVERLOAD___(F, _16, _15, _14, _13, _12, _11, _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, n, ...) F##_##n
-	#define OVERLOAD__(F, ...) OVERLOAD___(F,##__VA_ARGS__, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
-	#define OVERLOAD_(...) DEFER(OVERLOAD__(__VA_ARGS__))
-	#define OVERLOAD(F, ...) OVERLOAD_(F,##__VA_ARGS__)(__VA_ARGS__)
+	#include "p99.qh"
+	#define OVERLOAD(F, ...) P99_IF_EMPTY(__VA_ARGS__)(P99_PASTE2(F, _00)())(P99_PASTE3(F, _, P00_NARG(__VA_ARGS__))(__VA_ARGS__))
+	#define OVERLOAD_(F, ...) P99_IF_EMPTY(__VA_ARGS__)(P99_PASTE2(F, _00)())(P99_PASTE3(F, _, P00_NARG(__VA_ARGS__))(__VA_ARGS__))
+#else
+	#define EVAL(...) __VA_ARGS__
+
+	#define OVERLOAD_(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
+	#define OVERLOAD(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
+#endif
+
+#if defined(CSQC)
+	#define etof(e) num_for_edict(e)
+	#define ftoe(i) entitybyindex(i)
+#elif defined(SVQC)
+	#define etof(e) num_for_edict(e)
+	#define ftoe(i) edict_num(i)
+#elif defined(MENUQC)
+	// already defined
 #endif
 
 #define GET(name) name##get
@@ -30,13 +38,12 @@
 
 // With block may not contain continue or break
 #define WITH(type, name, value, block) \
-	do \
+	MACRO_BEGIN \
 	{ \
 		type __with_save = (name); \
 		name = (value); \
 		LAMBDA(block) \
 		name = __with_save; \
-	} \
-	while (0)
+	} MACRO_END
 
-#endif
+#define WITHSELF(value, block) WITH(entity, __self, value, block)