aboutsummaryrefslogtreecommitdiff
path: root/core/project_settings.h
diff options
context:
space:
mode:
authorRémi Verschelde2018-02-19 14:53:59 +0100
committerRémi Verschelde2018-02-19 16:41:43 +0100
commit7839076f95679c85e7adfdccdd671b2927c82f2f (patch)
tree355b7740f7f56951c71f1cf275a8f0cd2d717ff0 /core/project_settings.h
parent4faf81977dc7cf9d160f20151e06cfe5b74454cc (diff)
downloadgodot-7839076f95679c85e7adfdccdd671b2927c82f2f.tar.gz
godot-7839076f95679c85e7adfdccdd671b2927c82f2f.tar.zst
godot-7839076f95679c85e7adfdccdd671b2927c82f2f.zip
Diffstat (limited to 'core/project_settings.h')
-rw-r--r--core/project_settings.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/project_settings.h b/core/project_settings.h
index eba53441c..9b51bc3ac 100644
--- a/core/project_settings.h
+++ b/core/project_settings.h
@@ -93,8 +93,9 @@ protected:
static ProjectSettings *singleton;
- Error _load_settings(const String p_path);
+ Error _load_settings_text(const String p_path);
Error _load_settings_binary(const String p_path);
+ Error _load_settings_text_or_binary(const String p_text_path, const String p_bin_path);
Error _save_settings_text(const String &p_file, const Map<String, List<String> > &props, const CustomMap &p_custom = CustomMap(), const String &p_custom_features = String());
Error _save_settings_binary(const String &p_file, const Map<String, List<String> > &props, const CustomMap &p_custom = CustomMap(), const String &p_custom_features = String());