Implement wait

textadventures · Nov 22, 2015 · bdac532 · bdac532
1 parent 66da07f
commit bdac532
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 26 deletions.
diff --git a/Prototypes/jsrunner/asl4.ts b/Prototypes/jsrunner/asl4.ts
@@ -108,7 +108,7 @@ class Player {
 
     }
     DoWait() {
-
+        quest.ui.beginWait();
     }
     DoPause(ms: number) {
 
@@ -497,6 +497,7 @@ class LegacyGame {
     _commandOverrideModeOn: boolean = false;
     _commandOverrideResolve: Callback;
     _commandOverrideVariable: string;
+    _waitResolve: Callback;
     _afterTurnScript: string;
     _beforeTurnScript: string;
     _outPutOn: boolean = false;
@@ -4683,7 +4684,7 @@ class LegacyGame {
                 await this.Print("|nPress a key to continue...", ctx);
             }
         }
-        this.DoWait();
+        await this.DoWait();
     }
     InitFileData(fileData: string): void {
         this._fileData = fileData;
@@ -10790,8 +10791,13 @@ class LegacyGame {
         quest.print(output.text, !output.nobr);
     }
 
-    DoWait() {
-        // TODO
+    async DoWait(): Promise<void> {
+        this._player.DoWait();
+        return new Promise<void>(resolve => this._waitResolve = resolve);
+    }
+
+    EndWait() {
+        this._waitResolve();
     }
 
     Pause(duration: number) {

diff --git a/Prototypes/jsrunner/index.html b/Prototypes/jsrunner/index.html
@@ -62,9 +62,8 @@
 				var onFailure = function () {
 					console.log("fail");
 				};
-				quest.sendCommand = function (command, elapsedTime) {
-					game.SendCommand(command, elapsedTime);
-				}
+				quest.sendCommand = game.SendCommand.bind(game);
+				quest.endWait = game.EndWait.bind(game);
 				game.Initialise(onSuccess, onFailure);
 			}
 			else {

diff --git a/Prototypes/jsrunner/test.asl b/Prototypes/jsrunner/test.asl
@@ -14,6 +14,12 @@ define game <>
 		enter <input2>
 		msg <First #input#, now #input2#.>
 	}
+	command <test2> {
+		wait <Press a key please...>
+		msg <Done!>
+		wait <Now press a key again...>
+		msg <Finished!>
+	}
 	verb <read> msg <You can't read that.>
 end define
 

diff --git a/Prototypes/jsrunner/ui.js b/Prototypes/jsrunner/ui.js
@@ -40,4 +40,5 @@
     quest.ui.locationUpdated = updateLocation;
     quest.ui.updateList = updateList;
     quest.ui.updateCompass = updateCompassDirections;
+    quest.ui.beginWait = beginWait;
 })();
diff --git a/Prototypes/jsrunner/ui/playercore.js b/Prototypes/jsrunner/ui/playercore.js
@@ -124,16 +124,16 @@ $(function () {
     ui_init();
     updateStatusVisibility();
 
-    var overrideContextMenuClick = function(e) {
-        if (!e) e = window.event;
-        if ((e.type && e.type == "contextmenu") || (e.button && e.button == 2) || (e.which && e.which == 3)) {
-            return false;
-        }
-        return true;
-    };
-    if (document.layers) document.captureEvents(Event.MOUSEDOWN);
-    document.onmousedown = overrideContextMenuClick;
-    document.oncontextmenu = overrideContextMenuClick;
+    // var overrideContextMenuClick = function(e) {
+    //     if (!e) e = window.event;
+    //     if ((e.type && e.type == "contextmenu") || (e.button && e.button == 2) || (e.which && e.which == 3)) {
+    //         return false;
+    //     }
+    //     return true;
+    // };
+    // if (document.layers) document.captureEvents(Event.MOUSEDOWN);
+    // document.onmousedown = overrideContextMenuClick;
+    // document.oncontextmenu = overrideContextMenuClick;
 
     $("#txtCommand").focus();
 });
@@ -558,10 +558,12 @@ function updateVerbButtons(selectedItem, verbsArray, idprefix) {
 }
 
 function beginWait() {
-    _waitMode = true;
-    $("#txtCommand").hide();
-    $("#endWaitLink").show();
-    markScrollPosition();
+    setTimeout(function () {
+        _waitMode = true;
+        $("#txtCommand").hide();
+        $("#endWaitLink").show();
+        markScrollPosition();
+    }, 1);
 }
 
 function endWait() {

diff --git a/Prototypes/jsrunner/ui/playerweb.js b/Prototypes/jsrunner/ui/playerweb.js
@@ -9,11 +9,10 @@ function ui_init() {
 }
 
 function sendEndWait() {
-    window.setTimeout(function () {
-        $("#fldUIMsg").val("endwait");
-        $("#cmdSubmit").click();
-    }, 100);
-    waitEnded();
+    setTimeout(function () {
+        quest.endWait();
+        waitEnded();
+    }, 1);
 }
 
 function sessionTimeout() {