From 1d693a0c58b39fb84ca691ccad7ceeced00bca52 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 3 Jun 2023 01:29:17 +0200 Subject: [PATCH] Update ResourceLoader Load method parameters. --- gdnative.cpp | 2 +- gdnative.h | 2 +- pluginscript/pluginscript_loader.cpp | 2 +- pluginscript/pluginscript_loader.h | 2 +- videodecoder/video_stream_gdnative.cpp | 2 +- videodecoder/video_stream_gdnative.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdnative.cpp b/gdnative.cpp index dc17344..db820ed 100644 --- a/gdnative.cpp +++ b/gdnative.cpp @@ -520,7 +520,7 @@ Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle, bool p_ return result; } -RES GDNativeLibraryResourceLoader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_no_subresource_cache) { +RES GDNativeLibraryResourceLoader::load(const String &p_path, const String &p_original_path, Error *r_error) { Ref lib; lib.instance(); diff --git a/gdnative.h b/gdnative.h index 9ac8d0f..7b54134 100644 --- a/gdnative.h +++ b/gdnative.h @@ -166,7 +166,7 @@ public: class GDNativeLibraryResourceLoader : public ResourceFormatLoader { public: - virtual RES load(const String &p_path, const String &p_original_path, Error *r_error, bool p_no_subresource_cache = false); + virtual RES load(const String &p_path, const String &p_original_path, Error *r_error); virtual void get_recognized_extensions(List *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; diff --git a/pluginscript/pluginscript_loader.cpp b/pluginscript/pluginscript_loader.cpp index 055a16c..8777cbd 100644 --- a/pluginscript/pluginscript_loader.cpp +++ b/pluginscript/pluginscript_loader.cpp @@ -39,7 +39,7 @@ ResourceFormatLoaderPluginScript::ResourceFormatLoaderPluginScript(PluginScriptL _language = language; } -RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_no_subresource_cache) { +RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p_original_path, Error *r_error) { if (r_error) { *r_error = ERR_FILE_CANT_OPEN; } diff --git a/pluginscript/pluginscript_loader.h b/pluginscript/pluginscript_loader.h index d1df324..f539406 100644 --- a/pluginscript/pluginscript_loader.h +++ b/pluginscript/pluginscript_loader.h @@ -43,7 +43,7 @@ class ResourceFormatLoaderPluginScript : public ResourceFormatLoader { public: ResourceFormatLoaderPluginScript(PluginScriptLanguage *language); - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_no_subresource_cache = false); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr); virtual void get_recognized_extensions(List *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; diff --git a/videodecoder/video_stream_gdnative.cpp b/videodecoder/video_stream_gdnative.cpp index 3f607b0..dbe3da7 100644 --- a/videodecoder/video_stream_gdnative.cpp +++ b/videodecoder/video_stream_gdnative.cpp @@ -361,7 +361,7 @@ void VideoStreamGDNative::set_audio_track(int p_track) { /* --- NOTE ResourceFormatLoaderVideoStreamGDNative starts here. ----- */ -RES ResourceFormatLoaderVideoStreamGDNative::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_no_subresource_cache) { +RES ResourceFormatLoaderVideoStreamGDNative::load(const String &p_path, const String &p_original_path, Error *r_error) { FileAccess *f = FileAccess::open(p_path, FileAccess::READ); if (!f) { if (r_error) { diff --git a/videodecoder/video_stream_gdnative.h b/videodecoder/video_stream_gdnative.h index 91b60df..0a0409f 100644 --- a/videodecoder/video_stream_gdnative.h +++ b/videodecoder/video_stream_gdnative.h @@ -198,7 +198,7 @@ public: class ResourceFormatLoaderVideoStreamGDNative : public ResourceFormatLoader { public: - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_no_subresource_cache = false); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr); virtual void get_recognized_extensions(List *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const;