diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-30 22:11:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-30 22:11:09 +0200 |
| commit | 4b015abfd4821ffa82ca7d170f8619794aee0ab8 (patch) | |
| tree | 21a99875b0416dcfe91eeee89892dc307a2b2bc5 | |
| parent | 12ea8b9074105463f6a4281a2db6ade8c0d9d0d5 (diff) | |
| parent | fc8b73a9351063b5bc1af66b257bac0cac2deff4 (diff) | |
Merge pull request #22571 from akien-mga/main-load-warnings
Main: Use ImageLoader directly instead of Image::load
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index 5320d73c7f..3eb0b7f354 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -34,6 +34,7 @@ #include "core/io/file_access_network.h" #include "core/io/file_access_pack.h" #include "core/io/file_access_zip.h" +#include "core/io/image_loader.h" #include "core/io/ip.h" #include "core/io/resource_loader.h" #include "core/io/stream_peer_ssl.h" @@ -1124,9 +1125,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) { boot_logo_path = boot_logo_path.strip_edges(); if (boot_logo_path != String()) { - print_line("Boot splash path: " + boot_logo_path); boot_logo.instance(); - Error err = boot_logo->load(boot_logo_path); + Error err = ImageLoader::load_image(boot_logo_path, boot_logo); if (err) ERR_PRINTS("Non-existing or invalid boot splash at: " + boot_logo_path + ". Loading default splash."); } @@ -1707,7 +1707,7 @@ bool Main::start() { if (iconpath != "") { Ref<Image> icon; icon.instance(); - if (icon->load(iconpath) == OK) { + if (ImageLoader::load_image(iconpath, icon) == OK) { OS::get_singleton()->set_icon(icon); hasicon = true; } |