Revert "Hide these from game code" as it broke hud_shownames and who knows what else

This reverts commit e1fa3eabc8786dd09a95f3bf4ccae3a9c0400d6e.

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 323ebb3516147bce98cc49f0d8286c2ec85324b1..64b340622a16a2ee2a3ea5f87d98efb97b1d3ea6 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -108,6 +108,11 @@ void CSQC_Init()
                maxclients = i;
        }
 
+       // needs to be done so early because of the constants they create
+       static_init();
+       static_init_late();
+       static_init_precache();
+
        binddb = db_create();
        tempdb = db_create();
        ClientProgsDB = db_load("client.db");

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index d8f07455a28c7766065c6b6e0737020a4758a5e4..4da78f1444eb27b397d926442c7a153012adf01e 100644 (file)
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -250,13 +250,7 @@ void make_safe_for_remove(entity this);
 
 #ifdef CSQC
        void _CSQC_Init();
-       void CSQC_Init()
-       {
-               static_init();
-               static_init_late();
-               static_init_precache();
-               if (_CSQC_Init) _CSQC_Init();
-       }
+       void CSQC_Init() { if (_CSQC_Init) _CSQC_Init(); }
        #define CSQC_Init _CSQC_Init
 
        void _CSQC_Shutdown();