style: param.h

source/external/jail_audio.cpp

@@ -8,42 +8,42 @@
 
 struct JA_Sound_t
 {
-    SDL_AudioSpec       spec        { SDL_AUDIO_S16, 2, 48000 };
+    SDL_AudioSpec spec{SDL_AUDIO_S16, 2, 48000};
-    Uint32              length      { 0 };
+    Uint32 length{0};
-    Uint8               *buffer     { NULL };
+    Uint8 *buffer{NULL};
 };
 
 struct JA_Channel_t
 {
-    JA_Sound_t          *sound      { nullptr };
+    JA_Sound_t *sound{nullptr};
-    int                 pos         { 0 };
+    int pos{0};
-    int                 times       { 0 };
+    int times{0};
-    SDL_AudioStream     *stream     { nullptr };
+    SDL_AudioStream *stream{nullptr};
-    JA_Channel_state    state       { JA_CHANNEL_FREE };
+    JA_Channel_state state{JA_CHANNEL_FREE};
 };
 
 struct JA_Music_t
 {
-    SDL_AudioSpec       spec        { SDL_AUDIO_S16, 2, 48000 };
+    SDL_AudioSpec spec{SDL_AUDIO_S16, 2, 48000};
-    Uint32              length      { 0 };
+    Uint32 length{0};
-    Uint8               *buffer     { nullptr };
+    Uint8 *buffer{nullptr};
 
-    int                 pos         { 0 };
+    int pos{0};
-    int                 times       { 0 };
+    int times{0};
-    SDL_AudioStream     *stream     { nullptr };
+    SDL_AudioStream *stream{nullptr};
-    JA_Music_state      state       { JA_MUSIC_INVALID };
+    JA_Music_state state{JA_MUSIC_INVALID};
 };
 
-JA_Music_t          *current_music  { nullptr };
+JA_Music_t *current_music{nullptr};
-JA_Channel_t        channels[JA_MAX_SIMULTANEOUS_CHANNELS];
+JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS];
 
-SDL_AudioSpec       JA_audioSpec    { SDL_AUDIO_S16, 2, 48000 };
+SDL_AudioSpec JA_audioSpec{SDL_AUDIO_S16, 2, 48000};
-float               JA_musicVolume  { 1.0f };
+float JA_musicVolume{1.0f};
-float               JA_soundVolume  { 0.5f };
+float JA_soundVolume{0.5f};
-bool                JA_musicEnabled { true };
+bool JA_musicEnabled{true};
-bool                JA_soundEnabled { true };
+bool JA_soundEnabled{true};
-SDL_AudioDeviceID   sdlAudioDevice  { 0 };
+SDL_AudioDeviceID sdlAudioDevice{0};
-SDL_TimerID         JA_timerID      { 0 };
+SDL_TimerID JA_timerID{0};
 
 bool fading = false;
 int fade_start_time;
@@ -92,50 +92,59 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval)
 {
     if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING)
     {
-        if (fading) {
+        if (fading)
+        {
             int time = SDL_GetTicks();
-            if (time > (fade_start_time+fade_duration)) {
+            if (time > (fade_start_time + fade_duration))
+            {
                 fading = false;
                 JA_StopMusic();
                 return 30;
-            } else {
+            }
+            else
+            {
                 const int time_passed = time - fade_start_time;
                 const float percent = (float)time_passed / (float)fade_duration;
-                SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume*(1.0 - percent));
+                SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume * (1.0 - percent));
             }
         }
 
         if (current_music->times != 0)
         {
-            if ((Uint32)SDL_GetAudioStreamAvailable(current_music->stream) < (current_music->length/2)) {
+            if ((Uint32)SDL_GetAudioStreamAvailable(current_music->stream) < (current_music->length / 2))
+            {
                 SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length);
             }
-            if (current_music->times>0) current_music->times--;
+            if (current_music->times > 0)
+                current_music->times--;
         }
         else
         {
-            if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic();
+            if (SDL_GetAudioStreamAvailable(current_music->stream) == 0)
+                JA_StopMusic();
         }
     }
 
     if (JA_soundEnabled)
     {
-        for (int i=0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i)
+        for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i)
             if (channels[i].state == JA_CHANNEL_PLAYING)
             {
                 if (channels[i].times != 0)
                 {
-                    if ((Uint32)SDL_GetAudioStreamAvailable(channels[i].stream) < (channels[i].sound->length/2)) {
+                    if ((Uint32)SDL_GetAudioStreamAvailable(channels[i].stream) < (channels[i].sound->length / 2))
+                    {
                         SDL_PutAudioStreamData(channels[i].stream, channels[i].sound->buffer, channels[i].sound->length);
-                        if (channels[i].times>0) channels[i].times--;
+                        if (channels[i].times > 0)
+                            channels[i].times--;
                     }
                 }
                 else
                 {
-                    if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i);
+                    if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0)
+                        JA_StopChannel(i);
                 }
             }
-
     }
 
     return 30;
@@ -143,29 +152,33 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval)
 
 void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels)
 {
-    #ifdef DEBUG
+#ifdef DEBUG
     SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
-    #endif
+#endif
-    
+
     SDL_Log("Iniciant JailAudio...");
-    JA_audioSpec = {format, num_channels, freq };
+    JA_audioSpec = {format, num_channels, freq};
-    if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
+    if (!sdlAudioDevice)
+        SDL_CloseAudioDevice(sdlAudioDevice);
     sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec);
-    SDL_Log( (sdlAudioDevice==0) ? "Failed to initialize SDL audio!\n" : "OK!\n");
+    SDL_Log((sdlAudioDevice == 0) ? "Failed to initialize SDL audio!\n" : "OK!\n");
-    for (int i=0;i<JA_MAX_SIMULTANEOUS_CHANNELS;++i) channels[i].state = JA_CHANNEL_FREE;
+    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i)
-    //SDL_PauseAudioDevice(sdlAudioDevice);
+        channels[i].state = JA_CHANNEL_FREE;
+    // SDL_PauseAudioDevice(sdlAudioDevice);
     JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr);
 }
 
 void JA_Quit()
 {
-    if (JA_timerID) SDL_RemoveTimer(JA_timerID);
+    if (JA_timerID)
+        SDL_RemoveTimer(JA_timerID);
 
-    if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
+    if (!sdlAudioDevice)
+        SDL_CloseAudioDevice(sdlAudioDevice);
     sdlAudioDevice = 0;
 }
 
-JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length)
+JA_Music_t *JA_LoadMusic(Uint8 *buffer, Uint32 length)
 {
     JA_Music_t *music = new JA_Music_t();
 
@@ -176,7 +189,7 @@ JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length)
     music->spec.channels = chan;
     music->spec.freq = samplerate;
     music->spec.format = SDL_AUDIO_S16;
-    music->buffer = (Uint8*)SDL_malloc(music->length);
+    music->buffer = (Uint8 *)SDL_malloc(music->length);
     SDL_memcpy(music->buffer, output, music->length);
     free(output);
     music->pos = 0;
@@ -185,15 +198,16 @@ JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length)
     return music;
 }
 
-JA_Music_t *JA_LoadMusic(const char* filename)
+JA_Music_t *JA_LoadMusic(const char *filename)
 {
     // [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid.
     FILE *f = fopen(filename, "rb");
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
-    Uint8 *buffer = (Uint8*)malloc(fsize + 1);
+    Uint8 *buffer = (Uint8 *)malloc(fsize + 1);
-    if (fread(buffer, fsize, 1, f)!=1) return NULL;
+    if (fread(buffer, fsize, 1, f) != 1)
+        return NULL;
     fclose(f);
 
     JA_Music_t *music = JA_LoadMusic(buffer, fsize);
@@ -205,7 +219,8 @@ JA_Music_t *JA_LoadMusic(const char* filename)
 
 void JA_PlayMusic(JA_Music_t *music, const int loop)
 {
-    if (!JA_musicEnabled) return;
+    if (!JA_musicEnabled)
+        return;
 
     JA_StopMusic();
 
@@ -215,48 +230,61 @@ void JA_PlayMusic(JA_Music_t *music, const int loop)
     current_music->times = loop;
 
     current_music->stream = SDL_CreateAudioStream(&current_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))
+        printf("[ERROR] 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))
-    //SDL_ResumeAudioStreamDevice(current_music->stream);
+    {
+        printf("[ERROR] SDL_BindAudioStream failed: %s\n", SDL_GetError());
+    }
+
+    // SDL_ResumeAudioStreamDevice(current_music->stream);
 }
 
 void JA_PauseMusic()
 {
-    if (!JA_musicEnabled) return;
+    if (!JA_musicEnabled)
-    if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
+        return;
+    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()
 {
-    if (!JA_musicEnabled) return;
+    if (!JA_musicEnabled)
-    if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
+        return;
+    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()
 {
-    if (!JA_musicEnabled) return;
+    if (!JA_musicEnabled)
-    if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
+        return;
+    if (!current_music || current_music->state == JA_MUSIC_INVALID)
+        return;
 
     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 (!JA_musicEnabled)
-    if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
+        return;
+    if (current_music == NULL || current_music->state == JA_MUSIC_INVALID)
+        return;
 
     fading = true;
     fade_start_time = SDL_GetTicks();
@@ -266,51 +294,55 @@ void JA_FadeOutMusic(const int milliseconds)
 
 JA_Music_state JA_GetMusicState()
 {
-    if (!JA_musicEnabled) return JA_MUSIC_DISABLED;
+    if (!JA_musicEnabled)
-    if (!current_music) return JA_MUSIC_INVALID;
+        return JA_MUSIC_DISABLED;
+    if (!current_music)
+        return JA_MUSIC_INVALID;
 
     return current_music->state;
 }
 
 void JA_DeleteMusic(JA_Music_t *music)
 {
-    if (current_music == music) current_music = nullptr;
+    if (current_music == music)
+        current_music = nullptr;
     SDL_free(music->buffer);
-    if (music->stream) SDL_DestroyAudioStream(music->stream);
+    if (music->stream)
+        SDL_DestroyAudioStream(music->stream);
     delete music;
 }
 
 float JA_SetMusicVolume(float volume)
 {
-    JA_musicVolume = SDL_clamp( volume, 0.0f, 1.0f );
+    JA_musicVolume = SDL_clamp(volume, 0.0f, 1.0f);
-    if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume);
+    if (current_music)
+        SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume);
     return JA_musicVolume;
 }
 
 void JA_SetMusicPosition(float value)
 {
-    if (!current_music) return;
+    if (!current_music)
+        return;
     current_music->pos = value * current_music->spec.freq;
 }
 
 float JA_GetMusicPosition()
 {
-    if (!current_music) return 0;
+    if (!current_music)
-    return float(current_music->pos)/float(current_music->spec.freq);
+        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();
+    if (!value && current_music && (current_music->state == JA_MUSIC_PLAYING))
+        JA_StopMusic();
 
     JA_musicEnabled = value;
 }
 
-
+JA_Sound_t *JA_NewSound(Uint8 *buffer, Uint32 length)
-
-
-
-JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length)
 {
     JA_Sound_t *sound = new JA_Sound_t();
     sound->buffer = buffer;
@@ -318,15 +350,15 @@ JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length)
     return sound;
 }
 
-JA_Sound_t *JA_LoadSound(uint8_t* buffer, uint32_t size)
+JA_Sound_t *JA_LoadSound(uint8_t *buffer, uint32_t size)
 {
     JA_Sound_t *sound = new JA_Sound_t();
-    SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size),1, &sound->spec, &sound->buffer, &sound->length);
+    SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size), 1, &sound->spec, &sound->buffer, &sound->length);
 
     return sound;
 }
 
-JA_Sound_t *JA_LoadSound(const char* filename)
+JA_Sound_t *JA_LoadSound(const char *filename)
 {
     JA_Sound_t *sound = new JA_Sound_t();
     SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length);
@@ -336,11 +368,16 @@ JA_Sound_t *JA_LoadSound(const char* filename)
 
 int JA_PlaySound(JA_Sound_t *sound, const int loop)
 {
-    if (!JA_soundEnabled) return -1;
+    if (!JA_soundEnabled)
+        return -1;
 
     int channel = 0;
-    while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; }
+    while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE)
-    if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0;
+    {
+        channel++;
+    }
+    if (channel == JA_MAX_SIMULTANEOUS_CHANNELS)
+        channel = 0;
     JA_StopChannel(channel);
 
     channels[channel].sound = sound;
@@ -357,9 +394,11 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop)
 
 int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop)
 {
-    if (!JA_soundEnabled) return -1;
+    if (!JA_soundEnabled)
+        return -1;
 
-    if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1;
+    if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS)
+        return -1;
     JA_StopChannel(channel);
 
     channels[channel].sound = sound;
@@ -376,8 +415,10 @@ int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop)
 
 void JA_DeleteSound(JA_Sound_t *sound)
 {
-    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
+    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-        if (channels[i].sound == sound) JA_StopChannel(i);
+    {
+        if (channels[i].sound == sound)
+            JA_StopChannel(i);
     }
     SDL_free(sound->buffer);
     delete sound;
@@ -385,7 +426,8 @@ void JA_DeleteSound(JA_Sound_t *sound)
 
 void JA_PauseChannel(const int channel)
 {
-    if (!JA_soundEnabled) return;
+    if (!JA_soundEnabled)
+        return;
 
     if (channel == -1)
     {
@@ -393,7 +435,7 @@ 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);
             }
     }
@@ -402,7 +444,7 @@ 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);
         }
     }
@@ -410,7 +452,8 @@ void JA_PauseChannel(const int channel)
 
 void JA_ResumeChannel(const int channel)
 {
-    if (!JA_soundEnabled) return;
+    if (!JA_soundEnabled)
+        return;
 
     if (channel == -1)
     {
@@ -418,7 +461,7 @@ 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);
             }
     }
@@ -427,7 +470,7 @@ 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);
         }
     }
@@ -435,12 +478,15 @@ void JA_ResumeChannel(const int channel)
 
 void JA_StopChannel(const int channel)
 {
-    if (!JA_soundEnabled) return;
+    if (!JA_soundEnabled)
+        return;
 
     if (channel == -1)
     {
-        for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
+        for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-            if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream);
+        {
+            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;
@@ -449,7 +495,8 @@ void JA_StopChannel(const int channel)
     }
     else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS)
     {
-        if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream);
+        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;
@@ -459,19 +506,21 @@ void JA_StopChannel(const int channel)
 
 JA_Channel_state JA_GetChannelState(const int channel)
 {
-    if (!JA_soundEnabled) return JA_SOUND_DISABLED;
+    if (!JA_soundEnabled)
+        return JA_SOUND_DISABLED;
 
-    if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID;
+    if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS)
+        return JA_CHANNEL_INVALID;
 
     return channels[channel].state;
 }
 
 float JA_SetSoundVolume(float volume)
 {
-    JA_soundVolume = SDL_clamp( volume, 0.0f, 1.0f );
+    JA_soundVolume = SDL_clamp(volume, 0.0f, 1.0f);
 
     for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-        if ( (channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED) )
+        if ((channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED))
             SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume);
 
     return JA_soundVolume;
@@ -481,7 +530,8 @@ void JA_EnableSound(const bool value)
 {
     for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
     {
-        if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i);
+        if (channels[i].state == JA_CHANNEL_PLAYING)
+            JA_StopChannel(i);
     }
     JA_soundEnabled = value;
 }

source/options.cpp

@@ -31,34 +31,6 @@ namespace Options
 	// Inicializa las opciones del programa
 	void init()
 	{
-		// Opciones de ventana
-		window.caption = "Coffee Crisis Arcade Edition";
-		window.size = 2;
-
-		// Opciones de video
-		video.fullscreen = false;
-		video.scale_mode = SDL_ScaleMode::SDL_SCALEMODE_NEAREST;
-		video.v_sync = true;
-		video.integer_scale = true;
-		video.shaders = false;
-
-		// Opciones de audio
-		audio.enabled = true;
-		audio.volume = 100;
-		audio.music.enabled = true;
-		audio.music.volume = 100;
-		audio.sound.enabled = true;
-		audio.sound.volume = 50;
-
-		// Opciones de configuracion
-		settings.difficulty = DifficultyCode::NORMAL;
-		settings.language = Lang::Code::VALENCIAN;
-		settings.autofire = true;
-		settings.shutdown_enabled = false;
-		settings.is_y_axis_inverted = false;
-		settings.clearLastHiScoreEntries();
-		settings.config_file = Asset::get()->get("config.txt");
-
 		// Opciones de control
 		controllers.clear();
 		controllers.resize(2);

source/options.h

@@ -6,6 +6,9 @@
 #include <vector>				  // Para std::vector
 #include "input.h"				  // Para InputAction, InputDeviceToUse
 #include "manage_hiscore_table.h" // Para HiScoreEntry
+#include "asset.h"
+
+static constexpr int INVALID_INDEX = -1;
 
 namespace Lang
 {
@@ -32,12 +35,18 @@ namespace Options
 			: code(c), name(n) {}
 	};
 
-	// --- Opciones de la ventana ---
+	// --- Opciones de ventana ---
 	struct WindowOptions
 	{
 		std::string caption; // Texto que aparece en la barra de título de la ventana
-		int size = 1;		 // Valor por el que se multiplica el tamaño de la ventana
+		int size;			 // Valor por el que se multiplica el tamaño de la ventana
-		int max_size = 1;	 // Tamaño máximo para que la ventana no sea mayor que la pantalla
+		int max_size;		 // Tamaño máximo para que la ventana no sea mayor que la pantalla
+
+		// Constructor por defecto con valores iniciales
+		WindowOptions()
+			: caption("Coffee Crisis Arcade Edition"),
+			  size(2),
+			  max_size(2) {}
 	};
 
 	// --- Opciones de vídeo ---
@@ -49,6 +58,15 @@ namespace Options
 		bool integer_scale;		  // Indica si se usa escalado entero
 		bool shaders;			  // Indica si se usan shaders para los filtros de vídeo
 		std::string info;		  // Información sobre el modo de vídeo
+
+		// Constructor por defecto con valores iniciales
+		VideoOptions()
+			: scale_mode(SDL_ScaleMode::SDL_SCALEMODE_NEAREST),
+			  fullscreen(false),
+			  v_sync(true),
+			  integer_scale(true),
+			  shaders(false),
+			  info() {}
 	};
 
 	// --- Opciones de música ---
@@ -56,6 +74,11 @@ namespace Options
 	{
 		bool enabled; // Indica si la música suena o no
 		int volume;	  // Volumen de la música
+
+		// Constructor por defecto
+		MusicOptions()
+			: enabled(true),
+			  volume(100) {}
 	};
 
 	// --- Opciones de sonido ---
@@ -63,6 +86,11 @@ namespace Options
 	{
 		bool enabled; // Indica si los sonidos suenan o no
 		int volume;	  // Volumen de los sonidos
+
+		// Constructor por defecto
+		SoundOptions()
+			: enabled(true),
+			  volume(100) {}
 	};
 
 	// --- Opciones de audio ---
@@ -72,25 +100,42 @@ namespace Options
 		SoundOptions sound; // Opciones para los efectos de sonido
 		bool enabled;		// Indica si el audio está activo o no
 		int volume;			// Volumen general del audio
+
+		// Constructor por defecto
+		AudioOptions()
+			: music(),
+			  sound(),
+			  enabled(true),
+			  volume(100) {}
 	};
 
-	// --- Opciones de configuracion ---
+	// --- Opciones de configuración ---
 	struct SettingsOptions
 	{
-		DifficultyCode difficulty;						 // Dificultad del juego
+		DifficultyCode difficulty;				  // Dificultad del juego
-		Lang::Code language;							 // Idioma usado en el juego
+		Lang::Code language;					  // Idioma usado en el juego
-		bool autofire;									 // Indicador de autofire
+		bool autofire;							  // Indicador de autofire
-		bool shutdown_enabled;							 // Especifica si se puede apagar el sistema
+		bool shutdown_enabled;					  // Especifica si se puede apagar el sistema
-		bool is_y_axis_inverted;						 // Indica si hay que invertir el eje Y de los controles
+		bool is_y_axis_inverted;				  // Indica si hay que invertir el eje Y de los controles
-		std::vector<HiScoreEntry> hi_score_table;		 // Tabla de mejores puntuaciones
+		std::vector<HiScoreEntry> hi_score_table; // Tabla de mejores puntuaciones
-		std::vector<int> last_hi_score_entry = {-1, -1}; // Últimas posiciones de entrada en la tabla
+		std::vector<int> last_hi_score_entry;	  // Últimas posiciones de entrada en la tabla
-		std::string config_file;						 // Ruta al fichero donde guardar la configuracion y las opciones del juego
+		std::string config_file;				  // Ruta al fichero donde guardar la configuración y las opciones del juego
+
+		// Constructor por defecto con valores iniciales
+		SettingsOptions()
+			: difficulty(DifficultyCode::NORMAL),
+			  language(Lang::Code::VALENCIAN),
+			  autofire(true),
+			  shutdown_enabled(false),
+			  is_y_axis_inverted(false),
+			  last_hi_score_entry({INVALID_INDEX, INVALID_INDEX}),
+			  config_file(Asset::get()->get("config.txt")) {}
 
 		// Reinicia las últimas entradas de puntuación
 		void clearLastHiScoreEntries()
 		{
-			last_hi_score_entry[0] = -1;
+			last_hi_score_entry[0] = INVALID_INDEX;
-			last_hi_score_entry[1] = -1;
+			last_hi_score_entry[1] = INVALID_INDEX;
 		}
 	};
 
@@ -107,17 +152,37 @@ namespace Options
 
 		// Constructor por defecto
 		GamepadOptions()
-			: index(-1), player_id(-1), type(InputDeviceToUse::CONTROLLER), name(""), plugged(false),
+			: index(INVALID_INDEX),
-			  inputs{InputAction::FIRE_LEFT, InputAction::FIRE_CENTER, InputAction::FIRE_RIGHT, InputAction::START, InputAction::SERVICE},
+			  player_id(INVALID_INDEX),
-			  buttons{SDL_GAMEPAD_BUTTON_WEST, SDL_GAMEPAD_BUTTON_NORTH, SDL_GAMEPAD_BUTTON_EAST, SDL_GAMEPAD_BUTTON_START, SDL_GAMEPAD_BUTTON_BACK} {}
+			  type(InputDeviceToUse::CONTROLLER),
+			  name(),
+			  plugged(false),
+			  inputs{
+				  InputAction::FIRE_LEFT,
+				  InputAction::FIRE_CENTER,
+				  InputAction::FIRE_RIGHT,
+				  InputAction::START,
+				  InputAction::SERVICE},
+			  buttons{
+				  SDL_GAMEPAD_BUTTON_WEST,
+				  SDL_GAMEPAD_BUTTON_NORTH,
+				  SDL_GAMEPAD_BUTTON_EAST,
+				  SDL_GAMEPAD_BUTTON_START,
+				  SDL_GAMEPAD_BUTTON_BACK} {}
 	};
 
 	// --- Opciones pendientes de aplicar ---
 	struct PendingChanges
 	{
-		Lang::Code new_language;		  // Idioma en espera de aplicar
+		Lang::Code new_language;	   // Idioma en espera de aplicar
-		DifficultyCode new_difficulty;	  // Dificultad en espera de aplicar
+		DifficultyCode new_difficulty; // Dificultad en espera de aplicar
-		bool has_pending_changes = false; // Indica si hay cambios pendientes
+		bool has_pending_changes;	   // Indica si hay cambios pendientes
+
+		// Constructor por defecto con valores iniciales
+		PendingChanges()
+			: new_language(Lang::Code::VALENCIAN),
+			  new_difficulty(DifficultyCode::NORMAL),
+			  has_pending_changes(false) {}
 	};
 
 	// --- Variables globales ---
@@ -127,18 +192,18 @@ namespace Options
 	extern AudioOptions audio;						// Opciones de audio
 	extern std::vector<GamepadOptions> controllers; // Opciones de mando para cada jugador
 	extern PendingChanges pending_changes;			// Opciones que se aplican al cerrar
-	extern std::vector<Difficulty> difficulties;
+	extern std::vector<Difficulty> difficulties;	// Lista de los diferentes tipos de dificultad
 
 	// --- Funciones de configuración ---
-	void init();							 // Inicializa las opciones del programa
+	void init();													   // Inicializa las opciones del programa
-	bool loadFromFile();					 // Carga el fichero de configuración
+	bool loadFromFile();											   // Carga el fichero de configuración
-	bool saveToFile();						 // Guarda el fichero de configuración
+	bool saveToFile();												   // Guarda el fichero de configuración
-	void setKeyboardToPlayer(int player_id); // Asigna el teclado al jugador
+	void setKeyboardToPlayer(int player_id);						   // Asigna el teclado al jugador
-	void swapKeyboard();					 // Intercambia el teclado de jugador
+	void swapKeyboard();											   // Intercambia el teclado de jugador
-	void swapControllers();					 // Intercambia los jugadores asignados a los dos primeros mandos
+	void swapControllers();											   // Intercambia los jugadores asignados a los dos primeros mandos
-	int getPlayerWhoUsesKeyboard();			 // Averigua quién está usando el teclado
+	int getPlayerWhoUsesKeyboard();									   // Averigua quién está usando el teclado
-	void applyPendingChanges();				 // Aplica los cambios pendientes copiando los valores a sus variables
+	void applyPendingChanges();										   // Aplica los cambios pendientes copiando los valores a sus variables
-	void checkPendingChanges();
+	void checkPendingChanges();										   // Verifica si hay cambios pendientes
-	DifficultyCode getDifficultyCodeFromName(const std::string &name);
+	DifficultyCode getDifficultyCodeFromName(const std::string &name); // Obtiene el código de dificultad a partir del nombre
-	std::string getDifficultyNameFromCode(DifficultyCode code);
+	std::string getDifficultyNameFromCode(DifficultyCode code);		   // Obtiene el nombre de la dificultad a partir del código
 } // namespace Options

source/param.cpp

@@ -55,7 +55,7 @@ void initParam()
 	param.title.title_c_c_position = 11;
 
 	// BACKGROUND
-	param.background.attenuate_color = Color(255, 255, 255);
+	param.background.attenuate_color = Color(255, 255, 255, 0);
 
 	// BALLOONS
 	param.balloon.emplace_back(0.09f, 2.60f);
@@ -67,9 +67,7 @@ void initParam()
 	param.notification.pos_v = NotifyPosition::TOP;
 	param.notification.pos_h = NotifyPosition::LEFT;
 	param.notification.sound = false;
-	param.notification.color.r = 48;
+	param.notification.color = Color(48, 48, 48);
-	param.notification.color.g = 48;
-	param.notification.color.b = 48;
 }
 
 // Carga los parámetros desde un archivo