refactor

Author: guanzo

cue_lib/cue_z.rpy

@@ -400,7 +400,6 @@ init 999 python:
         the patches: reload_all() restores renpy.* modules to their
         post-import state, wiping the config callback lists too."""
 
-        # Register 8 dedicated SFX channels on the "sfx" mixer
         for i in range(1, CUE_SFX_CHANNEL_COUNT + 1):
             ch_name = _cue_sfx_channel_name(i)
             if not renpy.music.channel_defined(ch_name):
@@ -430,7 +429,6 @@ init 999 python:
 
         config.all_character_callbacks.append(_cue_char_callback)
 
-        # start_interact callback — detects context changes at interaction
         def _cue_start_interact_callback(*args, **kwargs):
             # Ensure the runtime driver is always active.
             if not renpy.get_screen("cue_runtime_driver", layer="cue_layer"):

cue_lib/markers.py

@@ -659,6 +659,14 @@ def target_active_label(self):
 # ---------------------------------------------------------------------------
 
 
+def _cue_coalesce_bool(value, default):
+    # type: (object, bool) -> bool
+    """None means *default*, else bool(value).  A dict key holding None (e.g. a
+    partially-nulled persistent._cue) must not silently flip these scalars to
+    falsy -- remove_audio=None would keep audio on every encode."""
+    return default if value is None else bool(value)
+
+
 def _cue_load_scalars_from_persistent():
     # type: () -> None
     """Fan out per-game scalars from persistent/shared config into the
@@ -687,22 +695,16 @@ def _cue_load_scalars_from_persistent():
         _cue_dict.pop("disabled_files", None)
 
     _cue.sfx.library.disabled_files = set(shared.get("disabled_files", []))
-    # Coalesce None to the default: a dict whose keys hold None (e.g. a
-    # partially-nulled persistent._cue) must not silently flip these to
-    # falsy -- remove_audio=None would keep audio on every encode.
-    _triggers = _cue_dict.get("triggers_active")
-    _cue.trigger.active = True if _triggers is None else bool(_triggers)
+
+    # Coalesce None to the default: see _cue_coalesce_bool.
+    _cue.trigger.active = _cue_coalesce_bool(_cue_dict.get("triggers_active"), True)
     _mode = _cue_dict.get("encode_mode")
-    if _mode is None:
-        _mode = _cue.video_editor.MODE_INTERPOLATE
-    _cue.video_editor.encode_mode = _mode
-    _ra = _cue_dict.get("remove_audio")
-    _cue.video_editor.remove_audio = True if _ra is None else bool(_ra)
-    _st = _cue_dict.get("seamless_transition")
-    _cue.speed_resolver.seamless_transition = False if _st is None else bool(_st)
-    _sfm = _cue_dict.get(CUE_PERSIST_SIDEBAR_MODE)
-    _cue.sfx.library.is_sidebar_mode = False if _sfm is None else bool(_sfm)
+    _cue.video_editor.encode_mode = _mode if _mode is not None else _cue.video_editor.MODE_INTERPOLATE
+    _cue.video_editor.remove_audio = _cue_coalesce_bool(_cue_dict.get("remove_audio"), True)
+    _cue.speed_resolver.seamless_transition = _cue_coalesce_bool(_cue_dict.get("seamless_transition"), False)
+    _cue.sfx.library.is_sidebar_mode = _cue_coalesce_bool(_cue_dict.get(CUE_PERSIST_SIDEBAR_MODE), False)
     _sw = _cue_dict.get(CUE_PERSIST_SIDEBAR_WIDTH)
+
     if isinstance(_sw, int):
         _cue.sfx.library.set_sidebar_width(_sw)
     else: