diff --git a/projects/hollywoo/src/hollywoo/Movie.kiss b/projects/hollywoo/src/hollywoo/Movie.kiss index e3a46b89..298ae02f 100644 --- a/projects/hollywoo/src/hollywoo/Movie.kiss +++ b/projects/hollywoo/src/hollywoo/Movie.kiss @@ -164,9 +164,9 @@ set (dictGet sets setKey) characters - (new Map) + (new FuzzyMap>) propsOnScreen - (new Map) + (new FuzzyMap) ] time perspective))) @@ -291,7 +291,7 @@ (showDialog actorName (VoiceOver (dictGet actors actorName)) wryly text cc)) (hollywooMethod onPhoneSpeech true [actorName wryly text :Continuation cc] - (showDialog actorName (ifLet [charOnScreen (dictGet .characters (_currentScene) actorName)] + (showDialog actorName (ifLet [charOnScreen (try (dictGet .characters (_currentScene) actorName) (catch [e] null))] (OnScreen charOnScreen) (FromPhone (dictGet actors actorName))) wryly text cc)) diff --git a/projects/hollywoo/src/hollywoo/Scene.hx b/projects/hollywoo/src/hollywoo/Scene.hx index d52f31f9..58864492 100644 --- a/projects/hollywoo/src/hollywoo/Scene.hx +++ b/projects/hollywoo/src/hollywoo/Scene.hx @@ -1,5 +1,7 @@ package hollywoo; +import kiss.FuzzyMap; + enum SceneTime { Morning; Day; @@ -31,8 +33,8 @@ enum SpeechType { typedef Scene = { set:Set, - characters:Map>, - propsOnScreen:Map, + characters:FuzzyMap>, + propsOnScreen:FuzzyMap, // TODO props on stage time:SceneTime, perspective:ScenePerspective