From acc24ea22ee0205c0f0a774ab842f4008667bda9 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 17 Dec 2012 15:16:15 +0100 Subject: [PATCH] more gmqcc compile fixes --- qcsrc/common/util-pre.qh | 2 ++ qcsrc/common/util.qh | 4 ++++ qcsrc/menu/oo/implementation.h | 2 +- qcsrc/server/g_tetris.qc | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh index 84eaada68..0f195d73b 100644 --- a/qcsrc/common/util-pre.qh +++ b/qcsrc/common/util-pre.qh @@ -1,5 +1,7 @@ +#ifdef FTEQCC #pragma flag enable subscope #pragma flag enable lo +#endif // FTEQCC can do this #define HAVE_YO_DAWG_CPP diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 1294f6968..598706ccf 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -140,7 +140,11 @@ vector mi_pictexcoord3; // texcoords of the image corners (after transforming, t void get_mi_min_max_texcoords(float mode); #endif +#ifdef FTEQCC #define FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(x) void reference_##x() { x = x; } +#else +#define FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(x) +#endif float almost_equals(float a, float b); float almost_in_bounds(float a, float b, float c); diff --git a/qcsrc/menu/oo/implementation.h b/qcsrc/menu/oo/implementation.h index 34f32e306..28b7f08e4 100644 --- a/qcsrc/menu/oo/implementation.h +++ b/qcsrc/menu/oo/implementation.h @@ -21,7 +21,7 @@ #define EXTENDS(base) me = spawn##base (); entity basevtbl; basevtbl = base##_vtbl; #define METHOD(cname,name,prototype) me.name = cname##_##name; #define ATTRIB(cname,name,type,val) me.name = val; -#define ATTRIBARRAY(cname,name,type,cnt) me.name = me.name; +#define ATTRIBARRAY(cname,name,type,cnt) #define ENDCLASS(cname) me.instanceOf##cname = 1; me.classname = #cname; if(!cname##_vtbl) cname##_vtbl = spawnVtbl(me, basevtbl); return me; } // for the implementation diff --git a/qcsrc/server/g_tetris.qc b/qcsrc/server/g_tetris.qc index d194c9431..59bb23aa9 100644 --- a/qcsrc/server/g_tetris.qc +++ b/qcsrc/server/g_tetris.qc @@ -1244,6 +1244,6 @@ float TetrisPostFrame() #else -FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(autocvar_g_bastet); +FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(autocvar_g_bastet) #endif -- 2.39.2