From 5529777ccb228cec0a007030b9a1ba15a96d684c Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Tue, 3 Mar 2026 12:56:11 +0100 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20No=20es=20mostrava=20res=20en=20pan?= =?UTF-8?q?talla=20perque=20faltava=20el=200xff000000=20al=20ficar=20pixel?= =?UTF-8?q?s=20en=20la=20textura=20-=20[FIX]=20No=20s'escoltava=20so,=20no?= =?UTF-8?q?=20estic=20segur=20de=20perqu=C3=A9.=20He=20agafat=20el=20JailA?= =?UTF-8?q?udio=20de=20mini=20i=20ja=20va=20tot.=20-=20[NEW]=20Afegida=20o?= =?UTF-8?q?pci=C3=B3=20"SET=20INFINITELIVES"=20desde=20la=20consola=20-=20?= =?UTF-8?q?[NEW]=20Afegida=20opci=C3=B3=20"SET=20KIOSK"=20desde=20la=20con?= =?UTF-8?q?sola=20-=20[FIX]=20Les=20SDL=5Ftexture=20es=20veien=20borroses?= =?UTF-8?q?=20-=20[FIX]=20En=20windows=20no=20es=20carregaven=20be=20els?= =?UTF-8?q?=20GIFs=20del=20txt=20per=20culpa=20del=20salt=20de=20linea=20d?= =?UTF-8?q?oble=20que=20t=C3=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lagueirtofile | 2 +- source/actor.cpp | 2 +- source/config.cpp | 25 +++++ source/config.h | 6 ++ source/console.cpp | 29 +++++- source/{gif.c => gif.h} | 1 + source/jail_audio.cpp | 128 ++++++++++++++++++++++---- source/jail_audio.h | 6 ++ source/jdraw.cpp | 38 +++++++- source/log.h | 27 ++++++ source/m_menu.cpp | 18 ++-- source/main.cpp | 4 + source/{stb_vorbis.c => stb_vorbis.h} | 0 13 files changed, 247 insertions(+), 39 deletions(-) rename source/{gif.c => gif.h} (99%) create mode 100644 source/log.h rename source/{stb_vorbis.c => stb_vorbis.h} (100%) diff --git a/lagueirtofile b/lagueirtofile index 082fa4d..90425fd 100644 --- a/lagueirtofile +++ b/lagueirtofile @@ -1,4 +1,4 @@ -libs = -lSDL2 +libs = -lSDL3 cppflags = -D DEBUG -g executable = thepool_debug sourcepath = source diff --git a/source/actor.cpp b/source/actor.cpp index f06cbf1..543435f 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -2118,7 +2118,7 @@ namespace actor void setLives(int value) { - lives = value; + lives = config::getInfiniteLives() ? 8 : value; } void die() diff --git a/source/config.cpp b/source/config.cpp index 9908021..d5e324d 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -9,6 +9,8 @@ namespace config uint8_t keys[7] = {SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, SDL_SCANCODE_SPACE, SDL_SCANCODE_RETURN, SDL_SCANCODE_ESCAPE}; int8_t pad_btns[7] = {SDL_GAMEPAD_BUTTON_DPAD_UP, SDL_GAMEPAD_BUTTON_DPAD_DOWN, SDL_GAMEPAD_BUTTON_DPAD_LEFT, SDL_GAMEPAD_BUTTON_DPAD_RIGHT, SDL_GAMEPAD_BUTTON_SOUTH, SDL_GAMEPAD_BUTTON_EAST, SDL_GAMEPAD_BUTTON_START}; bool prologo_desbloquejat = false; + bool kiosk_mode = false; + bool infinite_lives = false; void setMusic(const bool value) { @@ -82,4 +84,27 @@ namespace config return prologo_desbloquejat; } + void setKioskMode(const bool value) + { + kiosk_mode = value; + file::setConfigValue("kiosk", kiosk_mode ? "yes" : "no"); + } + + const bool getKioskMode() + { + return kiosk_mode; + } + + void setInifiniteLives(const bool value) + { + infinite_lives= value; + file::setConfigValue("infinitelives", infinite_lives? "yes" : "no"); + } + + const bool getInfiniteLives() + { + return infinite_lives; + } + + } diff --git a/source/config.h b/source/config.h index 32b4f4d..00dfa80 100644 --- a/source/config.h +++ b/source/config.h @@ -30,4 +30,10 @@ namespace config void setProgoloDesbloquejat(); const bool isProgoloDesbloquejat(); + + void setKioskMode(const bool value); + const bool getKioskMode(); + + void setInifiniteLives(const bool value); + const bool getInfiniteLives(); } \ No newline at end of file diff --git a/source/console.cpp b/source/console.cpp index 0c1a121..50a3953 100644 --- a/source/console.cpp +++ b/source/console.cpp @@ -6,6 +6,7 @@ #include "actor.h" #include "jgame.h" #include "debug.h" +#include "config.h" namespace console { @@ -134,10 +135,11 @@ namespace console #define CMD_EXIT 4 #define CMD_SHOW 5 #define CMD_HIDE 6 - #define CMD_HELP 7 - #define NUM_CMDS 8 + #define CMD_SET 7 + #define CMD_HELP 8 + #define NUM_CMDS 9 - const char *command_text[NUM_CMDS] = { "GIVE", "DROP", "GOTO", "MOVE", "EXIT", "SHOW", "HIDE", "HELP" }; + const char *command_text[NUM_CMDS] = { "GIVE", "DROP", "GOTO", "MOVE", "EXIT", "SHOW", "HIDE", "SET", "HELP" }; #define PARAM_UNKNOWN -1 #define PARAM_RUN 0 @@ -283,9 +285,28 @@ namespace console debug::disable(value); } break; + case CMD_SET: + if (!tokens[1]) { + strcpy(msg, "ERROR: Nothing to set."); + } else { + strcpy(msg, "Ok."); + const int value = getIndexFromString(tokens[1], {"KIOSK", "INFINITELIVES"}); + if (value==-1) + strcpy(msg, "ERROR: Cannot set that."); + else + switch (value) { + case 0: + config::setKioskMode(!config::getKioskMode()); + break; + case 1: + config::setInifiniteLives(!config::getInfiniteLives()); + break; + } + + } case CMD_HELP: if (!tokens[1]) { - strcpy(msg, "GIVE DROP GOTO MOVE EXIT SHOW HIDE HELP"); + strcpy(msg, "GIVE DROP GOTO MOVE EXIT SHOW HIDE SET HELP"); } else { int command = getCommand(); switch (command) diff --git a/source/gif.c b/source/gif.h similarity index 99% rename from source/gif.c rename to source/gif.h index 8c19b14..9685352 100644 --- a/source/gif.c +++ b/source/gif.h @@ -2,6 +2,7 @@ #include #include #include +#include #define EXTENSION_INTRODUCER 0x21 #define IMAGE_DESCRIPTOR 0x2C diff --git a/source/jail_audio.cpp b/source/jail_audio.cpp index 6a6c627..42f3a56 100644 --- a/source/jail_audio.cpp +++ b/source/jail_audio.cpp @@ -1,8 +1,9 @@ #ifndef JA_USESDLMIXER #include "jail_audio.h" -#include "stb_vorbis.c" +#include "stb_vorbis.h" #include #include +#include "log.h" #define JA_MAX_SIMULTANEOUS_CHANNELS 5 @@ -45,6 +46,11 @@ bool JA_soundEnabled { true }; SDL_AudioDeviceID sdlAudioDevice { 0 }; SDL_TimerID JA_timerID { 0 }; +bool fading = false; +int fade_start_time; +int fade_duration; +int fade_initial_volume; + /* void audioCallback(void * userdata, uint8_t * stream, int len) { SDL_memset(stream, 0, len); @@ -87,10 +93,24 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) { if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING) { + if (fading) { + int time = SDL_GetTicks(); + if (time > (fade_start_time+fade_duration)) { + fading = false; + JA_StopMusic(); + return 30; + } else { + const int time_passed = time - fade_start_time; + const float percent = (float)time_passed / (float)fade_duration; + SDL_SetAudioStreamGain(current_music->stream, 1.0 - percent); + } + } + if (current_music->times != 0) { - if (SDL_GetAudioStreamAvailable(current_music->stream) < int(current_music->length/2)) + if (SDL_GetAudioStreamAvailable(current_music->stream) < int(current_music->length/2)) { SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length); + } if (current_music->times>0) current_music->times--; } else @@ -123,10 +143,19 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) { + #ifdef DEBUG + SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG); + #endif + JA_audioSpec = {format, channels, freq }; if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec); - SDL_PauseAudioDevice(sdlAudioDevice); + if (!sdlAudioDevice) { + log_msg(LOG_FAIL, "Failed to initialize SDL audio: %s\n", SDL_GetError()); + } else { + log_msg(LOG_OK, "Audio subsytem initialized\n"); + } + //SDL_PauseAudioDevice(sdlAudioDevice); JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr); } @@ -151,7 +180,7 @@ JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length) music->spec.format = SDL_AUDIO_S16; music->buffer = (Uint8*)SDL_malloc(music->length); SDL_memcpy(music->buffer, output, music->length); - SDL_free(output); + free(output); music->pos = 0; music->state = JA_MUSIC_STOPPED; @@ -180,19 +209,18 @@ void JA_PlayMusic(JA_Music_t *music, const int loop) { if (!JA_musicEnabled) return; - if (current_music != NULL) { - current_music->pos = 0; - current_music->state = JA_MUSIC_STOPPED; - } + JA_StopMusic(); + current_music = music; current_music->pos = 0; current_music->state = JA_MUSIC_PLAYING; current_music->times = loop; current_music->stream = SDL_CreateAudioStream(¤t_music->spec, &JA_audioSpec); - if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) printf("[ERROR] SDL_PutAudioStreamData failed!\n"); + if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) log_msg(LOG_FAIL, "SDL_PutAudioStreamData failed!\n"); SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); - if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) printf("[ERROR] SDL_BindAudioStream failed!\n"); + if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) log_msg(LOG_FAIL, "SDL_BindAudioStream failed!\n"); + //SDL_ResumeAudioStreamDevice(current_music->stream); } void JA_PauseMusic() @@ -201,7 +229,8 @@ void JA_PauseMusic() if (!current_music || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PAUSED; - SDL_PauseAudioStreamDevice(current_music->stream); + //SDL_PauseAudioStreamDevice(current_music->stream); + SDL_UnbindAudioStream(current_music->stream); } void JA_ResumeMusic() @@ -210,7 +239,8 @@ void JA_ResumeMusic() if (!current_music || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PLAYING; - SDL_ResumeAudioStreamDevice(current_music->stream); + //SDL_ResumeAudioStreamDevice(current_music->stream); + SDL_BindAudioStream(sdlAudioDevice, current_music->stream); } void JA_StopMusic() @@ -220,11 +250,22 @@ void JA_StopMusic() current_music->pos = 0; current_music->state = JA_MUSIC_STOPPED; - SDL_PauseAudioStreamDevice(current_music->stream); + //SDL_PauseAudioStreamDevice(current_music->stream); SDL_DestroyAudioStream(current_music->stream); current_music->stream = nullptr; } +void JA_FadeOutMusic(const int milliseconds) +{ + if (!JA_musicEnabled) return; + if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; + + fading = true; + fade_start_time = SDL_GetTicks(); + fade_duration = milliseconds; + fade_initial_volume = JA_musicVolume; +} + JA_Music_state JA_GetMusicState() { if (!JA_musicEnabled) return JA_MUSIC_DISABLED; @@ -237,7 +278,7 @@ void JA_DeleteMusic(JA_Music_t *music) { if (current_music == music) current_music = nullptr; SDL_free(music->buffer); - SDL_DestroyAudioStream(music->stream); + if (music->stream) SDL_DestroyAudioStream(music->stream); delete music; } @@ -248,6 +289,18 @@ float JA_SetMusicVolume(float volume) return JA_musicVolume; } +void JA_SetMusicPosition(float value) +{ + if (!current_music) return; + current_music->pos = value * current_music->spec.freq; +} + +float JA_GetMusicPosition() +{ + if (!current_music) return 0; + return float(current_music->pos)/float(current_music->spec.freq); +} + void JA_EnableMusic(const bool value) { if ( !value && current_music && (current_music->state==JA_MUSIC_PLAYING) ) JA_StopMusic(); @@ -255,6 +308,10 @@ void JA_EnableMusic(const bool value) JA_musicEnabled = value; } +const bool JA_IsMusicEnabled() +{ + return JA_musicEnabled; +} @@ -290,6 +347,26 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop) int channel = 0; while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; } if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0; + JA_StopChannel(channel); + + channels[channel].sound = sound; + channels[channel].times = loop; + channels[channel].pos = 0; + channels[channel].state = JA_CHANNEL_PLAYING; + channels[channel].stream = SDL_CreateAudioStream(&channels[channel].sound->spec, &JA_audioSpec); + SDL_PutAudioStreamData(channels[channel].stream, channels[channel].sound->buffer, channels[channel].sound->length); + SDL_SetAudioStreamGain(channels[channel].stream, JA_soundVolume); + SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); + + return channel; +} + +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) +{ + if (!JA_soundEnabled) return -1; + + if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1; + JA_StopChannel(channel); channels[channel].sound = sound; channels[channel].times = loop; @@ -322,7 +399,8 @@ void JA_PauseChannel(const int channel) if (channels[i].state == JA_CHANNEL_PLAYING) { channels[i].state = JA_CHANNEL_PAUSED; - SDL_PauseAudioStreamDevice(channels[i].stream); + //SDL_PauseAudioStreamDevice(channels[i].stream); + SDL_UnbindAudioStream(channels[i].stream); } } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) @@ -330,7 +408,8 @@ void JA_PauseChannel(const int channel) if (channels[channel].state == JA_CHANNEL_PLAYING) { channels[channel].state = JA_CHANNEL_PAUSED; - SDL_PauseAudioStreamDevice(channels[channel].stream); + //SDL_PauseAudioStreamDevice(channels[channel].stream); + SDL_UnbindAudioStream(channels[channel].stream); } } } @@ -345,7 +424,8 @@ void JA_ResumeChannel(const int channel) if (channels[i].state == JA_CHANNEL_PAUSED) { channels[i].state = JA_CHANNEL_PLAYING; - SDL_ResumeAudioStreamDevice(channels[i].stream); + //SDL_ResumeAudioStreamDevice(channels[i].stream); + SDL_BindAudioStream(sdlAudioDevice, channels[i].stream); } } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) @@ -353,7 +433,8 @@ void JA_ResumeChannel(const int channel) if (channels[channel].state == JA_CHANNEL_PAUSED) { channels[channel].state = JA_CHANNEL_PLAYING; - SDL_ResumeAudioStreamDevice(channels[channel].stream); + //SDL_ResumeAudioStreamDevice(channels[channel].stream); + SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); } } } @@ -365,18 +446,20 @@ void JA_StopChannel(const int channel) if (channel == -1) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { + if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream); + channels[channel].stream = nullptr; channels[i].state = JA_CHANNEL_FREE; channels[i].pos = 0; channels[i].sound = NULL; - SDL_DestroyAudioStream(channels[i].stream); } } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) { + if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream); + channels[channel].stream = nullptr; channels[channel].state = JA_CHANNEL_FREE; channels[channel].pos = 0; channels[channel].sound = NULL; - SDL_DestroyAudioStream(channels[channel].stream); } } @@ -409,6 +492,11 @@ void JA_EnableSound(const bool value) JA_soundEnabled = value; } +const bool JA_IsSoundEnabled() +{ + return JA_soundEnabled; +} + float JA_SetVolume(float volume) { JA_SetSoundVolume(JA_SetMusicVolume(volume) / 2.0f); diff --git a/source/jail_audio.h b/source/jail_audio.h index f4cde72..e145161 100644 --- a/source/jail_audio.h +++ b/source/jail_audio.h @@ -16,15 +16,20 @@ void JA_PlayMusic(JA_Music_t *music, const int loop = -1); void JA_PauseMusic(); void JA_ResumeMusic(); void JA_StopMusic(); +void JA_FadeOutMusic(const int milliseconds); JA_Music_state JA_GetMusicState(); void JA_DeleteMusic(JA_Music_t *music); float JA_SetMusicVolume(float volume); +void JA_SetMusicPosition(float value); +float JA_GetMusicPosition(); void JA_EnableMusic(const bool value); +const bool JA_IsMusicEnabled(); JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length); JA_Sound_t *JA_LoadSound(Uint8* buffer, Uint32 length); JA_Sound_t *JA_LoadSound(const char* filename); int JA_PlaySound(JA_Sound_t *sound, const int loop = 0); +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0); void JA_PauseChannel(const int channel); void JA_ResumeChannel(const int channel); void JA_StopChannel(const int channel); @@ -32,5 +37,6 @@ JA_Channel_state JA_GetChannelState(const int channel); void JA_DeleteSound(JA_Sound_t *sound); float JA_SetSoundVolume(float volume); void JA_EnableSound(const bool value); +const bool JA_IsSoundEnabled(); float JA_SetVolume(float volume); diff --git a/source/jdraw.cpp b/source/jdraw.cpp index 89aba2a..16bbb32 100644 --- a/source/jdraw.cpp +++ b/source/jdraw.cpp @@ -1,6 +1,6 @@ #include "jdraw.h" #include -#include "gif.c" +#include "gif.h" #include "jfile.h" #include @@ -92,6 +92,7 @@ namespace draw sdl_window = SDL_CreateWindow(screen_title.c_str(), screen_width * screen_zoom, screen_height * screen_zoom, screen_fullscreen ? SDL_WINDOW_FULLSCREEN : 0); sdl_renderer = SDL_CreateRenderer(sdl_window, nullptr); sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height); + SDL_SetTextureScaleMode(sdl_texture, SDL_SCALEMODE_NEAREST); const int num_render_drivers = SDL_GetNumRenderDrivers(); printf("Available renderers:\n"); @@ -135,10 +136,12 @@ namespace draw char *p = buffer; char *n = buffer; while (*n!=0) { - while (*n!='\n') n++; + while (*n!='\n' && *n!='\r') n++; *n=0; loadSurface(p); - p=++n; + n++; + while (*n=='\n' || *n=='\r') n++; + p=n; } free(buffer); @@ -183,6 +186,7 @@ namespace draw sdl_window = SDL_CreateWindow(screen_title.c_str(), screen_width * zoom, screen_height * zoom, screen_fullscreen?SDL_WINDOW_FULLSCREEN:0); sdl_renderer = SDL_CreateRenderer(sdl_window, nullptr); sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height); + SDL_SetTextureScaleMode(sdl_texture, SDL_SCALEMODE_NEAREST); SDL_HideCursor(); @@ -672,10 +676,34 @@ namespace draw print2(buffer, x, y, color, zoom); } +bool SaveIndexedAsBMP(const char *filename, + const uint8_t *pixels, + const uint32_t *palette, + int w, int h) +{ + SDL_Surface *surface = SDL_CreateSurface(w, h, SDL_PIXELFORMAT_ARGB8888); + if (!surface) return false; + + uint32_t *dst = (uint32_t *)surface->pixels; + int pitch32 = surface->pitch / 4; + + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) { + uint8_t idx = pixels[y * w + x]; + dst[y * pitch32 + x] = palette[idx]; // assumes ARGB8888 + } + } + + bool ok = SDL_SaveBMP(surface, filename); + SDL_DestroySurface(surface); + return ok; +} + // Refresca la pantalla void render() { - + //SaveIndexedAsBMP("screen.bmp", screen->pixels, palette, 320, 240); + Uint32 *sdl_pixels; // Punter al array de pixels que enstornarà SDL_LockTexture int sdl_pitch; // Ací estarà guardat el pitch de la textura, com es de 32 bits, no m'afecta const uint32_t size = screen->w * screen->h; // tamany de la superficie @@ -689,7 +717,7 @@ namespace draw // i el enviem a la textura SDL for (uint32_t i = 0; i < size; ++i) { - sdl_pixels[i] = palette[screen->pixels[i]]; + sdl_pixels[i] = 0xff000000 | palette[screen->pixels[i]]; } // Desbloquejem la textura diff --git a/source/log.h b/source/log.h new file mode 100644 index 0000000..1daa14d --- /dev/null +++ b/source/log.h @@ -0,0 +1,27 @@ +#pragma once +#include +#include + +#ifdef DEBUG +enum LogLevel { LOG_OK, LOG_FAIL, LOG_WARN, LOG_INFO, LOG_LUART, LOG_LUALD, LOG_VERBOSE, LOG_UNSALTED }; + +static inline void log_msg(enum LogLevel level, const char *fmt, ...) { + va_list args; + va_start(args, fmt); + + switch (level) { + case LOG_OK: printf("[\033[1;32m OK \033[0m] "); break; + case LOG_FAIL: printf("[\033[1;31mFAIL\033[0m] "); break; + case LOG_WARN: printf("[\033[1;33mWARN\033[0m] "); break; + case LOG_INFO: printf("[\033[1;34mINFO\033[0m] "); break; + case LOG_LUART: printf("[\033[1;35mLUA RUNTIME ERROR\033[0m] "); break; + case LOG_LUALD: printf("[\033[1;35mLUA LOADING ERROR\033[0m] "); break; + case LOG_VERBOSE: printf(" - "); break; + case LOG_UNSALTED: break; + } + vprintf(fmt, args); + va_end(args); +} +#else +#define log_msg(...) ((void)0) +#endif \ No newline at end of file diff --git a/source/m_menu.cpp b/source/m_menu.cpp index 968891e..a91578c 100644 --- a/source/m_menu.cpp +++ b/source/m_menu.cpp @@ -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