diff --git a/media/music/jd.ogg b/media/music/game.ogg similarity index 100% rename from media/music/jd.ogg rename to media/music/game.ogg diff --git a/media/music/title.ogg b/media/music/title.ogg new file mode 100644 index 0000000..1593ade Binary files /dev/null and b/media/music/title.ogg differ diff --git a/source/director.cpp b/source/director.cpp index 0272d83..66dc76e 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -186,7 +186,8 @@ bool Director::setFileList() asset->add("/media/items/items.png", bitmap); - asset->add("/media/music/jd.ogg", music); + asset->add("/media/music/title.ogg", music); + asset->add("/media/music/game.ogg", music); asset->add("/media/sound/item.wav", sound); diff --git a/source/game.cpp b/source/game.cpp index 6330ad5..9975119 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -23,7 +23,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input) eventHandler = new SDL_Event(); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); debugText = new Text(asset->get("debug.png"), asset->get("debug.txt"), renderer); - music = JA_LoadMusic(asset->get("jd.ogg").c_str()); + music = JA_LoadMusic(asset->get("game.ogg").c_str()); // Inicializa variables ticks = 0; diff --git a/source/title.cpp b/source/title.cpp index c759b9a..06639f8 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -13,6 +13,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Asset *asset) texture = new LTexture(renderer, asset->get("loading_screen2.png")); sprite = new Sprite(0, 0, texture->getWidth(), texture->getHeight(), texture, renderer); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); + music = JA_LoadMusic(asset->get("title.ogg").c_str()); // Inicializa variables counter = 0; @@ -29,6 +30,7 @@ Title::~Title() delete texture; delete sprite; delete text; + JA_DeleteMusic(music); } // Comprueba el manejador de eventos @@ -115,8 +117,7 @@ void Title::render() // Bucle para el logo del juego section_t Title::run() { - // Detiene la música - JA_StopMusic(); + JA_PlayMusic(music); while (section.name == SECTION_PROG_TITLE) { @@ -124,5 +125,7 @@ section_t Title::run() render(); } + JA_StopMusic(); + return section; } \ No newline at end of file diff --git a/source/title.h b/source/title.h index 8243d65..417205b 100644 --- a/source/title.h +++ b/source/title.h @@ -24,6 +24,7 @@ private: LTexture *texture; // Textura con los graficos Sprite *sprite; // Sprite para manejar la textura Text *text; // Objeto para escribir texto en pantalla + JA_Music music; // Musica del titulo int counter; // Contador section_t section; // Estado del bucle principal para saber si continua o se sale int ticks; // Contador de ticks para ajustar la velocidad del programa