Compare commits
4 Commits
e2e41cf435
...
v1.08
| Author | SHA1 | Date | |
|---|---|---|---|
| 944784b329 | |||
| df4c1366fe | |||
| 1ee1ea560b | |||
| 5c7f72253c |
2
Makefile
2
Makefile
@@ -2,7 +2,7 @@ executable = jaildoctors_dilemma
|
|||||||
source = source/*.cpp source/jail_engine/*.cpp
|
source = source/*.cpp source/jail_engine/*.cpp
|
||||||
appName = JailDoctor's Dilemma
|
appName = JailDoctor's Dilemma
|
||||||
releaseFolder = jdd_release
|
releaseFolder = jdd_release
|
||||||
version = v1.09
|
version = v1.08
|
||||||
|
|
||||||
# Release names
|
# Release names
|
||||||
windowsRelease = $(executable)-$(version)-win32-x64.zip
|
windowsRelease = $(executable)-$(version)-win32-x64.zip
|
||||||
|
|||||||
@@ -23,11 +23,11 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.0.9</string>
|
<string>1.08</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1.0.8</string>
|
<string>1.08</string>
|
||||||
<key>CSResourcesFileMapped</key>
|
<key>CSResourcesFileMapped</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ private:
|
|||||||
SDL_Event *eventHandler; // Manejador de eventos
|
SDL_Event *eventHandler; // Manejador de eventos
|
||||||
Texture *texture; // Textura con los graficos
|
Texture *texture; // Textura con los graficos
|
||||||
Sprite *sprite; // Sprite para manejar la textura
|
Sprite *sprite; // Sprite para manejar la textura
|
||||||
Texture *titleLogo; // Textura con el logo del título del juego
|
|
||||||
SDL_Texture *bgTexture; // Textura para dibujar el fondo de la pantalla
|
SDL_Texture *bgTexture; // Textura para dibujar el fondo de la pantalla
|
||||||
Text *text; // Objeto para escribir texto en pantalla
|
Text *text; // Objeto para escribir texto en pantalla
|
||||||
Text *infoText; // Objeto para escribir texto en pantalla
|
Text *infoText; // Objeto para escribir texto en pantalla
|
||||||
|
|||||||
Reference in New Issue
Block a user