diff --git a/data/title/_loading_screen2.png b/data/title/_loading_screen2.png deleted file mode 100644 index 9fd617d..0000000 Binary files a/data/title/_loading_screen2.png and /dev/null differ diff --git a/data/title/loading_screen1.png b/data/title/loading_screen1.png deleted file mode 100644 index a95d6de..0000000 Binary files a/data/title/loading_screen1.png and /dev/null differ diff --git a/data/title/loading_screen2.png b/data/title/loading_screen2.png deleted file mode 100644 index 000f765..0000000 Binary files a/data/title/loading_screen2.png and /dev/null differ diff --git a/data/title/loading_screen_bn.png b/data/title/loading_screen_bn.png new file mode 100644 index 0000000..6ec08b7 Binary files /dev/null and b/data/title/loading_screen_bn.png differ diff --git a/data/title/loading_screen_color.png b/data/title/loading_screen_color.png new file mode 100644 index 0000000..3b68f0d Binary files /dev/null and b/data/title/loading_screen_color.png differ diff --git a/source/demo.cpp b/source/demo.cpp index cee3cdb..b6bf2b3 100644 --- a/source/demo.cpp +++ b/source/demo.cpp @@ -101,7 +101,7 @@ void Demo::checkEventHandler() break; default: - section.name == SECTION_PROG_TITLE; + section.name = SECTION_PROG_TITLE; break; } } diff --git a/source/director.cpp b/source/director.cpp index 02d4ed0..d2c2835 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -9,7 +9,7 @@ Director::Director(std::string path) section.name = SECTION_PROG_LOGO; section.subsection = SUBSECTION_LOGO_TO_INTRO; - section.name = SECTION_PROG_GAME; + //section.name = SECTION_PROG_GAME; // Crea el objeto que controla los ficheros de recursos asset = new Asset(path.substr(0, path.find_last_of("\\/"))); @@ -621,8 +621,8 @@ bool Director::setFileList() asset->add("/../data/logo/seagull.png", t_bitmap); // Intro - asset->add("/../data/title/loading_screen1.png", t_bitmap); - asset->add("/../data/title/loading_screen2.png", t_bitmap); + asset->add("/../data/title/loading_screen_bn.png", t_bitmap); + asset->add("/../data/title/loading_screen_color.png", t_bitmap); return asset->check(); } diff --git a/source/intro.cpp b/source/intro.cpp index dd8d2a3..ec92274 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -10,8 +10,8 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - loadingScreenTexture1 = new Texture(renderer, asset->get("loading_screen1.png")); - loadingScreenTexture2 = new Texture(renderer, asset->get("loading_screen2.png")); + loadingScreenTexture1 = new Texture(renderer, asset->get("loading_screen_bn.png")); + loadingScreenTexture2 = new Texture(renderer, asset->get("loading_screen_color.png")); sprite1 = new Sprite(0, 0, loadingScreenTexture1->getWidth(), loadingScreenTexture1->getHeight(), loadingScreenTexture1, renderer); sprite2 = new Sprite(0, 0, loadingScreenTexture2->getWidth(), loadingScreenTexture2->getHeight(), loadingScreenTexture2, renderer); loadingSound1 = JA_LoadMusic(asset->get("loading_sound1.ogg").c_str()); diff --git a/source/title.cpp b/source/title.cpp index cdabda8..a94b656 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -10,7 +10,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Asset *asset) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - texture = new Texture(renderer, asset->get("loading_screen2.png")); + texture = new Texture(renderer, asset->get("loading_screen_color.png")); sprite = new Sprite(0, 0, texture->getWidth(), texture->getHeight(), texture, renderer); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer);