Remove obsolete parameters from broadcast running methods

Author: adazem009

include/scratchcpp/iengine.h

@@ -177,10 +177,10 @@ class LIBSCRATCHCPP_EXPORT IEngine
         virtual void setSpriteFencingEnabled(bool enable) = 0;
 
         /*! Returns true if there are any running script of the broadcast with the given index. */
-        virtual bool broadcastRunning(unsigned int index, VirtualMachine *sourceScript) = 0;
+        virtual bool broadcastRunning(unsigned int index) = 0;
 
         /*! Returns true if there are any running script of the given broadcast. */
-        virtual bool broadcastByPtrRunning(Broadcast *broadcast, VirtualMachine *sourceScript) = 0;
+        virtual bool broadcastByPtrRunning(Broadcast *broadcast) = 0;
 
         /*!
          * Call this from a block implementation to force a redraw (screen refresh).

src/blocks/eventblocks.cpp

@@ -117,14 +117,14 @@ unsigned int EventBlocks::broadcastByIndexAndWait(VirtualMachine *vm)
 
 unsigned int EventBlocks::checkBroadcast(VirtualMachine *vm)
 {
-    if (vm->engine()->broadcastRunning(vm->engine()->findBroadcast(vm->getInput(0, 1)->toString()), vm))
+    if (vm->engine()->broadcastRunning(vm->engine()->findBroadcast(vm->getInput(0, 1)->toString())))
         vm->stop(true, true, true);
     return 1;
 }
 
 unsigned int EventBlocks::checkBroadcastByIndex(VirtualMachine *vm)
 {
-    if (vm->engine()->broadcastRunning(vm->getInput(0, 1)->toLong(), vm))
+    if (vm->engine()->broadcastRunning(vm->getInput(0, 1)->toLong()))
         vm->stop(true, true, true);
     return 1;
 }

src/blocks/looksblocks.cpp

@@ -898,7 +898,7 @@ unsigned int LooksBlocks::checkBackdropScripts(VirtualMachine *vm)
         long index = vm->getInput(0, 1)->toLong() - 1;
         assert(stage->costumes().size() == 0 || index >= 0);
 
-        if ((stage->costumes().size() > 0) && vm->engine()->broadcastByPtrRunning(stage->costumeAt(index)->broadcast(), vm))
+        if ((stage->costumes().size() > 0) && vm->engine()->broadcastByPtrRunning(stage->costumeAt(index)->broadcast()))
             vm->stop(true, true, true);
     }
 

src/engine/internal/engine.cpp

@@ -566,15 +566,15 @@ void Engine::setSpriteFencingEnabled(bool enable)
     m_spriteFencingEnabled = enable;
 }
 
-bool Engine::broadcastRunning(unsigned int index, VirtualMachine *sourceScript)
+bool Engine::broadcastRunning(unsigned int index)
 {
     if (index < 0 || index >= m_broadcasts.size())
         return false;
 
-    return broadcastByPtrRunning(m_broadcasts[index].get(), sourceScript);
+    return broadcastByPtrRunning(m_broadcasts[index].get());
 }
 
-bool Engine::broadcastByPtrRunning(Broadcast *broadcast, VirtualMachine *sourceScript)
+bool Engine::broadcastByPtrRunning(Broadcast *broadcast)
 {
     if (broadcast->isBackdropBroadcast()) {
         // This broadcast belongs to a backdrop

src/engine/internal/engine.h

@@ -85,8 +85,8 @@ class Engine : public IEngine
         bool spriteFencingEnabled() const override;
         void setSpriteFencingEnabled(bool enable) override;
 
-        bool broadcastRunning(unsigned int index, VirtualMachine *sourceScript) override;
-        bool broadcastByPtrRunning(Broadcast *broadcast, VirtualMachine *sourceScript) override;
+        bool broadcastRunning(unsigned int index) override;
+        bool broadcastByPtrRunning(Broadcast *broadcast) override;
 
         void requestRedraw() override;
 

test/blocks/event_blocks_test.cpp

@@ -238,7 +238,7 @@ TEST_F(EventBlocksTest, BroadcastAndWaitImpl)
     ASSERT_EQ(vm.registerCount(), 0);
 
     EXPECT_CALL(m_engineMock, findBroadcast("test")).WillOnce(Return(2));
-    EXPECT_CALL(m_engineMock, broadcastRunning(2, &vm)).WillOnce(Return(true));
+    EXPECT_CALL(m_engineMock, broadcastRunning(2)).WillOnce(Return(true));
 
     vm.setBytecode(bytecode2);
     vm.run();
@@ -247,7 +247,7 @@ TEST_F(EventBlocksTest, BroadcastAndWaitImpl)
     ASSERT_EQ(vm.atEnd(), false);
 
     EXPECT_CALL(m_engineMock, findBroadcast("test")).WillOnce(Return(2));
-    EXPECT_CALL(m_engineMock, broadcastRunning(2, &vm)).WillOnce(Return(false));
+    EXPECT_CALL(m_engineMock, broadcastRunning(2)).WillOnce(Return(false));
 
     vm.run();
 
@@ -261,15 +261,15 @@ TEST_F(EventBlocksTest, BroadcastAndWaitImpl)
 
     ASSERT_EQ(vm.registerCount(), 0);
 
-    EXPECT_CALL(m_engineMock, broadcastRunning(3, &vm)).WillOnce(Return(true));
+    EXPECT_CALL(m_engineMock, broadcastRunning(3)).WillOnce(Return(true));
 
     vm.setBytecode(bytecode4);
     vm.run();
 
     ASSERT_EQ(vm.registerCount(), 1);
     ASSERT_EQ(vm.atEnd(), false);
 
-    EXPECT_CALL(m_engineMock, broadcastRunning(3, &vm)).WillOnce(Return(false));
+    EXPECT_CALL(m_engineMock, broadcastRunning(3)).WillOnce(Return(false));
 
     vm.run();
 

test/blocks/looks_blocks_test.cpp

@@ -69,8 +69,8 @@ class EngineMock : public IEngine
         MOCK_METHOD(bool, spriteFencingEnabled, (), (const, override));
         MOCK_METHOD(void, setSpriteFencingEnabled, (bool), (override));
 
-        MOCK_METHOD(bool, broadcastRunning, (unsigned int, VirtualMachine *), (override));
-        MOCK_METHOD(bool, broadcastByPtrRunning, (Broadcast *, VirtualMachine *), (override));
+        MOCK_METHOD(bool, broadcastRunning, (unsigned int), (override));
+        MOCK_METHOD(bool, broadcastByPtrRunning, (Broadcast *), (override));
 
         MOCK_METHOD(void, requestRedraw, (), (override));