From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 28 Nov 2011 20:08:30 +0000 (+0100)
Subject: add a compatibility workaround for 0.5.0 engine
X-Git-Tag: xonotic-v0.6.0~35^2~33^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a971aa3328f9d21051d7c5e42cfa846d94b8f0c2;p=xonotic%2Fxonotic-data.pk3dir.git

add a compatibility workaround for 0.5.0 engine
---

diff --git a/qcsrc/client/pre.qh b/qcsrc/client/pre.qh
deleted file mode 100644
index e69de29bb..000000000
diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index f5caf74af..a4d8b70b1 100644
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -1,12 +1,10 @@
 ../../csprogs.dat
 
+../common/util-pre.qh
 sys-pre.qh
 ../dpdefs/csprogsdefs.qc
 sys-post.qh
 
-pre.qh
-
-../common/util-pre.qh
 Defs.qc
 ../dpdefs/keycodes.qc
 ../common/constants.qh
diff --git a/qcsrc/client/sys-post.qh b/qcsrc/client/sys-post.qh
index 26eac6b7b..4fee9fec0 100644
--- a/qcsrc/client/sys-post.qh
+++ b/qcsrc/client/sys-post.qh
@@ -1,3 +1,12 @@
 #pragma noref 0
 
 #undef ATTN_NORM
+
+#ifdef COMPAT_050_ENGINE
+// WORKAROUND for 0.5.0 engine
+// FIXME remove this after 0.6 release
+#undef getproperty
+#undef getpropertyvec
+float (float property) getproperty = #303;
+vector (float property) getpropertyvec = #303;
+#endif
diff --git a/qcsrc/client/sys-pre.qh b/qcsrc/client/sys-pre.qh
index 75fdfc18f..1dac05bc1 100644
--- a/qcsrc/client/sys-pre.qh
+++ b/qcsrc/client/sys-pre.qh
@@ -6,4 +6,11 @@
 
 #define ATTN_NORM builtin_ATTN_NORM
 
+#ifdef COMPAT_050_ENGINE
+// WORKAROUND for 0.5.0 engine
+// FIXME remove this after 0.6 release
+#define getproperty builtin_getproperty
+#define getpropertyvec builtin_getpropertyvec
+#endif
+
 #pragma noref 1
diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index e61d57fb6..5a22d3612 100644
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -4,4 +4,5 @@
 #ifndef NOCOMPAT
 //# define WORKAROUND_XON010
 //# define COMPAT_XON010_CHANNELS
+# define COMPAT_XON050_ENGINE
 #endif
diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 3e4ebb8fa..64e6e6674 100644
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -1,12 +1,11 @@
 ../../progs.dat // output filename
 
+../common/util-pre.qh
 sys-pre.qh
 ../dpdefs/progsdefs.qc
 ../dpdefs/dpextensions.qc
 sys-post.qh
 
-../common/util-pre.qh
-
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
 ../warpzonelib/common.qh