Compare commits
2 Commits
e2e41cf435
...
1ee1ea560b
| Author | SHA1 | Date | |
|---|---|---|---|
| 1ee1ea560b | |||
| 5c7f72253c |
@@ -62,6 +62,8 @@ const int GAMECANVAS_THIRD_QUARTER_Y = (GAMECANVAS_HEIGHT / 4) * 3;
|
|||||||
// Subsecciones
|
// Subsecciones
|
||||||
#define SUBSECTION_LOGO_TO_INTRO 0
|
#define SUBSECTION_LOGO_TO_INTRO 0
|
||||||
#define SUBSECTION_LOGO_TO_TITLE 1
|
#define SUBSECTION_LOGO_TO_TITLE 1
|
||||||
|
#define SUBSECTION_TITLE_WITH_LOADING_SCREEN 2
|
||||||
|
#define SUBSECTION_TITLE_WITHOUT_LOADING_SCREEN 3
|
||||||
|
|
||||||
// Colores
|
// Colores
|
||||||
const color_t borderColor = {0x27, 0x27, 0x36};
|
const color_t borderColor = {0x27, 0x27, 0x36};
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ void LoadingScreen::updateLoad()
|
|||||||
if (loadCounter >= 768)
|
if (loadCounter >= 768)
|
||||||
{
|
{
|
||||||
section->name = SECTION_TITLE;
|
section->name = SECTION_TITLE;
|
||||||
section->subsection = 0;
|
section->subsection = SUBSECTION_TITLE_WITH_LOADING_SCREEN;
|
||||||
JA_StopMusic();
|
JA_StopMusic();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *
|
|||||||
|
|
||||||
// Inicializa variables
|
// Inicializa variables
|
||||||
counter = 0;
|
counter = 0;
|
||||||
|
state = section->subsection == SUBSECTION_TITLE_WITH_LOADING_SCREEN ? show_loading_screen : show_menu;
|
||||||
section->name = SECTION_TITLE;
|
section->name = SECTION_TITLE;
|
||||||
section->subsection = 0;
|
section->subsection = 0;
|
||||||
ticks = 0;
|
ticks = 0;
|
||||||
@@ -54,7 +55,6 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *
|
|||||||
marqueeSpeed = 3;
|
marqueeSpeed = 3;
|
||||||
initMarquee();
|
initMarquee();
|
||||||
showCheevos = false;
|
showCheevos = false;
|
||||||
state = show_loading_screen;
|
|
||||||
|
|
||||||
// Crea y rellena la textura para mostrar los logros
|
// Crea y rellena la textura para mostrar los logros
|
||||||
createCheevosTexture();
|
createCheevosTexture();
|
||||||
@@ -200,10 +200,9 @@ void Title::checkInput()
|
|||||||
|
|
||||||
else if (input->checkInput(input_accept, REPEAT_FALSE) || input->checkInput(input_pause, REPEAT_FALSE))
|
else if (input->checkInput(input_accept, REPEAT_FALSE) || input->checkInput(input_pause, REPEAT_FALSE))
|
||||||
{
|
{
|
||||||
if (!showCheevos)
|
if (state = show_loading_screen)
|
||||||
{
|
{
|
||||||
// section->name = SECTION_GAME;
|
state = fade_loading_screen;
|
||||||
// section->subsection = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -281,7 +280,7 @@ void Title::update()
|
|||||||
switch (state)
|
switch (state)
|
||||||
{
|
{
|
||||||
case show_loading_screen:
|
case show_loading_screen:
|
||||||
if (counter == 200)
|
if (counter == 500)
|
||||||
{
|
{
|
||||||
counter = 0;
|
counter = 0;
|
||||||
state = fade_loading_screen;
|
state = fade_loading_screen;
|
||||||
|
|||||||
Reference in New Issue
Block a user