From 933d30fce3b22996928997806cf5e82a2bb2a00d Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 31 Jan 2015 15:05:34 +1100 Subject: [PATCH] Remove client and menu sys-post and sys-pre --- qcsrc/client/progs.src | 2 -- qcsrc/client/sys-post.qh | 7 ------- qcsrc/client/sys-pre.qh | 8 -------- qcsrc/dpdefs/csprogsdefs.qh | 6 ++++++ qcsrc/dpdefs/keycodes.qh | 5 +++++ qcsrc/dpdefs/menudefs.qh | 5 +++++ qcsrc/menu/progs.src | 2 -- qcsrc/server/sys-post.qh | 6 +++--- qcsrc/server/sys-pre.qh | 2 +- 9 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 qcsrc/client/sys-post.qh delete mode 100644 qcsrc/client/sys-pre.qh diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index 505a5cf9b..f80da18d6 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -1,9 +1,7 @@ ../../csprogs.dat ../common/util-pre.qh -sys-pre.qh ../dpdefs/csprogsdefs.qh -sys-post.qh announcer.qc bgmscript.qc diff --git a/qcsrc/client/sys-post.qh b/qcsrc/client/sys-post.qh deleted file mode 100644 index 5dc83ef95..000000000 --- a/qcsrc/client/sys-post.qh +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef SYS_POST_H -#define SYS_POST_H - -#pragma noref 0 - -#undef ATTEN_NORM -#endif diff --git a/qcsrc/client/sys-pre.qh b/qcsrc/client/sys-pre.qh deleted file mode 100644 index 9764040b3..000000000 --- a/qcsrc/client/sys-pre.qh +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SYS_PRE_H -#define SYS_PRE_H - -#define ATTEN_NORM builtin_ATTEN_NORM - -#pragma noref 1 - -#endif diff --git a/qcsrc/dpdefs/csprogsdefs.qh b/qcsrc/dpdefs/csprogsdefs.qh index 516a8cc7c..6f820c729 100644 --- a/qcsrc/dpdefs/csprogsdefs.qh +++ b/qcsrc/dpdefs/csprogsdefs.qh @@ -1,5 +1,8 @@ #ifndef CSPROGSDEFS_H #define CSPROGSDEFS_H + +#pragma noref 1 + /* ============================================================================== @@ -1444,4 +1447,7 @@ vector gettaginfo_forward; vector gettaginfo_right; vector gettaginfo_up; float checkpvs(vector viewpos, entity viewee) = #240; + +#pragma noref 0 + #endif diff --git a/qcsrc/dpdefs/keycodes.qh b/qcsrc/dpdefs/keycodes.qh index d01371c4c..69179e24a 100644 --- a/qcsrc/dpdefs/keycodes.qh +++ b/qcsrc/dpdefs/keycodes.qh @@ -1,6 +1,8 @@ #ifndef KEYCODES_H #define KEYCODES_H +#pragma noref 1 + /////////////////////////// // key constants @@ -147,4 +149,7 @@ float K_MOUSE13 = 526; float K_MOUSE14 = 527; float K_MOUSE15 = 528; float K_MOUSE16 = 529; + +#pragma noref 0 + #endif diff --git a/qcsrc/dpdefs/menudefs.qh b/qcsrc/dpdefs/menudefs.qh index be1785205..83cb073a3 100644 --- a/qcsrc/dpdefs/menudefs.qh +++ b/qcsrc/dpdefs/menudefs.qh @@ -1,6 +1,8 @@ #ifndef MENUDEFS_H #define MENUDEFS_H +#pragma noref 1 + ////////////////////////////////////////////////////////// // sys globals @@ -566,4 +568,7 @@ string getextresponse(void) = #624; const string cvar_string(string name) = #71; const string cvar_defstring(string name) = #89; float stringwidth(string text, float handleColors, vector size) = #468; + +#pragma noref 0 + #endif diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src index e18aacd84..a1fb38b1a 100644 --- a/qcsrc/menu/progs.src +++ b/qcsrc/menu/progs.src @@ -1,10 +1,8 @@ ../../menu.dat ../common/util-pre.qh -sys-pre.qh ../dpdefs/menudefs.qh ../dpdefs/keycodes.qh -sys-post.qh oo/interface.qh classes.qc diff --git a/qcsrc/server/sys-post.qh b/qcsrc/server/sys-post.qh index 5e80483b9..3143699f2 100644 --- a/qcsrc/server/sys-post.qh +++ b/qcsrc/server/sys-post.qh @@ -1,9 +1,6 @@ #ifndef SERVER_SYS_POST_H #define SERVER_SYS_POST_H -#pragma noref 0 - -#undef ATTEN_NORM #undef objerror #undef droptofloor #undef sound @@ -15,4 +12,7 @@ var float(string name) cvar; var string(string name) cvar_string; var void(string name, string value) cvar_set; + +#pragma noref 0 + #endif diff --git a/qcsrc/server/sys-pre.qh b/qcsrc/server/sys-pre.qh index b31194fb9..bfdcdb860 100644 --- a/qcsrc/server/sys-pre.qh +++ b/qcsrc/server/sys-pre.qh @@ -1,7 +1,6 @@ #ifndef SERVER_SYS_PRE_H #define SERVER_SYS_PRE_H -#define ATTEN_NORM builtin_ATTEN_NORM #define objerror builtin_objerror #define droptofloor builtin_droptofloor #define sound builtin_sound @@ -11,4 +10,5 @@ #define cvar builtin_cvar #pragma noref 1 + #endif -- 2.39.2