diff --git a/src/engine/engine.py b/src/engine/engine.py index 0abcc69..1a46a14 100644 --- a/src/engine/engine.py +++ b/src/engine/engine.py @@ -9,6 +9,7 @@ from src.engine.menu_manager import MenuManager from src.engine.renderer import Renderer from src.engine.enums import GameState from src.engine.sound_manager import SoundManager +from src.engine.settings_manager import SettingsManager import pygame @@ -39,6 +40,7 @@ class Engine: self.dialogs_manager = DialogsManager(self.event_handler) self.menu_manager = MenuManager(self) self.sound_manager = SoundManager(60) + self.settings_manager = SettingsManager() def loop(self): """Fonction à lancer au début du programme et qui va lancer les updates dans une boucle. @@ -57,7 +59,9 @@ class Engine: self.event_handler.update() self.event_sheduler.update() self.dialogs_manager.update(0.016666666) - self.sound_manager.update(1/60) + self.sound_manager.update(1/60, self.settings_manager.get_music_master_volume(), + self.settings_manager.get_sound_global_master_volume(), + self.settings_manager.get_sound_master_volume()) def stop(self): """Arrête le programme.""" diff --git a/src/engine/settings_manager.py b/src/engine/settings_manager.py index 7685694..ce3e2f1 100644 --- a/src/engine/settings_manager.py +++ b/src/engine/settings_manager.py @@ -1,9 +1,9 @@ -class Settings: +class SettingsManager: def __init__(self) -> None: self.master_volume = 60 self.sound_master_volume = 100 self.music_master_volume = 100 - self.global_sound_master_volume = 100 + self.sound_global_master_volume = 100 self.zoom = 1.75 @@ -11,8 +11,8 @@ class Settings: def get_music_master_volume(self): return round(self.master_volume / 100 * self.music_master_volume, 3) - def get_global_sound_master_volume(self): - return round(self.master_volume / 100 * self.global_sound_master_volume, 3) + def get_sound_global_master_volume(self): + return round(self.master_volume / 100 * self.sound_global_master_volume, 3) def get_sound_master_volume(self): return round(self.master_volume / 100 * self.sound_master_volume, 3)