La música la tiene ahora la clase Director
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include "title.h"
|
||||
|
||||
// Constructor
|
||||
Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset, options_t *options, Lang *lang, param_t *param, section_t *section)
|
||||
Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset, options_t *options, Lang *lang, param_t *param, section_t *section, JA_Music_t *music)
|
||||
{
|
||||
// Copia las direcciones de los punteros y objetos
|
||||
this->renderer = renderer;
|
||||
@@ -12,6 +12,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
this->lang = lang;
|
||||
this->param = param;
|
||||
this->section = section;
|
||||
this->music = music;
|
||||
|
||||
// Reserva memoria y crea los objetos
|
||||
eventHandler = new SDL_Event();
|
||||
@@ -35,9 +36,6 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
gameLogo = new GameLogo(renderer, screen, asset, param, GAMECANVAS_CENTER_X, GAMECANVAS_FIRST_QUARTER_Y + 20);
|
||||
gameLogo->enable();
|
||||
|
||||
// Musicas
|
||||
titleMusic = JA_LoadMusic(asset->get("title.ogg").c_str());
|
||||
|
||||
// Inicializa los valores
|
||||
init();
|
||||
}
|
||||
@@ -59,8 +57,6 @@ Title::~Title()
|
||||
delete background;
|
||||
delete tiledbg;
|
||||
delete gameLogo;
|
||||
|
||||
JA_DeleteMusic(titleMusic);
|
||||
}
|
||||
|
||||
// Inicializa los valores de las variables
|
||||
@@ -139,7 +135,7 @@ void Title::update()
|
||||
// Reproduce la música
|
||||
if ((JA_GetMusicState() == JA_MUSIC_INVALID) || (JA_GetMusicState() == JA_MUSIC_STOPPED))
|
||||
{
|
||||
JA_PlayMusic(titleMusic);
|
||||
JA_PlayMusic(music);
|
||||
}
|
||||
|
||||
// Actualiza el logo con el título del juego
|
||||
|
||||
Reference in New Issue
Block a user