From 9df337b2773be2078cef8faa74d3ca2ecbac0819 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Thu, 1 Jul 2021 19:33:46 +0200
Subject: [PATCH] #5660: The flexibility of being able to define the name of
 the "name" entity key in the .game file is not worth the performance cost.

---
 install/games/darkmod.game              | 1 -
 install/games/doom3-demo.game           | 1 -
 install/games/doom3.game                | 1 -
 install/games/prey.game                 | 1 -
 install/games/quake3.game               | 1 -
 install/games/quake4.game               | 1 -
 install/games/xreal.game                | 1 -
 radiantcore/entity/NamespaceManager.cpp | 8 +++++---
 8 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/install/games/darkmod.game b/install/games/darkmod.game
index b4ec45634d..642f19f5d1 100644
--- a/install/games/darkmod.game
+++ b/install/games/darkmod.game
@@ -153,7 +153,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
         <speakerMinRadius value="24" />
         <speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/install/games/doom3-demo.game b/install/games/doom3-demo.game
index a8578bdae1..1b371e6dbd 100644
--- a/install/games/doom3-demo.game
+++ b/install/games/doom3-demo.game
@@ -137,7 +137,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
 		<speakerMinRadius value="24" />
         <speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/install/games/doom3.game b/install/games/doom3.game
index 0390ee054b..4820cc6dba 100644
--- a/install/games/doom3.game
+++ b/install/games/doom3.game
@@ -145,7 +145,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
         <speakerMinRadius value="24" />
         <speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/install/games/prey.game b/install/games/prey.game
index 7a33ded6ff..326d9f3f20 100644
--- a/install/games/prey.game
+++ b/install/games/prey.game
@@ -145,7 +145,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
         <speakerMinRadius value="24" />
         <speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/install/games/quake3.game b/install/games/quake3.game
index 65fac42248..d14ea5b444 100644
--- a/install/games/quake3.game
+++ b/install/games/quake3.game
@@ -142,7 +142,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
         <speakerMinRadius value="24" />
         <speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/install/games/quake4.game b/install/games/quake4.game
index 3d35d6866c..1802a59c20 100644
--- a/install/games/quake4.game
+++ b/install/games/quake4.game
@@ -145,7 +145,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
         <speakerMinRadius value="24" />
         <speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/install/games/xreal.game b/install/games/xreal.game
index 62b79477c7..6423966d5c 100644
--- a/install/games/xreal.game
+++ b/install/games/xreal.game
@@ -153,7 +153,6 @@
 		<curveCatmullRomKey value="curve_CatmullRomSpline" />
 		<bindKey value="bind" />
 		<playerHeight value="64" />
-		<nameKey value="name" />
 		<speakerMinRadius value="24" />
 		<speakerMaxRadius value="32" />
 		<guiSmallFontLimit value="0.15" />
diff --git a/radiantcore/entity/NamespaceManager.cpp b/radiantcore/entity/NamespaceManager.cpp
index 8248fcbdab..45493bb5b9 100644
--- a/radiantcore/entity/NamespaceManager.cpp
+++ b/radiantcore/entity/NamespaceManager.cpp
@@ -8,14 +8,16 @@
 namespace entity 
 {
 
-// The registry key pointing towards the "name" spawnarg
-const char* const GKEY_NAME_KEY("/defaults/nameKey");
+namespace
+{
+    const char* const NAME_KEY("name");
+}
 
 NamespaceManager::NamespaceManager(SpawnArgs& entity) :
     _namespace(nullptr),
     _entity(entity),
     _updateMutex(false),
-    _nameKey(game::current::getValue<std::string>(GKEY_NAME_KEY))
+    _nameKey(NAME_KEY)
 {
     // Attach <self> to the observed entity
     _entity.attachObserver(this);