From aae25abf3080283bbff29b8264f24d37f935922a Mon Sep 17 00:00:00 2001
From: Florian Kothmeier <floriankothmeier@web.de>
Date: Mon, 23 Sep 2019 22:41:25 +0200
Subject: Add flag to control the replacement of files by
 ProjectSettings.load_resource_pack

---
 doc/classes/ProjectSettings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/classes')

diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index b42a10b13b..f4e54a2a90 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -80,9 +80,11 @@
 			</return>
 			<argument index="0" name="pack" type="String">
 			</argument>
+			<argument index="1" name="replace_files" type="bool" default="true">
+			</argument>
 			<description>
 				Loads the contents of the .pck or .zip file specified by [code]pack[/code] into the resource filesystem ([code]res://[/code]). Returns [code]true[/code] on success.
-				[b]Note:[/b] If a file from [code]pack[/code] shares the same path as a file already in the resource filesystem, any attempts to load that file will use the file from [code]pack[/code].
+				[b]Note:[/b] If a file from [code]pack[/code] shares the same path as a file already in the resource filesystem, any attempts to load that file will use the file from [code]pack[/code] unless [code]replace_files[/code] is set to [code]false[/code].
 			</description>
 		</method>
 		<method name="localize_path" qualifiers="const">
-- 
cgit v1.2.3