diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-11-24 10:42:05 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-24 10:42:05 -0300 |
commit | ccd40f76e8975b679619eb3591eb56376e82a6b3 (patch) | |
tree | 9b6e4027c1c6bfdae82c2df54f1d9eb09d75ea43 /main/main.cpp | |
parent | 85eedffbc77d9bdd92c8851aea09146feaf2d843 (diff) | |
download | redot-engine-ccd40f76e8975b679619eb3591eb56376e82a6b3.tar.gz |
-work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
Diffstat (limited to 'main/main.cpp')
-rw-r--r-- | main/main.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/main/main.cpp b/main/main.cpp index b6bc10cee7..b4f4c48643 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -870,21 +870,13 @@ Error Main::setup2() { String boot_logo_path=GLOBAL_DEF("application/boot_splash",String()); bool boot_logo_scale=GLOBAL_DEF("application/boot_splash_fullsize",true); Globals::get_singleton()->set_custom_property_info("application/boot_splash",PropertyInfo(Variant::STRING,"application/boot_splash",PROPERTY_HINT_FILE,"*.png")); - print_line("BOOT SPLASH: "+boot_logo_path); Image boot_logo; boot_logo_path = boot_logo_path.strip_edges(); - print_line("BOOT SPLASH IS : "+boot_logo_path); if (boot_logo_path!=String() /*&& FileAccess::exists(boot_logo_path)*/) { Error err = boot_logo.load(boot_logo_path); - if (err!=OK) { - print_line("ËRROR LOADING BOOT LOGO SPLASH :"+boot_logo_path); - } else { - print_line("BOOT SPLASH OK!"); - - } } if (!boot_logo.empty()) { @@ -944,10 +936,10 @@ Error Main::setup2() { if (String(Globals::get_singleton()->get("display/custom_mouse_cursor"))!=String()) { - print_line("use custom cursor"); + //print_line("use custom cursor"); Ref<Texture> cursor=ResourceLoader::load(Globals::get_singleton()->get("display/custom_mouse_cursor")); if (cursor.is_valid()) { - print_line("loaded ok"); + // print_line("loaded ok"); Vector2 hotspot = Globals::get_singleton()->get("display/custom_mouse_cursor_hotspot"); Input::get_singleton()->set_custom_mouse_cursor(cursor,hotspot); } |