From ddb79c1fccc993b1e5f38c7c6f696d1283ab06d6 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Wed, 14 Nov 2018 15:00:15 +0100 Subject: [PATCH] cleanup --- qcsrc/lib/_all.inc | 1 + qcsrc/lib/deglobalization.qh | 5 +++-- qcsrc/lib/static.qh | 3 --- qcsrc/lib/vector.qh | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index cd35c3436..e2dead33b 100644 --- a/qcsrc/lib/_all.inc +++ b/qcsrc/lib/_all.inc @@ -116,6 +116,7 @@ #include "draw.qh" #include "enumclass.qh" #include "file.qh" +#include "float.qh" #include "functional.qh" #include "i18n.qh" #include "intrusivelist.qh" diff --git a/qcsrc/lib/deglobalization.qh b/qcsrc/lib/deglobalization.qh index 5f5651064..96efec5fb 100644 --- a/qcsrc/lib/deglobalization.qh +++ b/qcsrc/lib/deglobalization.qh @@ -1,10 +1,11 @@ +#include "lib/float.qh" #include "lib/misc.qh" #include "lib/static.qh" #include "lib/vector.qh" // These macros wrap functions which use globals so mutation only occurs inside them and is not visible from outside. -// Functions for which all usages are replaced with these macros can be hidden inside our `*defs.qh` files -// to prevent anyone from using them accidentally. +// Functions for which all usages are replaced with these macros can be hidden by #defines inside our `*defs.qh` files +// to prevent anyone from using them accidentally in the future // TODO stuff in the engine that uses the v_forward/v_right/v_up globals and is not wrapped yet: // - RF_USEAXIS, addentities, predraw, diff --git a/qcsrc/lib/static.qh b/qcsrc/lib/static.qh index bc456f1cc..e0ec96b8e 100644 --- a/qcsrc/lib/static.qh +++ b/qcsrc/lib/static.qh @@ -1,8 +1,5 @@ #pragma once -#include "lib/macro.qh" -#include "lib/log.qh" - #define GETTIME_REALTIME 1 #ifdef MENUQC float(int tmr) _gettime = #67; diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh index d49322efb..ca0e84f67 100644 --- a/qcsrc/lib/vector.qh +++ b/qcsrc/lib/vector.qh @@ -1,7 +1,5 @@ #pragma once -#include "lib/float.qh" - noref vector _vlen2; #define vlen2(v) (_vlen2 = (v), dotproduct(_vlen2, _vlen2)) -- 2.39.2