Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-29 23:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Actually use loaded resource cache

Browse Source
This commit is contained in:
Francois Belair 2023-08-26 17:50:52 -04:00 committed by Relintai
parent 254cb747b7
commit 90d7912fcc
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/io/resource_format_binary.cpp
View File

@ -30,11 +30,11 @@
#include "resource_format_binary.h" #include "resource_format_binary.h"
#include "core/io/image.h" #include "core/config/project_settings.h"
#include "core/io/file_access_compressed.h" #include "core/io/file_access_compressed.h"
#include "core/io/image.h"
#include "core/io/marshalls.h" #include "core/io/marshalls.h"
#include "core/os/dir_access.h" #include "core/os/dir_access.h"
#include "core/config/project_settings.h"
#include "core/version.h" #include "core/version.h"
//#define print_bl(m_what) print_line(m_what) //#define print_bl(m_what) print_line(m_what)
@ -396,7 +396,18 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) {
path = ProjectSettings::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path)); path = ProjectSettings::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
} }
RES res = ResourceLoader::load(path, exttype); RES res;
for (List<RES>::Element *E = resource_cache.front(); E; E = E->next()) {
if (E->get()->get_path() == path) {
res = E->get();
break;
}
}
if (res.is_null()) {
res = ResourceLoader::load(path, exttype);
}
if (res.is_null()) { if (res.is_null()) {
WARN_PRINT(String("Couldn't load resource: " + path).utf8().get_data()); WARN_PRINT(String("Couldn't load resource: " + path).utf8().get_data());