Use Broadcast::isBackdropBroadcast() in Engine

Author: adazem009

src/blocks/eventblocks.cpp

@@ -77,13 +77,7 @@ void EventBlocks::compileWhenBroadcastReceived(Compiler *compiler)
 
 void EventBlocks::compileWhenBackdropSwitchesTo(Compiler *compiler)
 {
-    if (Stage *stage = compiler->engine()->stage()) {
-        std::string backdropName = compiler->field(BACKDROP)->value().toString();
-        int index = stage->findCostume(backdropName);
-
-        if (index != -1)
-            compiler->engine()->addBroadcastScript(compiler->block(), stage->costumeAt(index)->broadcast());
-    }
+    // TODO: Register this hat in engine
 }
 
 void EventBlocks::compileWhenKeyPressed(Compiler *compiler)

src/engine/internal/engine.cpp

@@ -576,32 +576,35 @@ bool Engine::broadcastRunning(unsigned int index, VirtualMachine *sourceScript)
 
 bool Engine::broadcastByPtrRunning(Broadcast *broadcast, VirtualMachine *sourceScript)
 {
-    assert(m_broadcastMap.find(broadcast) != m_broadcastMap.cend());
-    const auto &scripts = m_broadcastMap[broadcast];
-
-    for (auto thread : m_threads) {
-        if (!thread->atEnd()) {
-            auto it = std::find_if(scripts.begin(), scripts.end(), [thread](Script *script) { return thread->script() == script; });
-
-            if (it != scripts.end())
-                return true;
+    if (broadcast->isBackdropBroadcast()) {
+        // This broadcast belongs to a backdrop
+        assert(m_broadcastMap.find(broadcast) == m_broadcastMap.cend());
+
+        for (auto thread : m_threads) {
+            if (!thread->atEnd()) {
+                // TODO: Store the top block in Script
+                Script *script = thread->script();
+                auto it = std::find_if(m_scripts.begin(), m_scripts.end(), [script](const std::pair<std::shared_ptr<Block>, std::shared_ptr<Script>> pair) { return pair.second.get() == script; });
+                assert(it != m_scripts.end());
+                auto topBlock = it->first;
+
+                // TODO: Add a map for "when backdrop switches to" hats
+                if ((topBlock->opcode() == "event_whenbackdropswitchesto") && (topBlock->findFieldById(EventBlocks::BACKDROP)->value().toString() == broadcast->name()))
+                    return true;
+            }
         }
-    }
+    } else {
+        // This is a regular broadcast
+        assert(m_broadcastMap.find(broadcast) != m_broadcastMap.cend());
+        const auto &scripts = m_broadcastMap[broadcast];
 
-    // TODO: Check whether the broadcast belongs to a backdrop
-    // maybe using something like broadcast->isBackdropBroadcast()
-    // after adding it to Broadcast
-    for (auto thread : m_threads) {
-        if (!thread->atEnd()) {
-            // TODO: Store the top block in Script
-            Script *script = thread->script();
-            auto it = std::find_if(m_scripts.begin(), m_scripts.end(), [script](const std::pair<std::shared_ptr<Block>, std::shared_ptr<Script>> pair) { return pair.second.get() == script; });
-            assert(it != m_scripts.end());
-            auto topBlock = it->first;
+        for (auto thread : m_threads) {
+            if (!thread->atEnd()) {
+                auto it = std::find_if(scripts.begin(), scripts.end(), [thread](Script *script) { return thread->script() == script; });
 
-            // TODO: Add a map for "when backdrop switches to" hats
-            if ((topBlock->opcode() == "event_whenbackdropswitchesto") && (topBlock->findFieldById(EventBlocks::BACKDROP)->value().toString() == broadcast->name()))
-                return true;
+                if (it != scripts.end())
+                    return true;
+            }
         }
     }
     return false;
@@ -736,6 +739,7 @@ int Engine::findBroadcastById(const std::string &broadcastId) const
 
 void Engine::addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, Broadcast *broadcast)
 {
+    assert(!broadcast->isBackdropBroadcast());
     Script *script = m_scripts[whenReceivedBlock].get();
     auto it = m_broadcastMap.find(broadcast);
 

test/blocks/event_blocks_test.cpp

@@ -290,9 +290,6 @@ TEST_F(EventBlocksTest, WhenBackdropSwitchesTo)
     auto backdrop = std::make_shared<Costume>("backdrop2", "a", "svg");
     stage.addCostume(backdrop);
 
-    EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
-    EXPECT_CALL(m_engineMock, addBroadcastScript(block1, backdrop->broadcast()));
-
     compiler.init();
     compiler.setBlock(block1);
     EventBlocks::compileWhenBackdropSwitchesTo(&compiler);