kiss-lang/hollywoo-flixel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to new waitForInput() scheme

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-02-11 20:07:50 -07:00
parent ef130da50b
commit 1ac8ed955b
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
haxe_libraries/hollywoo.hxml
View File

@@ -1,6 +1,6 @@
# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#7c92be0b91c33759575b3232c5625d218905c184" into hollywoo/0.0.0/github/7c92be0b91c33759575b3232c5625d218905c184 # @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#1332b9b43d95ecce98a7c986cfc61e49b504fd53" into hollywoo/0.0.0/github/1332b9b43d95ecce98a7c986cfc61e49b504fd53
# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/7c92be0b91c33759575b3232c5625d218905c184" # @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/1332b9b43d95ecce98a7c986cfc61e49b504fd53"
-lib kiss -lib kiss
-lib kiss-tools -lib kiss-tools
-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/7c92be0b91c33759575b3232c5625d218905c184/src/ -cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/1332b9b43d95ecce98a7c986cfc61e49b504fd53/src/
-D hollywoo=0.0.0 -D hollywoo=0.0.0

18
src/hollywoo_flixel/FlxDirector.kiss
View File

@@ -491,7 +491,7 @@
(hideTitleCard) (hideTitleCard)
(hideBlackScreen) (hideBlackScreen)
(hideDialog) (_hideDialog)
(hideLighting) (hideLighting)
(when (and flxMovie.sceneKey (< 0 (Lambda.count flxMovie.scenes))) (when (and flxMovie.sceneKey (< 0 (Lambda.count flxMovie.scenes)))
@@ -568,12 +568,11 @@
(set nextCC null) (set nextCC null)
(cc))) (cc)))
(method :Void startWaitForInput [:Continuation cc] (method &public :Void _startWaitForInput [:Continuation cc]
(set nextCC cc)) (set nextCC cc))
(method :Void stopWaitForInput [:Continuation cc] (method &public :Void _stopWaitForInput []
(when (= nextCC cc) (set nextCC null))
(set nextCC null)))
(var TITLE_Y 240) (var TITLE_Y 240)
(var TITLE_SIZE 72) (var TITLE_SIZE 72)
@@ -700,9 +699,8 @@
(actor.playAnimation wryly) (actor.playAnimation wryly)
(actor.playAnimation "neutral"))) (actor.playAnimation "neutral")))
(method showDialog [:String speakerName :SpeechType<ActorFlxSprite> type :String wryly :String text :Continuation cc] (method &public _showDialog [:String speakerName :SpeechType<ActorFlxSprite> type :String wryly :String text :Continuation cc]
// TODO handle text messages, wrylies, off-screen, from-phone, etc. via (case type) // TODO handle text messages, wrylies, off-screen, from-phone, etc. via (case type)
// TODO attribute on-screen dialogue to the character's stageposition
// TODO allow sounds for wrylies, like the dispatch click // TODO allow sounds for wrylies, like the dispatch click
(localVar &mut :Float speakerNameX -1) (localVar &mut :Float speakerNameX -1)
@@ -716,7 +714,6 @@
(superText.screenCenter) (superText.screenCenter)
(set superText.y flxMovie.DIALOG_Y) (set superText.y flxMovie.DIALOG_Y)
(FlxG.state.add superText) (FlxG.state.add superText)
(startWaitForInput cc)
(return))) (return)))
((OnScreen character) ((OnScreen character)
(set speakerNameX (+ character.actor.x (fHalf character.actor.width)))) (set speakerNameX (+ character.actor.x (fHalf character.actor.width))))
@@ -759,10 +756,9 @@
(set dialogText.y flxMovie.DIALOG_Y)) (set dialogText.y flxMovie.DIALOG_Y))
(set dialogText.size DIALOG_SIZE) (set dialogText.size DIALOG_SIZE)
(while (< FlxG.height (+ dialogText.y dialogText.height)) (while (< FlxG.height (+ dialogText.y dialogText.height))
(-= dialogText.size 6)) (-= dialogText.size 6)))
(startWaitForInput cc))
(method :Void hideDialog [] (method &public :Void _hideDialog []
(when dialogText (when dialogText
(FlxG.state.remove dialogText) (FlxG.state.remove dialogText)
(set dialogText null)) (set dialogText null))

2
src/test/source/Test.hollywoo
View File

@@ -104,7 +104,7 @@ CLEARCHARACTERS
{ {
(doFor preset PRESET_SCREEN_POSITIONS (doFor preset PRESET_SCREEN_POSITIONS
(addProp preset preset ->:Void {})) (addProp preset preset ->:Void {}))
(director.startWaitForInput cc) (director._startWaitForInput cc)
} }
// TODO test credits // TODO test credits