From 7bf8db941dc41e5ef71603ec616021995814ea23 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 24 Mar 2020 07:47:41 +0100
Subject: [PATCH] Shoved some precaching stuff around

---
 .gitignore         | 11 ++++++++
 default.fmf        |  4 +--
 src/client/defs.h  |  8 +++---
 src/client/entry.c | 68 +++++++++++++++++++++++-----------------------
 4 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71b48815..edd6948f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,13 @@ src/server/cstrike.new
 src/shared/cstrike.new
 *.lno
 *.pk3
+*.dat
+*.way
+*.lvc
+*.fsv
+*.pak
+*.pk3
+*.pk4
 csqccore.txt
 ssqccore.txt
 menucore.txt
@@ -16,3 +23,7 @@ condump.txt
 config.cfg
 fte.cfg
 qkey
+installed.lst
+*.kdev4
+hl2/*
+*.ico
diff --git a/default.fmf b/default.fmf
index 44689736..98b5de87 100755
--- a/default.fmf
+++ b/default.fmf
@@ -1,7 +1,7 @@
 FTEMANIFEST 1
 game valve
-name "FTEQW"
-protocolname "FTEQW"
+name "Nuclide"
+protocolname "Nuclide"
 basegame logos
 basegame valve
 disablehomedir 1
diff --git a/src/client/defs.h b/src/client/defs.h
index 5edc0ad5..4b9b148b 100644
--- a/src/client/defs.h
+++ b/src/client/defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Marco Hladik <marco@icculus.org>
+ * Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,10 +21,10 @@
 #define DRAWFLAG_2XMODULATE	3
 
 /* undocumented printcall types */
-#define PRINT_LOW	0
+#define PRINT_LOW		0
 #define PRINT_MEDIUM	1
-#define PRINT_HIGH	2
-#define PRINT_CHAT	3
+#define PRINT_HIGH		2
+#define PRINT_CHAT		3
 
 /* fonts */
 var float FONT_16;
diff --git a/src/client/entry.c b/src/client/entry.c
index 41d7b5d2..7da873cc 100644
--- a/src/client/entry.c
+++ b/src/client/entry.c
@@ -58,6 +58,32 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
 	precache_model("sprites/muzzleflash2.spr");
 	precache_model("sprites/muzzleflash3.spr");
 
+	/* VOX */
+	Sound_InitVOX();
+
+	/* Effects */
+	Effects_Init();
+
+	precache_sound("common/wpn_hudon.wav");
+	precache_sound("common/wpn_hudoff.wav");
+	precache_sound("common/wpn_moveselect.wav");
+	precache_sound("common/wpn_select.wav");
+
+	/* VGUI */
+	VGUI_Init();
+
+	/* Game specific inits */
+	Client_Init(apilevel, enginename, engineversion);
+	DSP_Init();
+	CSQC_RendererRestarted("init");
+	Titles_Init();
+	Sentences_Init();
+}
+
+/* Rendering Caches */
+void
+CSQC_RendererRestarted(string rstr)
+{
 	/* Fonts */
 	FONT_16 = loadfont("16", "fonts/default", "16", -1);
 	FONT_20 = loadfont("cr", "creditsfont?fmt=h", "20", -1);
@@ -78,34 +104,16 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
 	precache_pic("gfx/vgui/icntlk_sv");
 	precache_pic("gfx/vgui/icntlk_pl");
 
+	/* View */
+	Scores_Init();
+	View_Init();
+	HUD_Init();
+
 	/* GS-Entbase */
 	Fade_Init();
-
-	/* VOX */
-	Sound_InitVOX();
-
-	/* View */
-	View_Init();
-
-	/* Effects */
-	Effects_Init();
-
-	precache_sound("common/wpn_hudon.wav");
-	precache_sound("common/wpn_hudoff.wav");
-	precache_sound("common/wpn_moveselect.wav");
-	precache_sound("common/wpn_select.wav");
-
-	/* VGUI */
-	VGUI_Init();
-
-	/* Game specific inits */
-	HUD_Init();
-	Scores_Init();
-	Client_Init(apilevel, enginename, engineversion);
-	DSP_Init();
-	CSQC_RendererRestarted("init");
-	Titles_Init();
-	Sentences_Init();
+	Sky_Update();
+	Decal_Reload();
+	Game_RendererRestarted(rstr);
 }
 
 void
@@ -814,14 +822,6 @@ CSQC_WorldLoaded(void)
 	Sky_Update();
 }
 
-void
-CSQC_RendererRestarted(string rstr)
-{
-	Sky_Update();
-	Decal_Reload();
-	Game_RendererRestarted(rstr);
-}
-
 /*
 =================
 CSQC_Shutdown