jaildesigner-jailgames/aee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

afegit resource::cache

Browse Source 
normalitzat Audio
This commit is contained in:
Sergio
2026-04-18 11:41:34 +02:00
parent 7409c799c3
commit 94aa69cffe
29 changed files with 1420 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/game/options.cpp
View File

@@ -4,7 +4,7 @@
#include <iostream>
#include <string>
#include "core/jail/jail_audio.hpp"
#include "core/audio/audio.hpp"
#include "external/fkyaml_node.hpp"
#include "game/defaults.hpp"
#include "game/defines.hpp"
@@ -76,12 +76,16 @@ namespace Options {
}
}
// Delega tots els canvis de l'estat d'àudio al wrapper Audio. Es manté
// com a punt d'entrada únic per als callsites legacy del menú; el cos
// ja no toca jail_audio directament.
void applyAudio() {
const float master = audio.enabled ? audio.volume : 0.0F;
JA_EnableMusic(audio.music_enabled);
JA_EnableSound(audio.sound_enabled);
JA_SetMusicVolume(master * audio.music_volume);
JA_SetSoundVolume(master * audio.sound_volume);
if (::Audio::get() == nullptr) return;
::Audio::get()->enable(audio.enabled);
::Audio::get()->enableMusic(audio.music.enabled);
::Audio::get()->enableSound(audio.sound.enabled);
::Audio::get()->setMusicVolume(audio.music.volume);
::Audio::get()->setSoundVolume(audio.sound.volume);
}
// --- Funcions helper de càrrega ---
@@ -99,17 +103,17 @@ namespace Options {
if (node.contains("music")) {
const auto& music = node["music"];
if (music.contains("enabled"))
audio.music_enabled = music["enabled"].get_value<bool>();
audio.music.enabled = music["enabled"].get_value<bool>();
if (music.contains("volume"))
audio.music_volume = music["volume"].get_value<float>();
audio.music.volume = music["volume"].get_value<float>();
}
if (node.contains("sound")) {
const auto& sound = node["sound"];
if (sound.contains("enabled"))
audio.sound_enabled = sound["enabled"].get_value<bool>();
audio.sound.enabled = sound["enabled"].get_value<bool>();
if (sound.contains("volume"))
audio.sound_volume = sound["volume"].get_value<float>();
audio.sound.volume = sound["volume"].get_value<float>();
}
}
@@ -352,11 +356,11 @@ namespace Options {
file << " enabled: " << (audio.enabled ? "true" : "false") << "\n";
file << " volume: " << audio.volume << "\n";
file << " music:\n";
file << " enabled: " << (audio.music_enabled ? "true" : "false") << "\n";
file << " volume: " << audio.music_volume << "\n";
file << " enabled: " << (audio.music.enabled ? "true" : "false") << "\n";
file << " volume: " << audio.music.volume << "\n";
file << " sound:\n";
file << " enabled: " << (audio.sound_enabled ? "true" : "false") << "\n";
file << " volume: " << audio.sound_volume << "\n";
file << " enabled: " << (audio.sound.enabled ? "true" : "false") << "\n";
file << " volume: " << audio.sound.volume << "\n";
file << "\n";
// GAME