scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-07-26 22:20:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Streamlining broadcast block execution. When arg information is provided to execute function, corresponding broadcast message is looked up by id, if provided, or if not, then name. If neither id nor name is provided, we can't look up the broadcast message and something is wrong, so an error is logged. We no longer need to differentiate between the shadow menu vs. plugged in input cases via the argValue name (e.g. 'BROADCAST_OPTION' vs. 'BROADCAST_INPUT'). This refactor also helps with sb2 import, coming in the next commit.

Browse source
This commit is contained in:
Karishma Chadha 2017-12-13 13:41:22 -05:00
parent 413d113dda
commit c0e4ae455c
3 changed files with 15 additions and 28 deletions
src/engine
execute.js

5
src/engine/execute.js
View file

@ -217,9 +217,6 @@ const execute = function (sequencer, thread) {
const broadcastInput = inputs[inputName];
// Check if something is plugged into the broadcast block, or
// if the shadow dropdown menu is being used.
// Differentiate between these two cases by giving argValues
// a 'BROADCAST_INPUT' field or a 'BROADCAST_OPTION' field
// respectively.
if (broadcastInput.block === broadcastInput.shadow) {
// Shadow dropdown menu is being used.
// Get the appropriate information out of it.
@ -232,7 +229,7 @@ const execute = function (sequencer, thread) {
} else {
// Something is plugged into the broadcast input.
// Cast it to a string. We don't need an id here.
argValues.BROADCAST_INPUT = {
argValues.BROADCAST_OPTION = {
name: cast.toString(inputValue)
};
}