From: terencehill <piuntn@gmail.com>
Date: Wed, 16 Aug 2017 16:44:40 +0000 (+0200)
Subject: Revert "Hide these from game code" as it broke hud_shownames and who knows what else
X-Git-Tag: xonotic-v0.8.5~2522
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3412a9d342768ebdf8a459c1287c5c89579aaa6d;p=xonotic%2Fxonotic-data.pk3dir.git

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 323ebb351..64b340622 100644
--- 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 d8f07455a..4da78f144 100644
--- 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();