summaryrefslogtreecommitdiff
path: root/core/project_settings.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/project_settings.h')
-rw-r--r--core/project_settings.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/project_settings.h b/core/project_settings.h
index d7651417d5..b32470361b 100644
--- a/core/project_settings.h
+++ b/core/project_settings.h
@@ -35,10 +35,6 @@
#include "core/os/thread_safe.h"
#include "core/set.h"
-/**
- @author Juan Linietsky <reduzio@gmail.com>
-*/
-
class ProjectSettings : public Object {
GDCLASS(ProjectSettings, Object);
@@ -108,7 +104,7 @@ protected:
void _convert_to_last_version(int p_from_version);
- bool _load_resource_pack(const String &p_pack);
+ bool _load_resource_pack(const String &p_pack, bool p_replace_files = true);
void _add_property_info_bind(const Dictionary &p_info);