From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 13 Aug 2017 11:55:35 +0000 (+1000)
Subject: Hide these from game code
X-Git-Tag: xonotic-v0.8.5~2527
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e1fa3eabc8786dd09a95f3bf4ccae3a9c0400d6e;p=xonotic%2Fxonotic-data.pk3dir.git

Hide these from game code
---

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 64b340622..323ebb351 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -108,11 +108,6 @@ 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 4da78f144..d8f07455a 100644
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -250,7 +250,13 @@ void make_safe_for_remove(entity this);
 
 #ifdef CSQC
 	void _CSQC_Init();
-	void CSQC_Init() { if (_CSQC_Init) _CSQC_Init(); }
+	void CSQC_Init()
+	{
+		static_init();
+		static_init_late();
+		static_init_precache();
+		if (_CSQC_Init) _CSQC_Init();
+	}
 	#define CSQC_Init _CSQC_Init
 
 	void _CSQC_Shutdown();