#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.
codereader · Jul 1, 2021 · 9df337b · 9df337b
1 parent ddea62a
commit 9df337b
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);