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 (file)
index e69de29..0000000

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index f5caf74afea392a6517e63bd755147db27b8e18e..a4d8b70b1c4e3cf9c83e0ac98a27e1049bf495ca 100644 (file)
--- 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 26eac6b7ba75348021f9f886efe127c77d535445..4fee9fec0572fb9d3cc4d10c4e5b990adc6e3e59 100644 (file)
--- 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 75fdfc18f1a5b60c8577e9f522544fe7ee1a5cba..1dac05bc1618592848eaf97ddc88e4b914400ce5 100644 (file)
--- 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 e61d57fb65e8721660aa369acb81628e20f9abd9..5a22d3612d21bcf881ccc880357bf26ffe4a4193 100644 (file)
--- 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 3e4ebb8fa26bc0bdcbe9af477d7e210b87027816..64e6e66741b1ab3936f41180d6ed78bc4a20d67c 100644 (file)
--- 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