- [FIX] No es mostrava res en pantalla perque faltava el 0xff000000 al ficar pixels en la textura
- [FIX] No s'escoltava so, no estic segur de perqué. He agafat el JailAudio de mini i ja va tot. - [NEW] Afegida opció "SET INFINITELIVES" desde la consola - [NEW] Afegida opció "SET KIOSK" desde la consola - [FIX] Les SDL_texture es veien borroses - [FIX] En windows no es carregaven be els GIFs del txt per culpa del salt de linea doble que té.
This commit is contained in:
@@ -32,19 +32,21 @@ namespace modules
|
||||
|
||||
int loop()
|
||||
{
|
||||
if (controller::pressed(KEY_MENU)) {
|
||||
int max_option = config::getKioskMode() ? 4 : 5;
|
||||
|
||||
if (controller::pressed(KEY_MENU) && !config::getKioskMode()) {
|
||||
return OPTION_EIXIR;
|
||||
}
|
||||
if (controller::pressed(KEY_DOWN) || input::keyPressed(SDL_SCANCODE_DOWN))
|
||||
{
|
||||
audio::playSound("snd_push.wav", SOUND_BASIC);
|
||||
selected_option++; if (selected_option==6) selected_option=min_option;
|
||||
selected_option++; if (selected_option==max_option+1) selected_option=min_option;
|
||||
}
|
||||
|
||||
if (controller::pressed(KEY_UP) || input::keyPressed(SDL_SCANCODE_UP))
|
||||
{
|
||||
audio::playSound("snd_push.wav", SOUND_BASIC);
|
||||
selected_option--; if (selected_option<min_option) selected_option=5;
|
||||
selected_option--; if (selected_option<min_option) selected_option=max_option;
|
||||
}
|
||||
|
||||
if (controller::pressed(KEY_JUMP) || controller::pressed(KEY_PICK) || input::keyPressed(SDL_SCANCODE_RETURN) )
|
||||
@@ -72,7 +74,7 @@ namespace modules
|
||||
draw::print2("de REDEFINIR TECLES", 11, 17, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR GAMEPAD", 11, 19, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 21, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
if (!config::getKioskMode()) draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_JUGAR:
|
||||
if (config::isProgoloDesbloquejat()) draw::print2("de JUGAR AL PROLOGO", 11, 12, GREEN, FONT_ZOOM_NONE);
|
||||
@@ -80,7 +82,7 @@ namespace modules
|
||||
draw::print2("de REDEFINIR TECLES", 11, 17, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR GAMEPAD", 11, 19, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 21, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
if (!config::getKioskMode()) draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_TECLES:
|
||||
if (config::isProgoloDesbloquejat()) draw::print2("de JUGAR AL PROLOGO", 11, 12, GREEN, FONT_ZOOM_NONE);
|
||||
@@ -88,7 +90,7 @@ namespace modules
|
||||
draw::print2("fg REDEFINIR TECLES", 11, 16, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de REDEFINIR GAMEPAD", 11, 19, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 21, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
if (!config::getKioskMode()) draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_GAMEPAD:
|
||||
if (config::isProgoloDesbloquejat()) draw::print2("de JUGAR AL PROLOGO", 11, 12, GREEN, FONT_ZOOM_NONE);
|
||||
@@ -96,7 +98,7 @@ namespace modules
|
||||
draw::print2("de REDEFINIR TECLES", 11, 16, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("fg REDEFINIR GAMEPAD", 11, 18, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 21, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
if (!config::getKioskMode()) draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_AUDIO:
|
||||
if (config::isProgoloDesbloquejat()) draw::print2("de JUGAR AL PROLOGO", 11, 12, GREEN, FONT_ZOOM_NONE);
|
||||
@@ -104,7 +106,7 @@ namespace modules
|
||||
draw::print2("de REDEFINIR TECLES", 11, 16, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR GAMEPAD", 11, 18, GREEN, FONT_ZOOM_NONE);
|
||||
draw::print2("fg CONFIGURAR AUDIO", 11, 20, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
if (!config::getKioskMode()) draw::print2("de EIXIR", 11, 23, GREEN, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_EIXIR:
|
||||
if (config::isProgoloDesbloquejat()) draw::print2("de JUGAR AL PROLOGO", 11, 12, GREEN, FONT_ZOOM_NONE);
|
||||
|
||||
Reference in New Issue
Block a user