Arreglados dos fallos del menu
This commit is contained in:
@@ -10,6 +10,8 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
this->asset = asset;
|
||||
this->options = options;
|
||||
this->lang = lang;
|
||||
|
||||
this->section = section;
|
||||
|
||||
// Reserva memoria para los punteros propios
|
||||
eventHandler = new SDL_Event();
|
||||
@@ -38,8 +40,51 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
// Musicas
|
||||
titleMusic = JA_LoadMusic(asset->get("title.ogg").c_str());
|
||||
|
||||
// Inicializa los valores
|
||||
init();
|
||||
}
|
||||
|
||||
// Destructor
|
||||
Title::~Title()
|
||||
{
|
||||
delete eventHandler;
|
||||
delete fade;
|
||||
|
||||
dustTexture->unload();
|
||||
delete dustTexture;
|
||||
|
||||
coffeeTexture->unload();
|
||||
delete coffeeTexture;
|
||||
|
||||
crisisTexture->unload();
|
||||
delete crisisTexture;
|
||||
|
||||
gradientTexture->unload();
|
||||
delete gradientTexture;
|
||||
|
||||
delete coffeeBitmap;
|
||||
delete crisisBitmap;
|
||||
delete dustBitmapL;
|
||||
delete dustBitmapR;
|
||||
delete gradient;
|
||||
|
||||
delete text1;
|
||||
delete text2;
|
||||
|
||||
delete menu.title;
|
||||
delete menu.options;
|
||||
|
||||
JA_DeleteSound(crashSound);
|
||||
JA_DeleteMusic(titleMusic);
|
||||
|
||||
SDL_DestroyTexture(background);
|
||||
}
|
||||
|
||||
// Inicializa los valores
|
||||
void Title::init()
|
||||
{
|
||||
// Inicializa variables
|
||||
this->section = section;
|
||||
section.subsection = TITLE_SECTION_1;
|
||||
counter = TITLE_COUNTER;
|
||||
backgroundCounter = 0;
|
||||
backgroundMode = rand() % 2;
|
||||
@@ -83,6 +128,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
}
|
||||
|
||||
// Inicializa el bitmap de Coffee
|
||||
coffeeBitmap->init();
|
||||
coffeeBitmap->setPosX(45);
|
||||
coffeeBitmap->setPosY(11 - 200);
|
||||
coffeeBitmap->setWidth(167);
|
||||
@@ -98,6 +144,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
coffeeBitmap->setDestY(11);
|
||||
|
||||
// Inicializa el bitmap de Crisis
|
||||
crisisBitmap->init();
|
||||
crisisBitmap->setPosX(60);
|
||||
crisisBitmap->setPosY(57 + 200);
|
||||
crisisBitmap->setWidth(137);
|
||||
@@ -113,6 +160,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
crisisBitmap->setDestY(57);
|
||||
|
||||
// Inicializa el bitmap de DustRight
|
||||
dustBitmapR->resetAnimation();
|
||||
dustBitmapR->setPosX(218);
|
||||
dustBitmapR->setPosY(47);
|
||||
dustBitmapR->setWidth(16);
|
||||
@@ -120,6 +168,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
dustBitmapR->setFlip(SDL_FLIP_HORIZONTAL);
|
||||
|
||||
// Inicializa el bitmap de DustLeft
|
||||
dustBitmapL->resetAnimation();
|
||||
dustBitmapL->setPosX(33);
|
||||
dustBitmapL->setPosY(47);
|
||||
dustBitmapL->setWidth(16);
|
||||
@@ -147,42 +196,6 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
|
||||
updateMenuLabels();
|
||||
}
|
||||
|
||||
// Destructor
|
||||
Title::~Title()
|
||||
{
|
||||
delete eventHandler;
|
||||
delete fade;
|
||||
|
||||
dustTexture->unload();
|
||||
delete dustTexture;
|
||||
|
||||
coffeeTexture->unload();
|
||||
delete coffeeTexture;
|
||||
|
||||
crisisTexture->unload();
|
||||
delete crisisTexture;
|
||||
|
||||
gradientTexture->unload();
|
||||
delete gradientTexture;
|
||||
|
||||
delete coffeeBitmap;
|
||||
delete crisisBitmap;
|
||||
delete dustBitmapL;
|
||||
delete dustBitmapR;
|
||||
delete gradient;
|
||||
|
||||
delete text1;
|
||||
delete text2;
|
||||
|
||||
delete menu.title;
|
||||
delete menu.options;
|
||||
|
||||
JA_DeleteSound(crashSound);
|
||||
JA_DeleteMusic(titleMusic);
|
||||
|
||||
SDL_DestroyTexture(background);
|
||||
}
|
||||
|
||||
// Actualiza las variables del objeto
|
||||
void Title::update()
|
||||
{
|
||||
@@ -439,6 +452,7 @@ void Title::update()
|
||||
{
|
||||
runDemoGame();
|
||||
runInstructions(m_auto);
|
||||
init();
|
||||
demo = false;
|
||||
counter = TITLE_COUNTER;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user