From f62b7f216e44a309e12ed5cc6915f99aeb1ea402 Mon Sep 17 00:00:00 2001
From: AconiteX <63141077+AconiteX@users.noreply.github.com>
Date: Sun, 3 Oct 2021 01:27:04 -0400
Subject: [PATCH] Update ClientInteriorLayoutManager.cpp

---
 .../src/shared/object/ClientInteriorLayoutManager.cpp     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/engine/client/library/clientGame/src/shared/object/ClientInteriorLayoutManager.cpp b/src/engine/client/library/clientGame/src/shared/object/ClientInteriorLayoutManager.cpp
index a44967811..31da08c34 100644
--- a/src/engine/client/library/clientGame/src/shared/object/ClientInteriorLayoutManager.cpp
+++ b/src/engine/client/library/clientGame/src/shared/object/ClientInteriorLayoutManager.cpp
@@ -28,6 +28,8 @@ namespace ClientInteriorLayoutManagerNamespace
 	bool ms_disableLazyInteriorLayoutCreation;
 	bool ms_logApplyInteriorLayoutCreates;
 
+	bool ms_disableInteriorLayouts;
+
 	void remove();
 }
 
@@ -41,6 +43,8 @@ void ClientInteriorLayoutManager::install(bool const disableLazyInteriorLayoutCr
 
 	ms_disableLazyInteriorLayoutCreation = ConfigFile::getKeyBool("ClientGame/ClientInteriorLayoutManager", "disableLazyInteriorLayoutCreation", disableLazyInteriorLayoutCreation);
 
+	ms_disableInteriorLayouts = !ConfigFile::getKeyBool("ClientGame", "useInteriorLayoutFiles", true);
+
 	DebugFlags::registerFlag(ms_logApplyInteriorLayoutCreates, "ClientGame/ClientInteriorLayoutManager", "logApplyInteriorLayoutCreates");
 
 	ExitChain::add(remove, "ClientInteriorLayoutManagerNamespace::remove");
@@ -57,7 +61,7 @@ void ClientInteriorLayoutManagerNamespace::remove()
 
 void ClientInteriorLayoutManager::update()
 {
-	if (ms_disableLazyInteriorLayoutCreation)
+	if (ms_disableLazyInteriorLayoutCreation || ms_disableInteriorLayouts)
 		return;
 
 	//-- find all visible cells
@@ -131,7 +135,7 @@ void ClientInteriorLayoutManager::applyInteriorLayout(TangibleObject * const tan
 {
 	UNREF(fileName);
 
-	if (!ms_disableLazyInteriorLayoutCreation)
+	if (!ms_disableLazyInteriorLayoutCreation || ms_disableInteriorLayouts)
 		return;
 
 	if (!tangibleObject)