ControlBlocks: Add wait until block

Author: adazem009

src/blocks/controlblocks.cpp

@@ -17,6 +17,7 @@ ControlBlocks::ControlBlocks()
     addCompileFunction("control_if_else", &compileIfElseStatement);
     addCompileFunction("control_stop", &compileStop);
     addCompileFunction("control_wait", &compileWait);
+    addCompileFunction("control_wait_until", &compileWaitUntil);
 
     // Inputs
     addInput("SUBSTACK", SUBSTACK);
@@ -132,6 +133,13 @@ void ControlBlocks::compileWait(Compiler *compiler)
     compiler->addFunctionCall(&wait);
 }
 
+void ControlBlocks::compileWaitUntil(Compiler *compiler)
+{
+    compiler->addInstruction(vm::OP_CHECKPOINT);
+    compiler->addInput(CONDITION);
+    compiler->addFunctionCall(&waitUntil);
+}
+
 unsigned int ControlBlocks::stopAll(VirtualMachine *vm)
 {
     vm->engine()->stop();
@@ -164,4 +172,13 @@ unsigned int ControlBlocks::wait(VirtualMachine *vm)
     return 0;
 }
 
+unsigned int ControlBlocks::waitUntil(VirtualMachine *vm)
+{
+    if (!vm->getInput(0, 1)->toBool()) {
+        vm->moveToLastCheckpoint();
+        vm->stop(true, true, false);
+    }
+    return 1;
+}
+
 } // namespace libscratchcpp

src/blocks/controlblocks.h

@@ -44,12 +44,14 @@ class LIBSCRATCHCPP_EXPORT ControlBlocks : public IBlockSection
         static void compileIfElseStatement(Compiler *compiler);
         static void compileStop(Compiler *compiler);
         static void compileWait(Compiler *compiler);
+        static void compileWaitUntil(Compiler *compiler);
 
     private:
         static unsigned int stopAll(VirtualMachine *vm);
         static unsigned int stopOtherScriptsInSprite(VirtualMachine *vm);
         static unsigned int startWait(VirtualMachine *vm);
         static unsigned int wait(VirtualMachine *vm);
+        static unsigned int waitUntil(VirtualMachine *vm);
 
         static inline std::unordered_map<VirtualMachine *, std::pair<std::chrono::steady_clock::time_point, int>> m_timeMap;
 };