Add broadcast promise only for wait blocks

Author: adazem009

include/scratchcpp/iengine.h

@@ -62,13 +62,13 @@ class LIBSCRATCHCPP_EXPORT IEngine
         virtual Thread *startScript(std::shared_ptr<Block> topLevelBlock, Target *) = 0;
 
         /*! Starts the scripts of the broadcast with the given index. */
-        virtual void broadcast(int index, Thread *sender) = 0;
+        virtual void broadcast(int index, Thread *sender, bool wait) = 0;
 
         /*! Starts the scripts of the given broadcast. */
-        virtual void broadcastByPtr(Broadcast *broadcast, Thread *sender) = 0;
+        virtual void broadcastByPtr(Broadcast *broadcast, Thread *sender, bool wait) = 0;
 
         /*! Starts the "when backdrop switches to" scripts for the given backdrop broadcast. */
-        virtual void startBackdropScripts(Broadcast *broadcast, Thread *sender) = 0;
+        virtual void startBackdropScripts(Broadcast *broadcast, Thread *sender, bool wait) = 0;
 
         /*! Stops the given script. */
         virtual void stopScript(Thread *vm) = 0;

src/blocks/eventblocks.cpp

@@ -181,7 +181,7 @@ unsigned int EventBlocks::broadcast(VirtualMachine *vm)
     std::vector<int> broadcasts = vm->engine()->findBroadcasts(vm->getInput(0, 1)->toString());
 
     for (int index : broadcasts)
-        vm->engine()->broadcast(index, vm->thread());
+        vm->engine()->broadcast(index, vm->thread(), false);
 
     return 1;
 }
@@ -191,7 +191,7 @@ unsigned int EventBlocks::broadcastAndWait(VirtualMachine *vm)
     std::vector<int> broadcasts = vm->engine()->findBroadcasts(vm->getInput(0, 1)->toString());
 
     for (int index : broadcasts)
-        vm->engine()->broadcast(index, vm->thread());
+        vm->engine()->broadcast(index, vm->thread(), true);
 
     vm->promise();
 

src/blocks/looksblocks.cpp

@@ -893,7 +893,7 @@ void LooksBlocks::startBackdropScripts(VirtualMachine *vm, bool wait)
 {
     if (Stage *stage = vm->engine()->stage()) {
         if (stage->costumes().size() > 0)
-            vm->engine()->startBackdropScripts(stage->currentCostume()->broadcast(), vm->thread());
+            vm->engine()->startBackdropScripts(stage->currentCostume()->broadcast(), vm->thread(), wait);
     }
 }
 

src/engine/internal/engine.cpp

@@ -384,24 +384,24 @@ Thread *Engine::startScript(std::shared_ptr<Block> topLevelBlock, Target *target
     return pushThread(topLevelBlock, target).get();
 }
 
-void Engine::broadcast(int index, Thread *sender)
+void Engine::broadcast(int index, Thread *sender, bool wait)
 {
     if (index < 0 || index >= m_broadcasts.size())
         return;
 
-    broadcastByPtr(m_broadcasts[index].get(), sender);
+    broadcastByPtr(m_broadcasts[index].get(), sender, wait);
 }
 
-void Engine::broadcastByPtr(Broadcast *broadcast, Thread *sender)
+void Engine::broadcastByPtr(Broadcast *broadcast, Thread *sender, bool wait)
 {
     startHats(HatType::BroadcastReceived, { { HatField::BroadcastOption, broadcast } }, nullptr);
-    addBroadcastPromise(broadcast, sender);
+    addBroadcastPromise(broadcast, sender, wait);
 }
 
-void Engine::startBackdropScripts(Broadcast *broadcast, Thread *sender)
+void Engine::startBackdropScripts(Broadcast *broadcast, Thread *sender, bool wait)
 {
     startHats(HatType::BackdropChanged, { { HatField::Backdrop, broadcast->name() } }, nullptr);
-    addBroadcastPromise(broadcast, sender);
+    addBroadcastPromise(broadcast, sender, wait);
 }
 
 void Engine::stopScript(Thread *vm)
@@ -1868,7 +1868,7 @@ void Engine::addRunningScript(std::shared_ptr<Thread> thread)
     m_threads.push_back(thread);
 }
 
-void Engine::addBroadcastPromise(Broadcast *broadcast, Thread *sender)
+void Engine::addBroadcastPromise(Broadcast *broadcast, Thread *sender, bool wait)
 {
     assert(broadcast);
     assert(sender);
@@ -1879,7 +1879,8 @@ void Engine::addBroadcastPromise(Broadcast *broadcast, Thread *sender)
     if (it != m_broadcastSenders.cend() && std::find_if(m_threads.begin(), m_threads.end(), [&it](std::shared_ptr<Thread> thread) { return thread.get() == it->second; }) != m_threads.end())
         it->second->resolvePromise();
 
-    m_broadcastSenders[broadcast] = sender;
+    if (wait)
+        m_broadcastSenders[broadcast] = sender;
 }
 
 std::shared_ptr<Thread> Engine::pushThread(std::shared_ptr<Block> block, Target *target)

src/engine/internal/engine.h

@@ -36,9 +36,9 @@ class Engine : public IEngine
         void start() override;
         void stop() override;
         Thread *startScript(std::shared_ptr<Block> topLevelBlock, Target *target) override;
-        void broadcast(int index, Thread *sender) override;
-        void broadcastByPtr(Broadcast *broadcast, Thread *sender) override;
-        void startBackdropScripts(Broadcast *broadcast, Thread *sender) override;
+        void broadcast(int index, Thread *sender, bool wait) override;
+        void broadcastByPtr(Broadcast *broadcast, Thread *sender, bool wait) override;
+        void startBackdropScripts(Broadcast *broadcast, Thread *sender, bool wait) override;
         void stopScript(Thread *vm) override;
         void stopTarget(Target *target, Thread *exceptScript) override;
         void initClone(std::shared_ptr<Sprite> clone) override;
@@ -221,7 +221,7 @@ class Engine : public IEngine
         void updateFrameDuration();
         void addRunningScript(std::shared_ptr<Thread> thread);
 
-        void addBroadcastPromise(Broadcast *broadcast, Thread *sender);
+        void addBroadcastPromise(Broadcast *broadcast, Thread *sender, bool wait);
 
         std::shared_ptr<Thread> pushThread(std::shared_ptr<Block> block, Target *target);
         void stopThread(Thread *thread);

test/blocks/event_blocks_test.cpp

@@ -401,8 +401,8 @@ TEST_F(EventBlocksTest, BroadcastImpl)
     vm->setConstValues(constValues);
 
     EXPECT_CALL(m_engineMock, findBroadcasts("test")).WillOnce(Return(std::vector<int>({ 1, 4 })));
-    EXPECT_CALL(m_engineMock, broadcast(1, &thread));
-    EXPECT_CALL(m_engineMock, broadcast(4, &thread));
+    EXPECT_CALL(m_engineMock, broadcast(1, &thread, false));
+    EXPECT_CALL(m_engineMock, broadcast(4, &thread, false));
 
     vm->setBytecode(bytecode1);
     vm->run();
@@ -451,8 +451,8 @@ TEST_F(EventBlocksTest, BroadcastAndWaitImpl)
     vm->setConstValues(constValues);
 
     EXPECT_CALL(m_engineMock, findBroadcasts("test")).WillOnce(Return(std::vector<int>({ 1, 4 })));
-    EXPECT_CALL(m_engineMock, broadcast(1, &thread));
-    EXPECT_CALL(m_engineMock, broadcast(4, &thread));
+    EXPECT_CALL(m_engineMock, broadcast(1, &thread, true));
+    EXPECT_CALL(m_engineMock, broadcast(4, &thread, true));
 
     vm->setBytecode(bytecode);
     vm->run();