Remove obsolete parameters from broadcast methods

Author: adazem009

include/scratchcpp/iengine.h

@@ -56,11 +56,11 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Starts a script with the given top level block as the given Target (a sprite or the stage). */
         virtual VirtualMachine *startScript(std::shared_ptr<Block> topLevelBlock, Target *) = 0;
 
-        /*! Starts the script of the broadcast with the given index. */
-        virtual void broadcast(unsigned int index, VirtualMachine *sourceScript, bool wait = false) = 0;
+        /*! Starts the scripts of the broadcast with the given index. */
+        virtual void broadcast(unsigned int index) = 0;
 
-        /*! Starts the script of the given broadcast. */
-        virtual void broadcastByPtr(Broadcast *broadcast, VirtualMachine *sourceScript, bool wait = false) = 0;
+        /*! Starts the scripts of the given broadcast. */
+        virtual void broadcastByPtr(Broadcast *broadcast) = 0;
 
         /*! Starts the "when backdrop switches to" scripts for the given backdrop broadcast. */
         virtual void startBackdropScripts(Broadcast *broadcast) = 0;

src/blocks/eventblocks.cpp

@@ -93,25 +93,25 @@ void EventBlocks::compileWhenKeyPressed(Compiler *compiler)
 
 unsigned int EventBlocks::broadcast(VirtualMachine *vm)
 {
-    vm->engine()->broadcast(vm->engine()->findBroadcast(vm->getInput(0, 1)->toString()), vm);
+    vm->engine()->broadcast(vm->engine()->findBroadcast(vm->getInput(0, 1)->toString()));
     return 1;
 }
 
 unsigned int EventBlocks::broadcastByIndex(VirtualMachine *vm)
 {
-    vm->engine()->broadcast(vm->getInput(0, 1)->toLong(), vm);
+    vm->engine()->broadcast(vm->getInput(0, 1)->toLong());
     return 1;
 }
 
 unsigned int EventBlocks::broadcastAndWait(VirtualMachine *vm)
 {
-    vm->engine()->broadcast(vm->engine()->findBroadcast(vm->getInput(0, 1)->toString()), vm, true);
+    vm->engine()->broadcast(vm->engine()->findBroadcast(vm->getInput(0, 1)->toString()));
     return 1;
 }
 
 unsigned int EventBlocks::broadcastByIndexAndWait(VirtualMachine *vm)
 {
-    vm->engine()->broadcast(vm->getInput(0, 1)->toLong(), vm, true);
+    vm->engine()->broadcast(vm->getInput(0, 1)->toLong());
     return 1;
 }
 

src/engine/internal/engine.cpp

@@ -195,15 +195,15 @@ VirtualMachine *Engine::startScript(std::shared_ptr<Block> topLevelBlock, Target
     return pushThread(topLevelBlock, target).get();
 }
 
-void Engine::broadcast(unsigned int index, VirtualMachine *sourceScript, bool wait)
+void Engine::broadcast(unsigned int index)
 {
     if (index < 0 || index >= m_broadcasts.size())
         return;
 
-    broadcastByPtr(m_broadcasts[index].get(), sourceScript, wait);
+    broadcastByPtr(m_broadcasts[index].get());
 }
 
-void Engine::broadcastByPtr(Broadcast *broadcast, VirtualMachine *sourceScript, bool wait)
+void Engine::broadcastByPtr(Broadcast *broadcast)
 {
     startHats(HatType::BroadcastReceived, { { EventBlocks::Fields::BROADCAST_OPTION, broadcast->name() } }, nullptr);
 }

src/engine/internal/engine.h

@@ -33,8 +33,8 @@ class Engine : public IEngine
         void start() override;
         void stop() override;
         VirtualMachine *startScript(std::shared_ptr<Block> topLevelBlock, Target *target) override;
-        void broadcast(unsigned int index, VirtualMachine *sourceScript, bool wait = false) override;
-        void broadcastByPtr(Broadcast *broadcast, VirtualMachine *sourceScript, bool wait = false) override;
+        void broadcast(unsigned int index) override;
+        void broadcastByPtr(Broadcast *broadcast) override;
         void startBackdropScripts(Broadcast *broadcast) override;
         void stopScript(VirtualMachine *vm) override;
         void stopTarget(Target *target, VirtualMachine *exceptScript) override;

test/blocks/event_blocks_test.cpp

@@ -165,14 +165,14 @@ TEST_F(EventBlocksTest, BroadcastImpl)
     vm.setConstValues(constValues);
 
     EXPECT_CALL(m_engineMock, findBroadcast("test")).WillOnce(Return(1));
-    EXPECT_CALL(m_engineMock, broadcast(1, &vm, false)).Times(1);
+    EXPECT_CALL(m_engineMock, broadcast(1)).Times(1);
 
     vm.setBytecode(bytecode1);
     vm.run();
 
     ASSERT_EQ(vm.registerCount(), 0);
 
-    EXPECT_CALL(m_engineMock, broadcast(2, &vm, false)).Times(1);
+    EXPECT_CALL(m_engineMock, broadcast(2)).Times(1);
 
     vm.setBytecode(bytecode2);
     vm.run();
@@ -230,7 +230,7 @@ TEST_F(EventBlocksTest, BroadcastAndWaitImpl)
     vm.setConstValues(constValues);
 
     EXPECT_CALL(m_engineMock, findBroadcast("test")).WillOnce(Return(1));
-    EXPECT_CALL(m_engineMock, broadcast(1, &vm, true)).Times(1);
+    EXPECT_CALL(m_engineMock, broadcast(1)).Times(1);
 
     vm.setBytecode(bytecode1);
     vm.run();
@@ -254,7 +254,7 @@ TEST_F(EventBlocksTest, BroadcastAndWaitImpl)
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(vm.atEnd(), true);
 
-    EXPECT_CALL(m_engineMock, broadcast(3, &vm, true)).Times(1);
+    EXPECT_CALL(m_engineMock, broadcast(3)).Times(1);
 
     vm.setBytecode(bytecode3);
     vm.run();

test/mocks/enginemock.h

@@ -17,8 +17,8 @@ class EngineMock : public IEngine
         MOCK_METHOD(void, start, (), (override));
         MOCK_METHOD(void, stop, (), (override));
         MOCK_METHOD(VirtualMachine *, startScript, (std::shared_ptr<Block>, Target *), (override));
-        MOCK_METHOD(void, broadcast, (unsigned int, VirtualMachine *, bool), (override));
-        MOCK_METHOD(void, broadcastByPtr, (Broadcast *, VirtualMachine *, bool), (override));
+        MOCK_METHOD(void, broadcast, (unsigned int), (override));
+        MOCK_METHOD(void, broadcastByPtr, (Broadcast *), (override));
         MOCK_METHOD(void, startBackdropScripts, (Broadcast *), (override));
         MOCK_METHOD(void, stopScript, (VirtualMachine *), (override));
         MOCK_METHOD(void, stopTarget, (Target *, VirtualMachine *), (override));