summaryrefslogtreecommitdiff
path: root/core/io/resource_loader.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-02-25 09:31:47 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-02-25 09:31:47 -0300
commitb2ce682f6ed9493423be257a5b2e87126692a94f (patch)
tree705a351239b0f87c0e7166c5948716a054ca98d8 /core/io/resource_loader.cpp
parent06e358199f0c038e781753001d9292349f2040ad (diff)
-scripts are converted to bytecode on export
-fix bug in doc where touchscreen events were not documented
Diffstat (limited to 'core/io/resource_loader.cpp')
-rw-r--r--core/io/resource_loader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 3bae6be83c..13dac6ed16 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -192,6 +192,7 @@ RES ResourceLoader::load(const String &p_path,const String& p_type_hint,bool p_n
res->set_last_modified_time(mt);
}
#endif
+ print_line("LOADED: "+res->get_path());
return res;
}
@@ -246,7 +247,7 @@ String ResourceLoader::find_complete_path(const String& p_path,const String& p_t
String path = local_path+E->get();
- if (FileAccess::exists(path)) {
+ if (PathRemap::get_singleton()->has_remap(path) || FileAccess::exists(path)) {
candidates.push_back(path);
}