X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2F_all.inc;h=0bef0b6e0e944feebfe54c14fea8728a9bc6d295;hb=51e4f798abb1fc968f37d1ad425eaf5871bb33de;hp=a5204fa052d6804677c912c8e5d789e8b2ff31a9;hpb=79eebf87e68861e205a8754d6551bd0aa2229c44;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index a5204fa05..0bef0b6e0 100644
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -24,6 +24,26 @@
 	#define bool float
 #endif
 
+#ifndef QCC_SUPPORT_ACCUMULATE
+	#warning "QCC does not support accumulate, may not compile correctly"
+	#define ACCUMULATE
+#else
+	#define ACCUMULATE [[accumulate]]
+#endif
+
+#ifndef QCC_SUPPORT_ERASEABLE
+	#define ERASEABLE
+#else
+	#define ERASEABLE [[eraseable]]
+#endif
+
+#ifndef QCC_SUPPORT_ALIAS
+    #warning "QCC does not support alias, may not compile correctly"
+    #define ALIAS(var)
+#else
+    #define ALIAS(var) [[alias(var)]]
+#endif
+
 #include <dpdefs/pre.qh>
 
 #if defined(CSQC)
@@ -41,6 +61,12 @@
 
 #include <dpdefs/post.qh>
 
+#ifndef QCC_SUPPORT_POW
+    #define pow(a, b) pow(a, b)
+#else
+    #define pow(a, b) ((a) ** (b))
+#endif
+
 #include "self.qh"
 
 #define USING(name, T) typedef T name
@@ -61,21 +87,26 @@
 	MACRO_END
 #endif
 
-#define   is_float(this) (true || ftoe(this))
-#define isnt_float(this)
-#define   is_vector(this) (true || vtos(this))
-#define isnt_vector(this)
-#define   is_string(this) (true || stof(this))
-#define isnt_string(this)
-#define   is_entity(this) (true || etof(this))
-#define isnt_entity(this)
-bool      is_int(float this) { return this == floor(this); }
-void    isnt_int(float this) { print(ftos(this)); }
-bool      is_bool(float this) { return this == true || this == false; }
-void    isnt_bool(float this) { print(ftos(this)); }
+#if !(NDEBUG)
+	#define   is_float(this) (true || ftoe(this))
+	#define isnt_float(this)
+	#define   is_vector(this) (true || vtos(this))
+	#define isnt_vector(this)
+	#define   is_string(this) (true || stof(this))
+	#define isnt_string(this)
+	#define   is_entity(this) (true || etof(this))
+	#define isnt_entity(this)
+	bool      is_int(float this) { return this == floor(this); }
+	void    isnt_int(float this) { print(ftos(this)); }
+	bool      is_bool(float this) { return this == true || this == false; }
+	void    isnt_bool(float this) { print(ftos(this)); }
+#endif
 
 #include "warpzone/mathlib.qc"
 
+// needs to be included before any of the functions which use globals are called
+#include "deglobalization.qh"
+
 #include "accumulate.qh"
 #include "angle.qc"
 #include "arraylist.qh"
@@ -87,6 +118,7 @@ void    isnt_bool(float this) { print(ftos(this)); }
 #include "draw.qh"
 #include "enumclass.qh"
 #include "file.qh"
+#include "float.qh"
 #include "functional.qh"
 #include "i18n.qh"
 #include "intrusivelist.qh"
@@ -105,6 +137,7 @@ void    isnt_bool(float this) { print(ftos(this)); }
 #include "oo.qh"
 #include "p2mathlib.qc"
 #include "progname.qh"
+#include "promise.qc"
 #include "random.qc"
 #include "registry.qh"
 #include "registry_net.qh"
@@ -122,7 +155,9 @@ void    isnt_bool(float this) { print(ftos(this)); }
 #include "vector.qh"
 #include "yenc.qh"
 
-#include "matrix/_mod.inc"
+#if XONOTIC
+	#include "matrix/_mod.inc"
+#endif
 
 #ifndef SVQC
 #define objerror_safe(e)
@@ -131,14 +166,14 @@ void make_safe_for_remove(entity this);
     #define objerror_safe(e) make_safe_for_remove(e)
 #endif
 
-#define objerror(this, msg) MACRO_BEGIN { \
+#define objerror(this, msg) MACRO_BEGIN \
 	LOG_WARN("======OBJECT ERROR======"); \
 	entity _e = (this); \
 	eprint(_e); \
 	objerror_safe(_e); \
 	delete(_e); \
 	LOG_WARNF("%s OBJECT ERROR in %s:\n%s\nTip: read above for entity information", PROGNAME, __FUNC__, msg); \
-} MACRO_END
+MACRO_END
 
 #ifdef MENUQC
 	void _m_init();
@@ -172,7 +207,17 @@ void make_safe_for_remove(entity this);
 	#define SV_Shutdown _SV_Shutdown
 
 	void _StartFrame();
-	void StartFrame() { if (_StartFrame) _StartFrame(); }
+	bool _StartFrame_init;
+	void spawnfunc_worldspawn(entity);
+	void StartFrame() {
+		if (!_StartFrame_init) {
+			_StartFrame_init = true;
+			float oldtime = time; time = 1;
+			__spawnfunc_expecting = 2; NULL.__spawnfunc_constructor(NULL);
+			time = oldtime;
+        }
+        if (_StartFrame) _StartFrame();
+	}
 	#define StartFrame _StartFrame
 
 	void _SetNewParms();
@@ -183,6 +228,12 @@ void make_safe_for_remove(entity this);
 	void SetChangeParms() { ENGINE_EVENT(); if (_SetChangeParms) _SetChangeParms(this); }
 	#define SetChangeParms _SetChangeParms
 
+#ifdef DP_EXT_PRECONNECT
+	void _ClientPreConnect(entity this);
+	void ClientPreConnect() { ENGINE_EVENT(); if (_ClientPreConnect) _ClientPreConnect(this); }
+	#define ClientPreConnect _ClientPreConnect
+#endif
+
 	void _ClientConnect(entity this);
 	void ClientConnect() { ENGINE_EVENT(); if (_ClientConnect) _ClientConnect(this); }
 	#define ClientConnect _ClientConnect
@@ -215,7 +266,8 @@ void make_safe_for_remove(entity this);
 	void SV_OnEntityPreSpawnFunction()
 	{
 		ENGINE_EVENT();
-		if (_SV_OnEntityPreSpawnFunction) _SV_OnEntityPreSpawnFunction(this);
+		__spawnfunc_expecting = true;
+		__spawnfunc_expect = this;
 	}
 	#define SV_OnEntityPreSpawnFunction _SV_OnEntityPreSpawnFunction
 
@@ -266,6 +318,8 @@ void make_safe_for_remove(entity this);
 #endif
 #undef ENGINE_EVENT
 
-#ifndef MENUQC
+#if XONOTIC
+#ifdef GAMEQC
 	#include <ecs/_mod.qh>
 #endif
+#endif