From 733f4f7aeaccc732c5f5fc0bae2f70c416ddab1f Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Thu, 22 Apr 2021 18:50:49 +1000
Subject: [PATCH] - Move all the timing code from `LoadDefinitions()` to
 `loaddefinitionsfile()`

---
 source/core/defparser.cpp   | 12 ++++++++++++
 source/core/gamecontrol.cpp | 27 ---------------------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/source/core/defparser.cpp b/source/core/defparser.cpp
index 93fcca3aa..020e6026c 100644
--- a/source/core/defparser.cpp
+++ b/source/core/defparser.cpp
@@ -2124,6 +2124,16 @@ void loaddefinitionsfile(const char* fn, bool cumulative)
 		Printf(PRINT_NONOTIFY, "\n");
 	};
 
+	cycle_t deftimer;
+	deftimer.Reset();
+	deftimer.Clock();
+
+	auto printtimer = [&](const char* fn)
+	{
+		deftimer.Unclock();
+		DPrintf(DMSG_SPAMMY, "Definitions file \"%s\" loaded, %f ms.\n", fn, deftimer.TimeMS());
+	};
+
 	if (!cumulative)
 	{
 		int lump = fileSystem.FindFile(fn);
@@ -2131,6 +2141,7 @@ void loaddefinitionsfile(const char* fn, bool cumulative)
 		{
 			Printf(PRINT_NONOTIFY, "Loading \"%s\"\n", fn);
 			parseit(lump);
+			printtimer(fn);
 		}
 	}
 	else
@@ -2140,6 +2151,7 @@ void loaddefinitionsfile(const char* fn, bool cumulative)
 		{
 			Printf(PRINT_NONOTIFY, "Loading \"%s\"\n", fileSystem.GetFileFullPath(lump).GetChars());
 			parseit(lump);
+			printtimer(fn);
 		}
 	}
 }
diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index 55b46a034..6e91ae189 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -1340,26 +1340,11 @@ void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double
 
 void LoadDefinitions()
 {
-	cycle_t deftimer;
-
 	const char* defsfile = G_DefFile();
 	FString razedefsfile = defsfile;
 	razedefsfile.Substitute(".def", "-raze.def");
 
-	auto starttimer = [&]()
-	{
-		deftimer.Reset();
-		deftimer.Clock();
-	};
-	auto printtimer = [&](const char* fn)
-	{
-		deftimer.Unclock();
-		DPrintf(DMSG_SPAMMY, "Definitions file \"%s\" loaded, %f ms.\n", fn, deftimer.TimeMS());
-	};
-
-	starttimer();
 	loaddefinitionsfile("engine/engine.def");	// Internal stuff that is required.
-	printtimer("engine/engine.def");
 
 	// check what we have.
 	// user .defs override the default ones and are not cumulative.
@@ -1367,23 +1352,17 @@ void LoadDefinitions()
 	// otherwise the default rules inherited from older ports apply.
 	if (userConfig.UserDef.IsNotEmpty())
 	{
-		starttimer();
 		loaddefinitionsfile(userConfig.UserDef, false);
-		printtimer(userConfig.UserDef);
 	}
 	else
 	{
 		if (fileSystem.FileExists(razedefsfile))
 		{
-			starttimer();
 			loaddefinitionsfile(razedefsfile, true);
-			printtimer(razedefsfile);
 		}
 		else if (fileSystem.FileExists(defsfile))
 		{
-			starttimer();
 			loaddefinitionsfile(defsfile, false);
-			printtimer(defsfile);
 		}
 	}
 
@@ -1391,26 +1370,20 @@ void LoadDefinitions()
 	{
 		for (auto& m : *userConfig.AddDefs)
 		{
-			starttimer();
 			loaddefinitionsfile(m, false);
-			printtimer(m);
 		}
 		userConfig.AddDefs.reset();
 	}
 
 	if (GameStartupInfo.def.IsNotEmpty())
 	{
-		starttimer();
 		loaddefinitionsfile(GameStartupInfo.def);	// Stuff from gameinfo.
-		printtimer(GameStartupInfo.def);
 	}
 
 	// load the widescreen replacements last. This ensures that mods still get the correct CRCs for their own tile replacements.
 	if (fileSystem.FindFile("engine/widescreen.def") >= 0 && !Args->CheckParm("-nowidescreen"))
 	{
-		starttimer();
 		loaddefinitionsfile("engine/widescreen.def");
-		printtimer("engine/widescreen.def");
 	}
 	fileSystem.InitHashChains(); // make sure that any resources that got added can be found again.
 }