movie don't expect Director to not call cc sometimes

This commit is contained in:
2023-08-17 20:28:57 -06:00
parent 0f49489777
commit 80c27dd165
2 changed files with 4 additions and 2 deletions

View File

@@ -60,7 +60,7 @@ interface Director<Set:Cloneable<Set>, Actor, Sound, Song, Prop, VoiceTrack, Cam
function showCharacter(character:Character<Actor>, appearance:Appearance, camera:Camera, cc:Continuation):Void; function showCharacter(character:Character<Actor>, appearance:Appearance, camera:Camera, cc:Continuation):Void;
function hideCharacter(character:Character<Actor>, camera:Camera, cc:Continuation):Void; function hideCharacter(character:Character<Actor>, camera:Camera, cc:Continuation):Void;
function playSound(sound:Sound, volumeMod:Float, waitForEnd:Bool, cc:Continuation):Void; function playSound(sound:Sound, volumeMod:Float, ?cc:Continuation):Void;
function getSoundLength(sound:Sound):Float; function getSoundLength(sound:Sound):Float;
function stopSound(sound:Sound):Void; function stopSound(sound:Sound):Void;

View File

@@ -619,7 +619,9 @@
(delay skipping (min MAX_CAPTION_DURATION (director.getSoundLength sound)) (delay skipping (min MAX_CAPTION_DURATION (director.getSoundLength sound))
(makeCC (makeCC
(director.hideCaption id)))) (director.hideCaption id))))
(director.playSound sound volumeMod ?waitForEnd cc))) (director.playSound sound volumeMod (when waitForEnd cc)))
(unless waitForEnd
(cc)))
(hollywooMethod awaitPlaySound [:Bool skipping name :Continuation cc &opt :Float volumeMod] (hollywooMethod awaitPlaySound [:Bool skipping name :Continuation cc &opt :Float volumeMod]
(playSound skipping name cc volumeMod true)) (playSound skipping name cc volumeMod true))